Changeset 29044

Show
Ignore:
Timestamp:
08.05.2014 15:58:35 (5 years ago)
Author:
ak19
Message:

Tidying up after commit.

Files:
1 modified

Legend:

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

    r29043 r29044  
    188188    content_pane.setComponentOrientation(Dictionary.getOrientation()); 
    189189    content_pane.setLayout(new BorderLayout()); 
    190     //content_pane.setLayout(new GridLayout(7,1)); 
    191     //content_pane.setLayout(new BoxLayout(content_pane, BoxLayout.Y_AXIS)); 
    192190    //content_pane.setBorder(EMPTYBORDER); 
    193191 
     
    418416        // HTMLTidy returns 0 if no warnings or errors, 1 if just Warnings, 2 if Errors (failure) 
    419417        // http://sourceforge.net/p/tidy/mailman/tidy-develop/thread/20020811204058.GD1137@shaw.ca/ 
    420         String htmltidy_string = runInteractiveProgram(XMLTIDY, gs3formatstr_notags);//removeSurroundingTags(gs3formatstr)); 
     418        String htmltidy_string = runInteractiveProgram(XMLTIDY, gs3formatstr_notags); 
    421419 
    422420        if(process_exitValue >= 2) { 
     
    591589    // </browse|search> 
    592590 
    593     // Want to return the label: "documentNode|classifierNode" 
    594  
    595591    Element parent = (Element)getParentNode(i); // gets parent of GS2format: <gsf:template> 
    596592    String nodeType = parent.getAttribute("match"); //e.g. documentNode, classifierNode, or "" if no match attr 
    597  
    598593     
    599594    if(nodeType.equals("documentNode")) { 
    600         return FORMATCONVERTER_DOCUMENTNODE;         
     595        return FORMATCONVERTER_DOCUMENTNODE; // convert just the part of the format stmt applicable to documentNodes 
    601596    } else if(nodeType.equals("classifierNode")) { 
    602         return FORMATCONVERTER_CLASSIFIERNODE; 
    603     } 
    604     return FORMATCONVERTER; 
     597        return FORMATCONVERTER_CLASSIFIERNODE; // convert just the part of the format stmt applicable to classifierNodes 
     598    } 
     599    return FORMATCONVERTER; // convert the entire format statement 
    605600    } 
    606601 
     
    823818    private class AcceptAllButtonListener implements ActionListener { 
    824819    public void actionPerformed(ActionEvent e) { 
    825         //statusbar.setText(""); 
    826820 
    827821        // user okay-ed the lines, store them