Changeset 29001

Show
Ignore:
Timestamp:
28.04.2014 17:16:58 (5 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:
3 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/src/org/greenstone/gatherer/gui/FormatConversionDialog.java

    r28995 r29001  
    224224            Node child = children.item(i); 
    225225            if(child.getNodeType() == Node.CDATA_SECTION_NODE) {     
    226             // there are no GS2 statements in col config that need converting to GS3,  
    227             // and can open the collection without going through the FormatConversionDialog 
     226            // there are GS2 statements in col config, but they've already been converted to GS3 
     227            // can open the collection without going through the FormatConversionDialog 
    228228            return OpenCollectionDialog.OK_OPTION;  
    229229            } 
  • main/trunk/gli/src/org/greenstone/gatherer/gui/OpenCollectionDialog.java

    r28995 r29001  
    439439        } 
    440440 
    441         if(result == OK_OPTION) { 
    442         Gatherer.collectDirectoryHasChanged(Gatherer.getCollectDirectoryPath(),  
     441        Gatherer.collectDirectoryHasChanged(Gatherer.getCollectDirectoryPath(),  
    443442                newCollectPath, Gatherer.g_man.getContentPane());  
    444443            // will tell the server that the collect directory has changed and that 
    445444            // the workspace needs to be refreshed (Documents in Greenstone Collections) 
    446         } 
    447445    } 
    448446    } 
  • main/trunk/gli/src/org/greenstone/gatherer/util/XMLTools.java

    r28995 r29001  
    340340    Document doc = null; 
    341341    try { 
    342         /*SAXParserFactory factory = SAXParserFactory.newInstance(); 
    343         factory.setNamespaceAware(true); 
    344         //factory.setValidating (true); 
    345         SAXParser parser = factory.newSAXParser(); 
    346         InputSource iSource = new InputSource(new StringReader(xml_str)); 
    347         //              parser.parse (iSource, new DefaultHandler ()); 
    348          
    349         org.xml.sax.XMLReader reader = parser.getXMLReader(); 
    350         reader.setContentHandler(new DefaultHandler()); 
    351         reader.setErrorHandler(new DefaultHandler()); 
    352         doc = reader.parse(iSource); 
    353         */ 
    354342 
    355343        DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();