[Jreepad-CVS] jreepad/src/jreepad/io TreepadReader.java, 1.2, 1.3 HtmlWriter.java, 1.2, 1.3 Jreepad
Brought to you by:
danstowell
Menu
▾
▴
[Jreepad-CVS] jreepad/src/jreepad/io TreepadReader.java, 1.2, 1.3 HtmlWriter.java, 1.2, 1.3 JreepadWriter.java, 1.2, 1.3 JreepadReader.java, 1.2, 1.3 TreepadWriter.java, 1.2, 1.3 XmlReader.java, 1.2, 1.3 XmlWriter.java, 1.4, 1.5
Update of /cvsroot/jreepad/jreepad/src/jreepad/io In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv12176/src/jreepad/io Modified Files: TreepadReader.java HtmlWriter.java JreepadWriter.java JreepadReader.java TreepadWriter.java XmlReader.java XmlWriter.java Log Message: Save files in the same format and with the same encoding as opened Index: HtmlWriter.java =================================================================== RCS file: /cvsroot/jreepad/jreepad/src/jreepad/io/HtmlWriter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** HtmlWriter.java 26 Jan 2007 21:47:56 -0000 1.2 --- HtmlWriter.java 26 Mar 2007 11:49:24 -0000 1.3 *************** *** 29,32 **** --- 29,33 ---- import jreepad.JreepadArticle; import jreepad.JreepadNode; + import jreepad.JreepadTreeModel; /** *************** *** 67,77 **** * Writes the tree to the output stream starting from selected node. * @param out output stream ! * @param node root node */ ! public void write(OutputStream out, JreepadNode node) throws IOException { Writer writer = new OutputStreamWriter(out, encoding); ! write(writer, node); out.close(); } --- 68,78 ---- * Writes the tree to the output stream starting from selected node. * @param out output stream ! * @param document document to export */ ! public void write(OutputStream out, JreepadTreeModel document) throws IOException { Writer writer = new OutputStreamWriter(out, encoding); ! write(writer, document.getRootNode()); out.close(); } Index: XmlWriter.java =================================================================== RCS file: /cvsroot/jreepad/jreepad/src/jreepad/io/XmlWriter.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** XmlWriter.java 26 Jan 2007 21:47:56 -0000 1.4 --- XmlWriter.java 26 Mar 2007 11:49:24 -0000 1.5 *************** *** 28,31 **** --- 28,32 ---- import jreepad.JreepadArticle; import jreepad.JreepadNode; + import jreepad.JreepadTreeModel; /** *************** *** 44,53 **** } ! public void write(OutputStream out, JreepadNode node) throws IOException { Writer writer = new OutputStreamWriter(out, encoding); writer.write("<?xml version=\"1.0\" encoding=\"" + encoding + "\"?>\n"); ! writeNode(writer, node, 0, true); writer.close(); } --- 45,54 ---- } ! public void write(OutputStream out, JreepadTreeModel document) throws IOException { Writer writer = new OutputStreamWriter(out, encoding); writer.write("<?xml version=\"1.0\" encoding=\"" + encoding + "\"?>\n"); ! writeNode(writer, document.getRootNode(), 0, true); writer.close(); } Index: JreepadWriter.java =================================================================== RCS file: /cvsroot/jreepad/jreepad/src/jreepad/io/JreepadWriter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JreepadWriter.java 20 Jan 2007 13:01:35 -0000 1.2 --- JreepadWriter.java 26 Mar 2007 11:49:24 -0000 1.3 *************** *** 23,27 **** import java.io.OutputStream; ! import jreepad.JreepadNode; /** --- 23,27 ---- import java.io.OutputStream; ! import jreepad.JreepadTreeModel; /** *************** *** 33,36 **** public interface JreepadWriter { ! public void write(OutputStream out, JreepadNode node) throws IOException; } --- 33,36 ---- public interface JreepadWriter { ! public void write(OutputStream out, JreepadTreeModel document) throws IOException; } Index: TreepadReader.java =================================================================== RCS file: /cvsroot/jreepad/jreepad/src/jreepad/io/TreepadReader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TreepadReader.java 26 Jan 2007 21:47:56 -0000 1.2 --- TreepadReader.java 26 Mar 2007 11:49:24 -0000 1.3 *************** *** 28,31 **** --- 28,33 ---- import jreepad.JreepadArticle; import jreepad.JreepadNode; + import jreepad.JreepadPrefs; + import jreepad.JreepadTreeModel; /** *************** *** 49,53 **** } ! public JreepadNode read(InputStream in) throws IOException { --- 51,55 ---- } ! public JreepadTreeModel read(InputStream in) throws IOException { *************** *** 119,123 **** nodeStack.push(newNode); } ! return rootNode; } --- 121,129 ---- nodeStack.push(newNode); } ! ! JreepadTreeModel document = new JreepadTreeModel(rootNode); ! document.setFileFormat(JreepadPrefs.FILETYPE_HJT); ! document.setEncoding(encoding); ! return document; } Index: TreepadWriter.java =================================================================== RCS file: /cvsroot/jreepad/jreepad/src/jreepad/io/TreepadWriter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TreepadWriter.java 20 Jan 2007 13:01:35 -0000 1.2 --- TreepadWriter.java 26 Mar 2007 11:49:24 -0000 1.3 *************** *** 27,30 **** --- 27,31 ---- import jreepad.JreepadNode; + import jreepad.JreepadTreeModel; /** *************** *** 44,53 **** } ! public void write(OutputStream out, JreepadNode node) throws IOException { Writer writer = new OutputStreamWriter(out, encoding); writer.write("<Treepad version 2.7>\n"); ! writeNode(writer, node, 0); writer.close(); } --- 45,54 ---- } ! public void write(OutputStream out, JreepadTreeModel document) throws IOException { Writer writer = new OutputStreamWriter(out, encoding); writer.write("<Treepad version 2.7>\n"); ! writeNode(writer, document.getRootNode(), 0); writer.close(); } Index: JreepadReader.java =================================================================== RCS file: /cvsroot/jreepad/jreepad/src/jreepad/io/JreepadReader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JreepadReader.java 20 Jan 2007 13:01:19 -0000 1.2 --- JreepadReader.java 26 Mar 2007 11:49:24 -0000 1.3 *************** *** 23,27 **** import java.io.InputStream; ! import jreepad.JreepadNode; /** --- 23,27 ---- import java.io.InputStream; ! import jreepad.JreepadTreeModel; /** *************** *** 33,36 **** public interface JreepadReader { ! public JreepadNode read(InputStream in) throws IOException; } --- 33,36 ---- public interface JreepadReader { ! public JreepadTreeModel read(InputStream in) throws IOException; } Index: XmlReader.java =================================================================== RCS file: /cvsroot/jreepad/jreepad/src/jreepad/io/XmlReader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** XmlReader.java 26 Jan 2007 21:47:55 -0000 1.2 --- XmlReader.java 26 Mar 2007 11:49:24 -0000 1.3 *************** *** 27,30 **** --- 27,32 ---- import jreepad.JreepadArticle; import jreepad.JreepadNode; + import jreepad.JreepadPrefs; + import jreepad.JreepadTreeModel; /** *************** *** 47,51 **** } ! public JreepadNode read(InputStream in) throws IOException { --- 49,53 ---- } ! public JreepadTreeModel read(InputStream in) throws IOException { *************** *** 76,80 **** // now: " + currentXmlContent); ! return readNode(reader, currentXmlContent, 0).node; } --- 78,85 ---- // now: " + currentXmlContent); ! JreepadTreeModel document = new JreepadTreeModel(readNode(reader, currentXmlContent, 0).node); ! document.setFileFormat(JreepadPrefs.FILETYPE_XML); ! document.setEncoding(encoding); ! return document; } |
