Changeset 13752

Timestamp:

2007-01-23T14:48:57+13:00 (17 years ago)

Author:

mdewsnip

Message:

Removed a whole bunch more dead code.

File:

• trunk/gli/src/org/greenstone/gatherer/collection/ScriptOptions.java (modified) (5 diffs)

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

@@ -2 +2 @@
 
 import java.io.*;
-import java.lang.ref.*;
-import java.net.*;
 import java.util.*;
-import org.apache.xerces.parsers.DOMParser;
 import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.DebugStream;
@@ -14 +11 @@
 import org.greenstone.gatherer.util.ArrayTools;
 import org.greenstone.gatherer.util.Codec;
-import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
 import org.greenstone.gatherer.util.XMLTools;
 import org.w3c.dom.*;
-import org.xml.sax.InputSource;
+
 
 /** Build options uses the argument list found in config.xml and the current settings from the loaded collection configuration to represent the options the user wants to use during import and build. If there are no arguments stored in config.xml, or if the user indicates the argument are out of date, this class tries to parse new ones. */
@@ -26 +22 @@
     /** The root element of the values tree. */
     private Element values_element;
-    /** A cache of previously created arguments. */
-    private Hashtable arguments_cache = new Hashtable();
-    /** whether the values should be saved or not */
     /** The name of an argument element. */
     static final private String ARGUMENT = "Argument";
@@ -52 +45 @@
 
     /** Retrieve the indexth argument */
-    public Argument getArgument(int index) {
+    public Argument getArgument(int index)
+    {
     Argument argument = null;
-    // Try to find the argument in the cache.
-    SoftReference reference = (SoftReference) arguments_cache.get(new Integer(index));
-    if(reference != null) {
-        argument = (Argument) reference.get();
-    }
-    // Otherwise generate a new argument.
-    if(argument == null) {
-        NodeList option_list = arguments_element.getElementsByTagName(OPTION);
-        if(0 <= index && index < option_list.getLength()) {
-        argument = new Argument();
-        argument.parseXML((Element) option_list.item(index));
-        }
-    }
+
+    NodeList option_list = arguments_element.getElementsByTagName(OPTION);
+    if (index >= 0 && index < option_list.getLength()) {
+        argument = new Argument();
+        argument.parseXML((Element) option_list.item(index));
+    }
+
     return argument;
     }
@@ -79 +67 @@
     }
 
-    /** Retrieve all the argument names and values  */
-    public String[] getArguments() {
-    String arguments[] = null;
-    NodeList argument_list = null;
-    argument_list = values_element.getElementsByTagName(ARGUMENT);
-    for(int i = 0; i < argument_list.getLength(); i++) {
-        Element argument = (Element) argument_list.item(i);
-        ArrayTools.add(arguments, argument.getAttribute(NAME));
-        String value = XMLTools.getValue(argument);
-        if(value != null && value.length() > 0) {
-        ArrayTools.add(arguments, value);
-        }
-    }
-    return arguments;
-    }
 
     /** Retrieve the value of a certain argument. */