Changeset 9137

Timestamp:

2005-02-22T15:40:26+13:00 (19 years ago)

Author:

kjdon

Message:

a colleciton now has build_options and import_options instead of just one

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• gui/CreatePane.java (modified) (4 diffs)
• gui/OptionsPane.java (modified) (7 diffs)
• shell/GShell.java (modified) (1 diff)

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

@@ -48 +48 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.cdm.SearchTypeManager;
-import org.greenstone.gatherer.collection.BuildOptions;
 import org.greenstone.gatherer.collection.Collection;
 import org.greenstone.gatherer.shell.GBasicProgressMonitor;
@@ -519 +518 @@
     Collection current_collection = Gatherer.c_man.getCollection();
     if (current_collection != previous_collection && !Gatherer.c_man.isImporting()) {
-        this.options_pane = new OptionsPane(current_collection.build_options);
+        this.options_pane = new OptionsPane(current_collection.import_options, current_collection.build_options);
         if (previous_collection != null) {
         // clear the log
@@ -627 +626 @@
         // Set removeold automatically.
         if(Gatherer.c_man.ready() && Gatherer.c_man.built()) {
-        Gatherer.c_man.getCollection().build_options.setImportValue("removeold", true, null);
+        Gatherer.c_man.getCollection().import_options.setValue("removeold", true, null);
         }
         // Call CollectionManagers method to build collection.
@@ -664 +663 @@
         build_monitor.reset();
         // Set removeold automatically.
-        Gatherer.c_man.getCollection().build_options.setImportValue("removeold", true, null);
+        Gatherer.c_man.getCollection().import_options.setValue("removeold", true, null);
         // Remove the collection lock.
         //Gatherer.g_man.lockCollection(false, false);

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

@@ -49 +49 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.cdm.Argument;
-import org.greenstone.gatherer.collection.BuildOptions;
+import org.greenstone.gatherer.collection.ScriptOptions;
 import org.greenstone.gatherer.collection.Collection;
 import org.greenstone.gatherer.collection.CollectionManager;
@@ -83 +83 @@
     private ArrayList current_controls;
 
-    /** The <strong>BuildOptions</strong> data object contains all the option settings we wish to persist between Gatherer sessions (and thus is stored in <strong>Collection</strong>). */
-    private BuildOptions build_options = null;
+    /** The <strong>ScriptOptions</strong> data object contains all the option settings we wish to persist between Gatherer sessions (and thus is stored in <strong>Collection</strong>). */
+    private ScriptOptions build_options = null;
+    private ScriptOptions import_options = null;
 
     private FileEntry file_entry = null;
@@ -96 +97 @@
 
     /** The default constructor creates the few session length options, but either retrieves the rest from the current collection, or creates a default set of options. */
-    public OptionsPane(BuildOptions build_options) {
+    public OptionsPane(ScriptOptions import_options, ScriptOptions build_options) {
     this.build_options = build_options;
+    this.import_options = import_options;
     this.current_controls = new ArrayList();
     this.writing_documents = new Vector();
@@ -127 +129 @@
     ArrayList build_arguments = new ArrayList();
     int current_mode = Configuration.getMode();
-    int total_build_argument_count = build_options.getBuildArgumentCount();       
+    int total_build_argument_count = build_options.getArgumentCount();
+       
     for(int i = 0; i < total_build_argument_count; i++) {
         // Retrieve the argument so we know how to format the control.
-        Argument argument = build_options.getBuildArgument(i);
+        Argument argument = build_options.getArgument(i);
         if(!argument.isHiddenGLI() && argument.getModeLevel() <= current_mode) {
         // Now attempt to retrieve any existing value for this argument.
-        boolean enabled = build_options.getBuildValueEnabled(argument.getName());
-        String value = build_options.getBuildValue(argument.getName());
+        boolean enabled = build_options.getValueEnabled(argument.getName());
+        String value = build_options.getValue(argument.getName());
         ArgumentControl argument_control = new ArgumentControl(BUILD, argument, enabled, value);
         build_arguments.add(argument_control);
@@ -187 +190 @@
     ArrayList import_arguments = new ArrayList();
     int current_mode = Configuration.getMode();
-    int total_import_argument_count = build_options.getImportArgumentCount();       
+    int total_import_argument_count = import_options.getArgumentCount();       
     for(int i = 0; i < total_import_argument_count; i++) {
         // Retrieve the argument so we know how to format the control.
-        Argument argument = build_options.getImportArgument(i);
+        Argument argument = import_options.getArgument(i);
         if(!argument.isHiddenGLI() && argument.getModeLevel() <= current_mode) {
         // Now attempt to retrieve any existing value for this argument.
-        boolean enabled = build_options.getImportValueEnabled(argument.getName());
-        String value = build_options.getImportValue(argument.getName());
+        boolean enabled = import_options.getValueEnabled(argument.getName());
+        String value = import_options.getValue(argument.getName());
         ArgumentControl argument_control = new ArgumentControl(IMPORT, argument, enabled, value);
         import_arguments.add(argument_control);
@@ -573 +576 @@
         if(!enable && value == null) {
         if(type == BUILD) {
-            build_options.removeBuildValue(name);
+            build_options.removeValue(name);
         }
         else {
-            build_options.removeImportValue(name);
+            import_options.removeValue(name);
         }
         }
@@ -582 +585 @@
         else {
         if(type == BUILD) {
-            build_options.setBuildValue(name, enable, value);
+            build_options.setValue(name, enable, value);
         }
         else {
-            build_options.setImportValue(name, enable, value);
+            import_options.setValue(name, enable, value);
         }
         }

trunk/gli/src/org/greenstone/gatherer/shell/GShell.java

@@ -504 +504 @@
     if(type == IMPORT || type == BUILD) {
         if(type == IMPORT) {
-        out_name = (String) Gatherer.c_man.getCollection().build_options.getImportValue("out");
+        out_name = (String) Gatherer.c_man.getCollection().import_options.getValue("out");
         }
         else {
-        out_name = (String) Gatherer.c_man.getCollection().build_options.getBuildValue("out");
+        out_name = (String) Gatherer.c_man.getCollection().build_options.getValue("out");
         }
         if(out_name != null && out_name.length() > 0) {