Changeset 11619 for trunk

Timestamp:

2006-04-07T11:51:11+12:00 (18 years ago)

Author:

mdewsnip

Message:

The workspace and collection tree filters are now owned by the trees themselves, rather than the GUIManager.

Location:

trunk/gli/src/org/greenstone/gatherer/gui

Files:

• EnrichPane.java (modified) (1 diff)
• GUIManager.java (modified) (2 diffs)
• GatherPane.java (modified) (2 diffs)
• tree/DragTree.java (modified) (4 diffs)

trunk/gli/src/org/greenstone/gatherer/gui/EnrichPane.java

@@ -134 +134 @@
     JScrollPane collection_scroll = new JScrollPane(collection_tree);
 
-    collection_filter = Gatherer.g_man.getFilter(collection_tree);
+    collection_filter = collection_tree.getFilter();
     collection_filter.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
     collection_filter.setEditable(Configuration.getMode() > Configuration.LIBRARIAN_MODE);

trunk/gli/src/org/greenstone/gatherer/gui/GUIManager.java

@@ -91 +91 @@
     /** The size of the Gatherer window. */
     private Dimension size = null;
-    /** The filters used to dynamically filter the trees at user request. */
-    private HashMap filters = new HashMap();
     /** The panel within the window that other components are placed on. */
     private JPanel content_pane = null;
@@ -444 +442 @@
         Gatherer.exit();
     }
-    }
-
-
-    /** Retrieve the filter, or if one already exists, spawn a linked copy. */
-    public Filter getFilter(DragTree tree) {
-    Filter filter = (Filter) filters.get(tree.getModel());
-    if (filter == null) {
-        filter = new Filter(tree, null);
-        filters.put(tree.getModel(), filter);
-        return filter;
-    }
-    return filter.spawn(tree);
     }
 

trunk/gli/src/org/greenstone/gatherer/gui/GatherPane.java

@@ -224 +224 @@
     workspace_scroll = new JScrollPane(workspace_tree);
 
-    workspace_filter = Gatherer.g_man.getFilter(workspace_tree);
+    workspace_filter = workspace_tree.getFilter();
     workspace_filter.setBackground(Configuration.getColor("coloring.workspace_heading_background", false));
     workspace_filter.setEditable(Configuration.getMode() > Configuration.LIBRARIAN_MODE);
@@ -245 +245 @@
     collection_scroll = new JScrollPane(collection_tree);
 
-    collection_filter = Gatherer.g_man.getFilter(collection_tree);
+    collection_filter = collection_tree.getFilter();
     collection_filter.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
     collection_filter.setEditable(Configuration.getMode() > Configuration.LIBRARIAN_MODE);

trunk/gli/src/org/greenstone/gatherer/gui/tree/DragTree.java

@@ -17 +17 @@
 import org.greenstone.gatherer.file.FileNode;
 import org.greenstone.gatherer.file.FileSystemModel;
+import org.greenstone.gatherer.gui.Filter;
 import org.greenstone.gatherer.util.DragComponent;
 import org.greenstone.gatherer.util.DragGroup;
@@ -31 +32 @@
     /** The Group this component belongs to. */
     private DragGroup group;
+    /** The filter for this tree. */
+    private Filter filter = null;
     /** The image to use for the disabled background. */
     private ImageIcon disabled_background;
@@ -88 +91 @@
     // Init
     this.name = name;
+    this.filter = new Filter(this, null);
 
     // Creation
@@ -454 +458 @@
     }
 
+    public Filter getFilter() {
+    return filter;
+    }
+
     public String getSelectionDetails() {
     return ((DragTreeSelectionModel)selectionModel).getDetails();