Changeset 11620 for trunk

Timestamp:

2006-04-07T12:36:40+12:00 (18 years ago)

Author:

mdewsnip

Message:

Rearranged some more workspace and collection tree code to reduce duplication.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• collection/CollectionTree.java (modified) (1 diff)
• file/WorkspaceTree.java (modified) (1 diff)
• gui/EnrichPane.java (modified) (1 diff)
• gui/Filter.java (modified) (1 diff)
• gui/GatherPane.java (modified) (2 diffs)
• gui/tree/DragTree.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/collection/CollectionTree.java

@@ -53 +53 @@
     setTextNonSelectionColor(Configuration.getColor("coloring.collection_tree_foreground", false));
     setTextSelectionColor(Configuration.getColor("coloring.collection_selection_foreground", false));
+
+    filter.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
+    filter.setEditable(Configuration.getMode() > Configuration.LIBRARIAN_MODE);
     }
 

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

@@ -58 +58 @@
     setTextNonSelectionColor(Configuration.getColor("coloring.workspace_tree_foreground", false));
     setTextSelectionColor(Configuration.getColor("coloring.workspace_selection_foreground", false));
+
+    filter.setBackground(Configuration.getColor("coloring.workspace_heading_background", false));
+    filter.setEditable(Configuration.getMode() > Configuration.LIBRARIAN_MODE);
     }
 

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

@@ -131 +131 @@
     collection_tree.getSelectionModel().setSelectionMode(TreeSelectionModel.DISCONTIGUOUS_TREE_SELECTION);
     collection_tree.addTreeSelectionListener(this);
-
     JScrollPane collection_scroll = new JScrollPane(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);
-    Dictionary.registerTooltip(collection_filter.getComboBox(), "Collection.Filter_Tooltip");
 
     // Layout

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

@@ -115 +115 @@
     label = new JLabel();
     Dictionary.setText(label, "Filter.Filter_Tree");
+    Dictionary.registerTooltip(combobox, "Collection.Filter_Tooltip");
+
     // Add listeners.
     combobox.addActionListener(new ComboBoxListener());

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

@@ -221 +221 @@
     workspace_tree = new WorkspaceTree(Utility.WORKSPACE_TREE);
     group.add(workspace_tree);
-
     workspace_scroll = new JScrollPane(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);
-    Dictionary.registerTooltip(workspace_filter.getComboBox(), "Collection.Filter_Tooltip");
 
     // Collection Tree
@@ -242 +237 @@
     collection_tree.setEnabled(Gatherer.c_man.getCollectionTreeModel() != null);
     group.add(collection_tree);
-
     collection_scroll = new JScrollPane(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);
-    Dictionary.registerTooltip(collection_filter.getComboBox(), "Collection.Filter_Tooltip");
 
     tree_pane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);

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

@@ -33 +33 @@
     private DragGroup group;
     /** The filter for this tree. */
-    private Filter filter = null;
+    protected Filter filter = null;
     /** The image to use for the disabled background. */
     private ImageIcon disabled_background;