Changeset 25610 for main/trunk/gli/src
- Timestamp:
- 2012-05-16T13:40:43+12:00 (12 years ago)
- Location:
- main/trunk/gli/src/org/greenstone/gatherer
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/gli/src/org/greenstone/gatherer/cdm/Format4gs3Manager.java
r25576 r25610 31 31 import javax.swing.event.*; 32 32 import javax.swing.undo.*; 33 import javax.xml.parsers.DocumentBuilderFactory; 34 33 35 import org.greenstone.gatherer.Configuration; 34 36 import org.greenstone.gatherer.DebugStream; … … 44 46 import org.greenstone.gatherer.util.XMLTools; 45 47 import org.w3c.dom.*; 48 import org.xml.sax.InputSource; 46 49 47 50 import java.awt.FontMetrics; … … 49 52 import java.awt.Insets; 50 53 import java.awt.Rectangle; 54 import java.io.ByteArrayInputStream; 51 55 52 56 /** … … 234 238 //Collections.sort (feature_model); 235 239 return feature_model; 240 } 241 242 private String addSurroundingTags(String xml) 243 { 244 return "<ROOTELEMENT>" + xml + "</ROOTELEMENT>"; 245 } 246 247 private String removeSurrondingTags(String xml) 248 { 249 return xml.replace("<ROOTELEMENT>\n", "").replace("<ROOTELEMENT>", "").replace("</ROOTELEMENT>", ""); 236 250 } 237 251 … … 377 391 splitPane.add(center_pane, JSplitPane.BOTTOM); 378 392 splitPane.setDividerLocation(150); 379 393 380 394 setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0)); 381 395 setLayout(new BorderLayout()); … … 503 517 if (msg.startsWith(XMLTools.WELLFORMED)) 504 518 { 505 format.setPureFormat( Format4gs3.toOneLineFormat(format_str));519 format.setPureFormat(format_str); 506 520 format.update(); 507 521 format_list_model.refresh(format); … … 549 563 ///ystem.err.println("There is an existing format!"); 550 564 format_list.setSelectedValue(format, true); 551 editor_textarea.setText(format.getPureFormat()); 565 Element formatElem = null; 566 try 567 { 568 InputSource is = new InputSource(new ByteArrayInputStream(addSurroundingTags(format.getPureFormat()).getBytes("utf-8"))); 569 formatElem = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(is).getDocumentElement(); 570 } 571 catch (Exception ex) 572 { 573 ex.printStackTrace(); 574 } 575 576 if (formatElem != null) 577 { 578 StringBuffer sb = new StringBuffer(); 579 XMLTools.xmlNodeToString(sb, formatElem, true, " ", 0); 580 editor_textarea.setText(removeSurrondingTags(sb.toString())); 581 } 582 else 583 { 584 editor_textarea.setText(format.getPureFormat()); 585 } 552 586 editor_textarea.setCaretPosition(0); 553 587 … … 614 648 existingFormat(format.getFeatureName().startsWith(Classifier.CLASSIFIER_PREFIX)); 615 649 616 editor_textarea.setText(format.getPureFormat()); 650 Element formatElem = null; 651 try 652 { 653 InputSource is = new InputSource(new ByteArrayInputStream(addSurroundingTags(format.getPureFormat()).getBytes("utf-8"))); 654 formatElem = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(is).getDocumentElement(); 655 } 656 catch (Exception ex) 657 { 658 ex.printStackTrace(); 659 } 660 661 if (formatElem != null) 662 { 663 StringBuffer sb = new StringBuffer(); 664 XMLTools.xmlNodeToString(sb, formatElem, true, " ", 0); 665 editor_textarea.setText(removeSurrondingTags(sb.toString())); 666 } 667 else 668 { 669 editor_textarea.setText(format.getPureFormat()); 670 } 617 671 editor_textarea.setCaretPosition(0); 618 672 -
main/trunk/gli/src/org/greenstone/gatherer/util/XMLTools.java
r25206 r25610 944 944 { 945 945 StringBuffer sb = new StringBuffer(""); 946 xmlNodeToString(sb, e, true, 2);946 xmlNodeToString(sb, e, true, "\t", 2); 947 947 return sb.toString(); 948 948 } 949 949 950 p rivate static void xmlNodeToString(StringBuffer sb, Node e, boolean indent, int depth)950 public static void xmlNodeToString(StringBuffer sb, Node e, boolean indent, String indentString, int depth) 951 951 { 952 952 if (e.getNodeType() == Node.TEXT_NODE) … … 974 974 for (int i = 0; i < depth; i++) 975 975 { 976 sb.append( '\t');976 sb.append(indentString); 977 977 } 978 978 } … … 1033 1033 for (int i = 0; i < len; i++) 1034 1034 { 1035 xmlNodeToString(sb, children.item(i), indent, depth + 1);1035 xmlNodeToString(sb, children.item(i), indent, indentString, depth + 1); 1036 1036 } 1037 1037 … … 1040 1040 for (int i = 0; i < depth; i++) 1041 1041 { 1042 sb.append( '\t');1042 sb.append(indentString); 1043 1043 } 1044 1044 }
Note:
See TracChangeset
for help on using the changeset viewer.