Changeset 29001 for main/trunk

Timestamp:

2014-04-28T17:16:58+12:00 (10 years ago)

Author:

ak19

Message:

Correction to recent commit in OpenCollectionDialog. And cosmetic changes to FormatConversionDialog and XMLTools

Location:

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

Files:

• gui/FormatConversionDialog.java (modified) (1 diff)
• gui/OpenCollectionDialog.java (modified) (1 diff)
• util/XMLTools.java (modified) (1 diff)

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

@@ -224 +224 @@
             Node child = children.item(i);
             if(child.getNodeType() == Node.CDATA_SECTION_NODE) {    
-            // there are no GS2 statements in col config that need converting to GS3, 
-            // and can open the collection without going through the FormatConversionDialog
+            // there are GS2 statements in col config, but they've already been converted to GS3
+            // can open the collection without going through the FormatConversionDialog
             return OpenCollectionDialog.OK_OPTION; 
             }

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

@@ -439 +439 @@
         }
 
-        if(result == OK_OPTION) {
-        Gatherer.collectDirectoryHasChanged(Gatherer.getCollectDirectoryPath(), 
+        Gatherer.collectDirectoryHasChanged(Gatherer.getCollectDirectoryPath(), 
                 newCollectPath, Gatherer.g_man.getContentPane()); 
             // will tell the server that the collect directory has changed and that
             // the workspace needs to be refreshed (Documents in Greenstone Collections)
-        }
     }
     }

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

@@ -340 +340 @@
     Document doc = null;
     try {
-        /*SAXParserFactory factory = SAXParserFactory.newInstance();
-        factory.setNamespaceAware(true);
-        //factory.setValidating (true);
-        SAXParser parser = factory.newSAXParser();
-        InputSource iSource = new InputSource(new StringReader(xml_str));
-        //              parser.parse (iSource, new DefaultHandler ());
-        
-        org.xml.sax.XMLReader reader = parser.getXMLReader();
-        reader.setContentHandler(new DefaultHandler());
-        reader.setErrorHandler(new DefaultHandler());
-        doc = reader.parse(iSource);
-        */
 
         DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();