Changeset 7489

Timestamp:

2004-05-28T15:41:03+12:00 (20 years ago)

Author:

mdewsnip

Message:

Removed some dead code.

File:

• trunk/gli/src/org/greenstone/gatherer/file/FileSystemModel.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/file/FileSystemModel.java

@@ -213 +213 @@
 
 
-    //    /** Used to refresh the contents of the FileNode indicated by the tree path. While the refresh itself is a piece of the proverbial, the restoring of expanded folders afterwards is a nightmare, mainly because all of the tree paths are no longer valid (remember that refresh involves throwing away the node currents children and remapping them).
-    //     * @param path The TreePath to the node to be refreshed.
-    //     */
-//      public void oldRefresh(TreePath path) {
-//      // If no path is set, take the path to the root node (ie update the whole tree)
-//      if(path == null) {
-//          System.err.println("Refresh entire tree.");
-//          path = new TreePath(((FileNode)root).getPath());
-//      }
-//      else {
-//          System.err.println("FileSystemModel.refresh: " + path.getLastPathComponent());
-//      }
-//      // Only a valid action if this model is currently being displayed in a tree.
-//      if(tree != null) {
-//          System.err.println("Refreshing tree " + tree);
-//          // Retrieve the error node.
-//          FileNode node = (FileNode) path.getLastPathComponent();
-//          // If this error node is a dummy node (ie has no associated file) we can't unmap it, so we iterate through its children refreshing each in turn. The exception being Greenstone Collections, as it is a dummy node but we can map/unmap it
-//          if(node.getFile() == null && !node.toString().equals(Dictionary.get("Tree.World"))) {
-//          for(int i = 0; i < node.getChildCount(); i++) {
-//              FileNode child = (FileNode) node.getChildAt(i);
-//              refresh(new TreePath(child.getPath()));
-//              child = null;
-//          }
-//          }
-//          // Otherwise we refresh this node.
-//          else {
-//          // Record all of the expanded paths under this node. How come getExpandedDescendants returns more results each time.
-//          Enumeration old_tree_paths = tree.getExpandedDescendants(path);
-//          // Refresh the tree structure.
-//          node.unmap();
-//          node.map();
-//          // Fire the appropriate event.
-//          nodeStructureChanged(node);
-//          // Then (painfully) restore the expanded paths. Note that the paths stored in the enumeration no longer exist, so I have to restore by node matching.
-//          //counter = 0;
-//          ///ystem.err.println("After:");
-//          while(old_tree_paths != null && old_tree_paths.hasMoreElements()) {
-//              //counter++;
-//              FileNode current_node = node;
-//              TreePath old_tree_path = (TreePath) old_tree_paths.nextElement();
-//              ///ystem.err.println(counter + ". " + old_tree_path);
-//              TreePath new_tree_path = new TreePath(path.getPath()); // Why isn't there a treepath copy constructor!
-//              boolean not_found = false;
-//              while(!not_found && old_tree_path.getPathCount() > new_tree_path.getPathCount()) {
-//              // Retrieve the new node in the old tree path
-//              FileNode old_path_node = (FileNode) old_tree_path.getPathComponent(new_tree_path.getPathCount());
-//              // Ensure the current node is mapped
-//              current_node.map();
-//              // Now attempt to match it to a child of the new paths last node.
-//              boolean found = false;
-//              for(int i = 0; !found && i < current_node.getChildCount(); i++) {
-//                  FileNode target = (FileNode) current_node.getChildAt(i);
-//                  ///ystem.err.println("Comparing " + old_path_node.toString() + " with " + target);
-//                  if(target.toString().equals(old_path_node.toString())) {
-//                  current_node = target;
-//                  found = true;
-//                  }
-//                  target = null;
-//              }
-//              old_path_node = null;
-//              // If we found a match, we add that to the new Tree Path and continue.
-//              if(found) {
-//                  ///ystem.err.println("Found a match!");
-//                  new_tree_path = new_tree_path.pathByAddingChild(current_node);
-//              }
-//              // We also have to record if we were unable to find a match in the current nodes children.
-//              else {
-//                  ///ystem.err.println("Node not found.");
-//                  not_found = true;
-//              }
-//              }
-//              old_tree_path = null;
-//              // If we've got this far, and haven't hit a not found, then we can assume we have the appropriate path, and ask the program to expand the new tree path
-//              if(!not_found) {
-//              tree.expandPath(new_tree_path);
-//              ///ystem.err.println(" -> Expanded " + new_tree_path);
-//              }
-//              else {
-//              ///ystem.err.println(" -> Cannot Expand " + new_tree_path);
-//              }
-//              new_tree_path = null;
-//              current_node = null;
-//          }
-//          node = null;
-//          }
-//      }
-//      else {
-//          ///ystem.err.println("No Tree!");
-//      }
-//      }
-
-      public void setFilter(String pattern) {
+    public void setFilter(String pattern) {
     if(pattern != null) {
         current_filter = new FileFilter(pattern, false);
@@ -313 +221 @@
     }
     filters = null;
-      }
-
-    /* private void setPermanentFilter(String pattern) {
-    if(pattern != null) {
-        FileFilter new_filter = new FileFilter(pattern, false);
-        FileFilter temp[] = new FileFilter[default_filters.length + 1];
-        System.arraycopy(default_filters, 0, temp, 0, default_filters.length);
-        temp[default_filters.length] = new_filter;
-        default_filters = temp;
-        temp = null;
-    }
-    filters = null;
-    } */
+    }
 
     public void setTree(DragTree tree) {