Changeset 29044 for main/trunk/gli/src
- Timestamp:
- 2014-05-08T15:58:35+12:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/gli/src/org/greenstone/gatherer/gui/FormatConversionDialog.java
r29043 r29044 188 188 content_pane.setComponentOrientation(Dictionary.getOrientation()); 189 189 content_pane.setLayout(new BorderLayout()); 190 //content_pane.setLayout(new GridLayout(7,1));191 //content_pane.setLayout(new BoxLayout(content_pane, BoxLayout.Y_AXIS));192 190 //content_pane.setBorder(EMPTYBORDER); 193 191 … … 418 416 // HTMLTidy returns 0 if no warnings or errors, 1 if just Warnings, 2 if Errors (failure) 419 417 // http://sourceforge.net/p/tidy/mailman/tidy-develop/thread/[email protected]/ 420 String htmltidy_string = runInteractiveProgram(XMLTIDY, gs3formatstr_notags); //removeSurroundingTags(gs3formatstr));418 String htmltidy_string = runInteractiveProgram(XMLTIDY, gs3formatstr_notags); 421 419 422 420 if(process_exitValue >= 2) { … … 591 589 // </browse|search> 592 590 593 // Want to return the label: "documentNode|classifierNode"594 595 591 Element parent = (Element)getParentNode(i); // gets parent of GS2format: <gsf:template> 596 592 String nodeType = parent.getAttribute("match"); //e.g. documentNode, classifierNode, or "" if no match attr 597 598 593 599 594 if(nodeType.equals("documentNode")) { 600 return FORMATCONVERTER_DOCUMENTNODE; 595 return FORMATCONVERTER_DOCUMENTNODE; // convert just the part of the format stmt applicable to documentNodes 601 596 } 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 605 600 } 606 601 … … 823 818 private class AcceptAllButtonListener implements ActionListener { 824 819 public void actionPerformed(ActionEvent e) { 825 //statusbar.setText("");826 820 827 821 // user okay-ed the lines, store them
Note:
See TracChangeset
for help on using the changeset viewer.