Changeset 18593 for gli/trunk

Timestamp:

2009-02-25T10:13:39+13:00 (15 years ago)

Author:

kjdon

Message:

GLI three modes change: file tree filters are now editable in librarian mode, and regex plugin/classifier arguments are now shown in librarian mode

Location:

gli/trunk/src/org/greenstone/gatherer

Files:

• cdm/ArgumentConfiguration.java (modified) (2 diffs)
• collection/CollectionTree.java (modified) (1 diff)
• file/WorkspaceTree.java (modified) (1 diff)
• gui/EnrichPane.java (modified) (1 diff)
• gui/GatherPane.java (modified) (1 diff)

gli/trunk/src/org/greenstone/gatherer/cdm/ArgumentConfiguration.java

@@ -209 +209 @@
     ArrayList arguments = data.getArguments();
     int total_height = 250;
-    int current_mode = Configuration.getMode();
+    // not currently used
+    //int current_mode = Configuration.getMode();
 
     String previous_owner = "";
@@ -226 +227 @@
         addHeader(previous_owner, (coloured ? colour_one : colour_two));
         }
-        if(!argument.isHiddenGLI() && (current_mode > Configuration.LIBRARIAN_MODE || !(argument.getType() == Argument.REGEXP))) {
+        if(!argument.isHiddenGLI()) {
         ArgumentControl argument_control = new ArgumentControl(argument, false, null);
         total_height = total_height - argument_control.getPreferredSize().height;

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

@@ -54 +54 @@
 
     filter.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
-    filter.setEditable(Configuration.getMode() > Configuration.LIBRARIAN_MODE);
+    filter.setEditable(Configuration.getMode() >= Configuration.LIBRARIAN_MODE);
     }
 

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

@@ -61 +61 @@
 
     filter.setBackground(Configuration.getColor("coloring.workspace_heading_background", false));
-    filter.setEditable(Configuration.getMode() > Configuration.LIBRARIAN_MODE);
+    filter.setEditable(Configuration.getMode() >= Configuration.LIBRARIAN_MODE);
     }
 

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

@@ -228 +228 @@
     public void modeChanged(int mode)
     {
-    collection_filter.setEditable(mode > Configuration.LIBRARIAN_MODE);
+    collection_filter.setEditable(mode >= Configuration.LIBRARIAN_MODE);
     }
 

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

@@ -394 +394 @@
      */
     public void modeChanged(int mode) {
-    collection_filter.setEditable(mode > Configuration.LIBRARIAN_MODE);
-    workspace_filter.setEditable(mode > Configuration.LIBRARIAN_MODE);
+    collection_filter.setEditable(mode >= Configuration.LIBRARIAN_MODE);
+    workspace_filter.setEditable(mode >= Configuration.LIBRARIAN_MODE);
     }