Changeset 21787

Timestamp:

2010-03-15T12:43:33+13:00 (14 years ago)

Author:

kjdon

Message:

got rid of hack code for disable_OAI build option as this option is no longer used

Location:

main/trunk/gli/src/org/greenstone/gatherer

Files:

• gui/OptionsPane.java (modified) (2 diffs)
• util/StaticStrings.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/gui/OptionsPane.java

@@ -137 +137 @@
         Argument argument = build_options.getArgument(i);
         
-        //A hack to make the disable_OAI option visible in the GLI for Greenstone 3
-        if(argument.getName().equals(StaticStrings.DISABLEOAI_STR) && Gatherer.GS3) {
-          argument.setHiddenGLI(false);
-        }
         if(!argument.isHiddenGLI() && argument.getModeLevel() <= current_mode) {
           // Now attempt to retrieve any existing value for this argument.
@@ -197 +193 @@
         Argument argument = schedule_options.getArgument(i);
         
-        //A hack to make the disable_OAI option visible in the GLI for Greenstone 3
-        if(argument.getName().equals(StaticStrings.DISABLEOAI_STR) && Gatherer.GS3) {
-          argument.setHiddenGLI(false);
-        }
-        if(!argument.isHiddenGLI() && argument.getModeLevel() <= current_mode) {
+       if(!argument.isHiddenGLI() && argument.getModeLevel() <= current_mode) {
           // Now attempt to retrieve any existing value for this argument.
           boolean enabled = schedule_options.getValueEnabled(argument.getName());

main/trunk/gli/src/org/greenstone/gatherer/util/StaticStrings.java

@@ -89 +89 @@
     static final public String DESCRIPTION_STR = "description";
     static final public String DIRECTORY_MAPPINGS_ELEMENT = "DirectoryMappings";
-    static final public String DISABLEOAI_STR = "disable_OAI";
     static final public String DISPLAYITEMLIST_STR = "displayItemList";
     static final public String DISPLAY_STR = "display";