Changeset 10809 for extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/search/tree/FileTree.java

Timestamp:

May 7, 2011, 3:44:17 PM (13 years ago)

Author:

mlg

Message:

Changement in the file browsing
Jiwigo does not browse the user directory on startup (memory consumption is limited while the user does not use the file browser to search images).

File:

• extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/search/tree/FileTree.java (modified) (10 diffs)

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/search/tree/FileTree.java

@@ -17 +17 @@
 import javax.swing.JPopupMenu;
 import javax.swing.JScrollPane;
-import javax.swing.JTextField;
 import javax.swing.JTree;
 import javax.swing.event.TreeSelectionEvent;
@@ -27 +26 @@
 
 import fr.mael.jiwigo.transverse.ImagesManagement;
+import fr.mael.jiwigo.transverse.util.Messages;
 import fr.mael.jiwigo.transverse.util.Tools;
+import fr.mael.jiwigo.ui.field.HintTextField;
 import fr.mael.jiwigo.ui.mainframe.DialogPrivacyLevel;
 import fr.mael.jiwigo.ui.search.DialogChooseCategory;
@@ -64 +65 @@
     private String path;
 
-    private JTextField fieldPath;
+    private HintTextField fieldPath;
 
     private JButton refreshButton;
@@ -76 +77 @@
     private ArrayList<File> filesToSend;
 
+    private File f;
+    private File fls[];
+    private ArrayList<File> filter;
+    private File fls2[];
+    private ArrayList<File> filter2 = new ArrayList<File>();
     /**
      * the menu to add a category
@@ -88 +94 @@
         super(new BorderLayout());
         this.path = path;
-        fieldPath = new JTextField(path);
+        fieldPath = new HintTextField(Messages.getMessage("fileTree_clickToChoose"));
+        if (path != null) {
+            fieldPath.setText(path);
+        }
         fieldPath.addMouseListener(this);
+        fieldPath.setPreferredSize(new Dimension(150, 30));
         refreshButton = new JButton();
         refreshButton.setIcon(new ImageIcon(Tools.getURL("fr/mael/jiwigo/img/refresh.png")));
@@ -119 +129 @@
      */
     public void reload() {
-        root.removeAllChildren();
-        createNodes(root);
-        ((DefaultTreeModel) tree.getModel()).reload();
+        if (path != null) {
+            root.removeAllChildren();
+            createNodes(root);
+            ((DefaultTreeModel) tree.getModel()).reload();
+        }
     }
 
@@ -131 +143 @@
     private void createNodes(DefaultMutableTreeNode root) {
         DefaultMutableTreeNode fileNode = null;
-        File f = new File(path);
+        f = new File(path);
         try {
-            File fls[] = f.listFiles();
-            ArrayList<File> filter = new ArrayList<File>();
+            fls = null;
+            filter = null;
+            System.runFinalization();
+            fls = f.listFiles();
+            filter = new ArrayList<File>();
             for (File file : fls) {
                 //only png and jpg are displayed
@@ -164 +179 @@
     private void recursiveNodeCreation(DefaultMutableTreeNode categoryNode, File file) {
         if (file.isDirectory() && !(file.getName().charAt(0) == '.')) {
-            File fls[] = file.listFiles();
-            ArrayList<File> filter = new ArrayList<File>();
-            for (File fich : fls) {
+            fls2 = null;
+            filter2 = null;
+            System.runFinalization();
+            fls2 = file.listFiles();
+            filter2 = new ArrayList<File>();
+            for (File fich : fls2) {
                 if (!(fich.getName().charAt(0) == '.')
                         && fich.isDirectory()
@@ -172 +190 @@
                                 || fich.getName().toLowerCase().endsWith(".jpeg") || fich.getName().toLowerCase()
                                 .endsWith(".png"))))) {
-                    filter.add(fich);
+                    filter2.add(fich);
                 }
             }
-            for (File fich : filter) {
+            for (File fich : filter2) {
                 DefaultMutableTreeNode node = new DefaultMutableTreeNode(fich);
                 categoryNode.add(node);
@@ -192 +210 @@
         if (mouseEvent.getSource().equals(fieldPath)) {
             JFileChooser chooser = new JFileChooser();
-            chooser.setCurrentDirectory(new java.io.File(path));
+            if (path != null) {
+                chooser.setCurrentDirectory(new java.io.File(path));
+            }
             chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
             chooser.setAcceptAllFileFilterUsed(false);