Changeset 29044 for main

Timestamp:

2014-05-08T15:58:35+12:00 (10 years ago)

Author:

ak19

Message:

Tidying up after commit.

File:

• main/trunk/gli/src/org/greenstone/gatherer/gui/FormatConversionDialog.java (modified) (4 diffs)

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

@@ -188 +188 @@
     content_pane.setComponentOrientation(Dictionary.getOrientation());
     content_pane.setLayout(new BorderLayout());
-    //content_pane.setLayout(new GridLayout(7,1));
-    //content_pane.setLayout(new BoxLayout(content_pane, BoxLayout.Y_AXIS));
     //content_pane.setBorder(EMPTYBORDER);
 
@@ -418 +416 @@
         // HTMLTidy returns 0 if no warnings or errors, 1 if just Warnings, 2 if Errors (failure)
         // http://sourceforge.net/p/tidy/mailman/tidy-develop/thread/[email protected]/
-        String htmltidy_string = runInteractiveProgram(XMLTIDY, gs3formatstr_notags);//removeSurroundingTags(gs3formatstr));
+        String htmltidy_string = runInteractiveProgram(XMLTIDY, gs3formatstr_notags);
 
         if(process_exitValue >= 2) {
@@ -591 +589 @@
     // </browse|search>
 
-    // Want to return the label: "documentNode|classifierNode"
-
     Element parent = (Element)getParentNode(i); // gets parent of GS2format: <gsf:template>
     String nodeType = parent.getAttribute("match"); //e.g. documentNode, classifierNode, or "" if no match attr
-
     
     if(nodeType.equals("documentNode")) {
-        return FORMATCONVERTER_DOCUMENTNODE;        
+        return FORMATCONVERTER_DOCUMENTNODE; // convert just the part of the format stmt applicable to documentNodes
     } else if(nodeType.equals("classifierNode")) {
-        return FORMATCONVERTER_CLASSIFIERNODE;
-    }
-    return FORMATCONVERTER;
+        return FORMATCONVERTER_CLASSIFIERNODE; // convert just the part of the format stmt applicable to classifierNodes
+    }
+    return FORMATCONVERTER; // convert the entire format statement
     }
 
@@ -823 +818 @@
     private class AcceptAllButtonListener implements ActionListener {
     public void actionPerformed(ActionEvent e) {
-        //statusbar.setText("");
 
         // user okay-ed the lines, store them