X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2FTDirectoryTreeItem.java;h=1bb30f1d61ef3365f8ccb8028fe37283d1d78d6d;hb=847a4bc53c549c277d479ee904ab45be7f5e4dec;hp=25a33dfa50b5958a368cab9097b987caf87e1ff2;hpb=7668cb45fd91775da14504919d8a239af2f7c07e;p=nikiroo-utils.git

diff --git a/src/jexer/TDirectoryTreeItem.java b/src/jexer/TDirectoryTreeItem.java
index 25a33df..1bb30f1 100644
--- a/src/jexer/TDirectoryTreeItem.java
+++ b/src/jexer/TDirectoryTreeItem.java
@@ -31,6 +31,7 @@
 package jexer;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 import java.util.LinkedList;
@@ -41,9 +42,18 @@ import java.util.LinkedList;
 public class TDirectoryTreeItem extends TTreeItem {
 
     /**
-     * Directory entry corresponding to this list item.
+     * File corresponding to this list item.
      */
-    File dir;
+    private File file;
+
+    /**
+     * Get the File corresponding to this list item.
+     *
+     * @return the File
+     */
+    public final File getFile() {
+        return file;
+    }
 
     /**
      * Called when this item is expanded or collapsed.  this.expanded will be
@@ -51,18 +61,20 @@ public class TDirectoryTreeItem extends TTreeItem {
      */
     @Override
     public void onExpand() {
-        if (dir == null) {
+        // System.err.printf("onExpand() %s\n", file);
+
+        if (file == null) {
             return;
         }
         getChildren().clear();
 
         // Make sure we can read it before trying to.
-        if (dir.canRead()) {
+        if (file.canRead()) {
             setSelectable(true);
         } else {
             setSelectable(false);
         }
-        assert (dir.isDirectory());
+        assert (file.isDirectory());
         setExpandable(true);
 
         if ((isExpanded() == false) || (isExpandable() == false)) {
@@ -70,20 +82,26 @@ public class TDirectoryTreeItem extends TTreeItem {
             return;
         }
 
-        // Refresh my child list
-        for (File file: dir.listFiles()) {
-            if (file.getName().equals(".")) {
+        for (File f: file.listFiles()) {
+            // System.err.printf("   -> file %s %s\n", file, file.getName());
+
+            if (f.getName().startsWith(".")) {
+                // Hide dot-files
                 continue;
             }
-            if (!file.isDirectory()) {
+            if (!f.isDirectory()) {
                 continue;
             }
 
-            TDirectoryTreeItem item = new TDirectoryTreeItem(getTreeView(),
-                file.getName(), false, false);
+            try {
+                TDirectoryTreeItem item = new TDirectoryTreeItem(getTreeView(),
+                    f.getCanonicalPath(), false, false);
 
-            item.level = this.level + 1;
-            getChildren().add(item);
+                item.level = this.level + 1;
+                getChildren().add(item);
+            } catch (IOException e) {
+                continue;
+            }
         }
         Collections.sort(getChildren());
 
@@ -110,7 +128,9 @@ public class TDirectoryTreeItem extends TTreeItem {
      * @param view root TTreeView
      * @param text text for this item
      */
-    public TDirectoryTreeItem(final TTreeView view, final String text) {
+    public TDirectoryTreeItem(final TTreeView view,
+        final String text) throws IOException {
+
         this(view, text, false, true);
     }
 
@@ -122,7 +142,7 @@ public class TDirectoryTreeItem extends TTreeItem {
      * @param expanded if true, have it expanded immediately
      */
     public TDirectoryTreeItem(final TTreeView view, final String text,
-        final boolean expanded) {
+        final boolean expanded) throws IOException {
 
         this(view, text, expanded, true);
     }
@@ -137,49 +157,56 @@ public class TDirectoryTreeItem extends TTreeItem {
      * return the root path entry
      */
     public TDirectoryTreeItem(final TTreeView view, final String text,
-        final boolean expanded, final boolean openParents) {
+        final boolean expanded, final boolean openParents) throws IOException {
 
         super(view, text, false);
 
-        List<TDirectoryTreeItem> parentItems = new LinkedList<TDirectoryTreeItem>();
-        List<String> parentPaths = new LinkedList<String>();
+        List<String> parentFiles = new LinkedList<String>();
         boolean oldExpanded = expanded;
 
+        // Convert to canonical path
+        File rootFile = new File(text);
+        rootFile = rootFile.getCanonicalFile();
+
         if (openParents == true) {
             setExpanded(true);
 
             // Go up the directory tree
-            File rootPath = new File(text);
-            File parent = rootPath.getParentFile();
+            File parent = rootFile.getParentFile();
             while (parent != null) {
-                parentPaths.add(rootPath.getName());
-                rootPath = rootPath.getParentFile();
-                parent = rootPath.getParentFile();
+                parentFiles.add(rootFile.getName());
+                rootFile = rootFile.getParentFile();
+                parent = rootFile.getParentFile();
             }
-            setText(rootPath.getName());
+        }
+        file = rootFile;
+        if (rootFile.getParentFile() == null) {
+            // This is a filesystem root, use its full name
+            setText(rootFile.getCanonicalPath());
         } else {
-            setText(text);
+            // This is a relative path.  We got here because openParents was
+            // false.
+            assert (openParents == false);
+            setText(rootFile.getName());
         }
-
-        dir = new File(getText());
         onExpand();
 
         if (openParents == true) {
-            TDirectoryTreeItem childPath = this;
-            Collections.reverse(parentPaths);
-            for (String p: parentPaths) {
-                for (TWidget widget: childPath.getChildren()) {
+            TDirectoryTreeItem childFile = this;
+            Collections.reverse(parentFiles);
+            for (String p: parentFiles) {
+                for (TWidget widget: childFile.getChildren()) {
                     TDirectoryTreeItem child = (TDirectoryTreeItem) widget;
                     if (child.getText().equals(p)) {
-                        childPath = child;
-                        childPath.setExpanded(true);
-                        childPath.onExpand();
+                        childFile = child;
+                        childFile.setExpanded(true);
+                        childFile.onExpand();
                         break;
                     }
                 }
             }
             unselect();
-            getTreeView().setSelected(childPath);
+            getTreeView().setSelected(childFile);
             setExpanded(oldExpanded);
         }
         getTreeView().reflow();