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

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/cdm

Files:

• CollectionConfiguration.java (modified) (1 diff)
• LanguageManager.java (modified) (2 diffs)

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

@@ -326 +326 @@
     String collect_config_name = collect_config_file.getName();
     if(collect_config_name.equals(COLLECTCONFIGURATION_XML)) {
-        // Parse with Utility but don't use class loader
         document = XMLTools.parseXMLFile(collect_config_file);
     }
     // Otherwise if this is a legacy collect.cfg file then read in the template and send to magic parser
     else if(collect_config_name.equals(COLLECT_CFG)) {
-        document = Utility.parse(PSEUDO_COLLECTCONFIGURATION_XML, true);
+        document = XMLTools.parseXMLFile("xml/CollectionConfig.xml", true);
         parse(collect_config_file);
     }

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

@@ -44 +44 @@
 import org.greenstone.gatherer.gui.GLIButton;
 import org.greenstone.gatherer.util.Utility;
+import org.greenstone.gatherer.util.XMLTools;
 import org.w3c.dom.*;
 
@@ -53 +54 @@
     extends DOMProxyListModel {
 
-    static public Document LANGUAGES_DOCUMENT = Utility.parse("xml/languages.xml", true);
+    static public Document LANGUAGES_DOCUMENT = XMLTools.parseXMLFile("xml/languages.xml", true);
 
     static final private Dimension COMPONENT_SIZE = new Dimension(125,25);