diff --git a/src/com/ms509/ui/menu/FileManagerPopMenu.java b/src/com/ms509/ui/menu/FileManagerPopMenu.java index 44ec5b5..6e53a5f 100644 --- a/src/com/ms509/ui/menu/FileManagerPopMenu.java +++ b/src/com/ms509/ui/menu/FileManagerPopMenu.java @@ -156,8 +156,11 @@ public void actionPerformed(final ActionEvent e) { final String abpath = Common.autoPath(path.getText()) + name + Safe.SYSTEMSP; filemanagerpanel.showRight(abpath, list); - DefaultMutableTreeNode tn = TreeMethod.searchNode( - filemanagerpanel.getRoot(), name); + + //DefaultMutableTreeNode tn = TreeMethod.searchNode( + //filemanagerpanel.getRoot(), name); + DefaultMutableTreeNode tn = TreeMethod.searchNodeByAbsolutePath( + filemanagerpanel.getRoot(), abpath); if (tn != null) { TreePath tp = new TreePath(tn.getPath()); DefaultTreeSelectionModel dsmodel = new DefaultTreeSelectionModel(); diff --git a/src/com/ms509/ui/panel/FileManagerPanel.java b/src/com/ms509/ui/panel/FileManagerPanel.java index 6e10fec..08d8f76 100644 --- a/src/com/ms509/ui/panel/FileManagerPanel.java +++ b/src/com/ms509/ui/panel/FileManagerPanel.java @@ -207,8 +207,6 @@ public FileManagerPanel() { Runnable run = new Runnable() { public void run() { arrtmp = fm.doAction("readindex"); - // System.out.println(arrtmp); - if (arrtmp.indexOf("HTTP/1.") > -1 || arrtmp.indexOf("/") < 0 && arrtmp.indexOf("\\") < 0) { SwingUtilities.invokeLater(new Runnable() { diff --git a/src/com/ms509/util/FileManager.java b/src/com/ms509/util/FileManager.java index f904425..b3f2b71 100644 --- a/src/com/ms509/util/FileManager.java +++ b/src/com/ms509/util/FileManager.java @@ -429,7 +429,7 @@ public String[] makeleft(String path) { } } String[] left = al.toArray(new String[] {}); - return left; + return left; } catch (Exception e) { return filedicts = new String[]{}; } diff --git a/src/com/ms509/util/TreeMethod.java b/src/com/ms509/util/TreeMethod.java index e1fdbb8..c6a7d4b 100644 --- a/src/com/ms509/util/TreeMethod.java +++ b/src/com/ms509/util/TreeMethod.java @@ -100,4 +100,35 @@ public static DefaultMutableTreeNode searchNode( } return null; } + + public static DefaultMutableTreeNode searchNodeByAbsolutePath( + DefaultMutableTreeNode root, String abpath) { + DefaultMutableTreeNode node = null; + Enumeration e = root.breadthFirstEnumeration(); + while (e.hasMoreElements()) { + node = (DefaultMutableTreeNode) e.nextElement(); + //System.out.println(node.getUserObject()); + Object[] treepath = node.getUserObjectPath(); + String treepathString = ""; + for(int i=0;i