Changeset 10006 for trunk/gli/src/org/greenstone/gatherer/util

Timestamp:

2005-06-03T14:36:41+12:00 (19 years ago)

Author:

mdewsnip

Message:

Moved Utility.parse to XMLTools.parseXMLFile, as part of tidying up the Utility class.

Location:

trunk/gli/src/org/greenstone/gatherer/util

Files:

• StaticStrings.java (modified) (1 diff)
• Utility.java (modified) (1 diff)
• XMLTools.java (modified) (1 diff)

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

@@ -191 +191 @@
     static final public String PLUGIN_STR                                 = "plugin";
     static final public String PROPERTIES_FILE_EXTENSION                  = ".properties";
-    static final public String PSEUDO_COLLECTCONFIGURATION_XML            = "xml/CollectionConfig.xml";
     static final public String RANGE_ELEMENT                              = "Range";
     static final public String RBRACKET_CHARACTER                         = "]";

trunk/gli/src/org/greenstone/gatherer/util/Utility.java

@@ -1037 +1037 @@
 
 
-    /** Parse in a xml document from a given filename. Note that this filename may need to be resolved by the class loader, especially for template files within a jar. */
-    static public Document parse(String filename, boolean use_classloader)
-    {
-    // Try the class loader if desired (for the applet JAR file)
-    if (use_classloader) {
-        InputStream is = base.getResourceAsStream("/" + filename);
-        if (is != null) {
-        return XMLTools.parseXML(is);
-        }
-    }
-
-    // Try the file outside the classes directory
-    return XMLTools.parseXMLFile(new File(filename));
-    }
-
-
     static public StringBuffer readXMLStream(InputStream input_stream)
     {

trunk/gli/src/org/greenstone/gatherer/util/XMLTools.java

@@ -96 +96 @@
     }
     return child;
+    }
+
+
+    /** Parse an XML document from a given file path */
+    static public Document parseXMLFile(String xml_file_path, boolean use_class_loader)
+    {
+    if (use_class_loader == true) {
+        InputStream is = Utility.base.getResourceAsStream("/" + xml_file_path);  // !!
+        if (is != null) {
+        return parseXML(is);
+        }
+    }
+
+    // Try the file outside the classes directory
+    return parseXMLFile(new File(xml_file_path));
     }