Changeset 11616

Timestamp:

2006-04-07T09:45:18+12:00 (18 years ago)

Author:

mdewsnip

Message:

Rearranged some code to reduce duplication and for better object orientation.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• collection/CollectionTree.java (modified) (3 diffs)
• file/WorkspaceTree.java (modified) (2 diffs)
• gui/EnrichPane.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

@@ -7 +7 @@
  * Author: Michael Dewsnip, NZDL Project, University of Waikato, NZ
  *
- * Copyright (C) 2004 New Zealand Digital Library Project
+ * Copyright (C) 2006 New Zealand Digital Library Project
  *
  * This program is free software; you can redistribute it and/or modify
@@ -34 +34 @@
 import org.greenstone.gatherer.gui.tree.DragTree;
 import org.greenstone.gatherer.gui.tree.DragTreeCellRenderer;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -45 +46 @@
     {
     super(name, collection_tree_model, mixed_selection);
+    addMouseListener(this);
+
     setCellRenderer(new CollectionTreeCellRenderer());
-    addMouseListener(this);
+    setBackgroundNonSelectionColor(Configuration.getColor("coloring.collection_tree_background", false));
+    setBackgroundSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
+    setTextNonSelectionColor(Configuration.getColor("coloring.collection_tree_foreground", false));
+    setTextSelectionColor(Configuration.getColor("coloring.collection_selection_foreground", false));
     }
 

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

@@ -7 +7 @@
  * Author: Michael Dewsnip, NZDL Project, University of Waikato, NZ
  *
- * Copyright (C) 2004 New Zealand Digital Library Project
+ * Copyright (C) 2006 New Zealand Digital Library Project
  *
  * This program is free software; you can redistribute it and/or modify
@@ -54 +54 @@
     super(name, WorkspaceTreeModel.getWorkspaceTreeModel(), true);
     addMouseListener(this);
+
+    setBackgroundNonSelectionColor(Configuration.getColor("coloring.workspace_tree_background", false));
+    setBackgroundSelectionColor(Configuration.getColor("coloring.workspace_selection_background", false));
+    setTextNonSelectionColor(Configuration.getColor("coloring.workspace_tree_foreground", false));
+    setTextSelectionColor(Configuration.getColor("coloring.workspace_selection_foreground", false));
     }
 

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

@@ -131 +131 @@
     collection_tree.getSelectionModel().setSelectionMode(TreeSelectionModel.DISCONTIGUOUS_TREE_SELECTION);
     collection_tree.addTreeSelectionListener(this);
-    collection_tree.setBackgroundNonSelectionColor(Configuration.getColor("coloring.collection_tree_background", false));
-    collection_tree.setTextNonSelectionColor(Configuration.getColor("coloring.collection_tree_foreground", false));
-    collection_tree.setBackgroundSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
-    collection_tree.setTextSelectionColor(Configuration.getColor("coloring.collection_selection_foreground", false));
-    collection_tree.setRootVisible(false);
 
     JScrollPane collection_scroll = new JScrollPane(collection_tree);

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

@@ -221 +221 @@
     workspace_tree = new WorkspaceTree(Utility.WORKSPACE_TREE);
     group.add(workspace_tree);
-    workspace_tree.setBackgroundNonSelectionColor(Configuration.getColor("coloring.workspace_tree_background", false));
-    workspace_tree.setTextNonSelectionColor(Configuration.getColor("coloring.workspace_tree_foreground", false));
-    workspace_tree.setBackgroundSelectionColor(Configuration.getColor("coloring.workspace_selection_background", false));
-    workspace_tree.setTextSelectionColor(Configuration.getColor("coloring.workspace_selection_foreground", false));
-    workspace_tree.setRootVisible(false);
 
     workspace_scroll = new JScrollPane(workspace_tree);
@@ -247 +242 @@
     collection_tree.setEnabled(Gatherer.c_man.getCollectionTreeModel() != null);
     group.add(collection_tree);
-    collection_tree.setBackgroundNonSelectionColor(Configuration.getColor("coloring.collection_tree_background", false));
-    collection_tree.setTextNonSelectionColor(Configuration.getColor("coloring.collection_tree_foreground", false));
-    collection_tree.setBackgroundSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
-    collection_tree.setTextSelectionColor(Configuration.getColor("coloring.collection_selection_foreground", false));
-    collection_tree.setRootVisible(false);
 
     collection_scroll = new JScrollPane(collection_tree);

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

@@ -95 +95 @@
     this.setLargeModel(true);
     this.setOpaque(true);
+    this.setRootVisible(false);
     this.setSelectionModel(new DragTreeSelectionModel(this, mixed_selection));
     this.setShowsRootHandles(true);