[Jreepad-CVS] jreepad/src/jreepad JreepadViewer.java, 1.44, 1.45 JreepadNode.java, 1.20, 1.21 find.
Brought to you by:
danstowell
Menu
▾
▴
[Jreepad-CVS] jreepad/src/jreepad JreepadViewer.java, 1.44, 1.45 JreepadNode.java, 1.20, 1.21 find.java, 1.4, 1.5
|
From: PeWu <pe...@us...> - 2007-01-18 09:37:31
|
Update of /cvsroot/jreepad/jreepad/src/jreepad In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv22523/src/jreepad Modified Files: JreepadViewer.java JreepadNode.java find.java Log Message: refactoring: started new reader/writer framework and moved two writers out from JreepadNode Index: find.java =================================================================== RCS file: /cvsroot/jreepad/jreepad/src/jreepad/find.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** find.java 16 Jan 2007 23:56:03 -0000 1.4 --- find.java 18 Jan 2007 09:37:27 -0000 1.5 *************** *** 32,38 **** --- 32,43 ---- */ import java.io.*; + import javax.swing.tree.TreePath; import java.util.Vector; + import jreepad.io.JreepadWriter; + import jreepad.io.TreepadWriter; + import jreepad.io.XmlWriter; + /* *************** *** 99,103 **** private static final File prefsFile = new File(System.getProperty("user.home"), ".jreepref"); ! public static void main(String[] args) { int maxResults = 200; // A default which can be overridden --- 104,108 ---- private static final File prefsFile = new File(System.getProperty("user.home"), ".jreepref"); ! public static void main(String[] args) throws IOException { int maxResults = 200; // A default which can be overridden *************** *** 261,274 **** break; case OUTPUT_XML: - resultsParent = new JreepadNode("Search results",""); - for(int i=0; i<res.length; i++) - resultsParent.add(res[i].getNode()); - System.out.println(resultsParent.toXml("ISO-8859-1")); // FIXME: What should the encoding be, if anything? - break; case OUTPUT_HJT: resultsParent = new JreepadNode("Search results",""); for(int i=0; i<res.length; i++) resultsParent.add(res[i].getNode()); ! System.out.println(resultsParent.toTreepadString()); break; case OUTPUT_TITLES: --- 266,280 ---- break; case OUTPUT_XML: case OUTPUT_HJT: resultsParent = new JreepadNode("Search results",""); for(int i=0; i<res.length; i++) resultsParent.add(res[i].getNode()); ! String outputEncoding = "ISO-8859-1"; // FIXME: What should the encoding be? ! JreepadWriter writer; ! if (outputFormat == OUTPUT_XML) ! writer= new XmlWriter(outputEncoding); ! else ! writer= new TreepadWriter(outputEncoding); ! writer.write(System.out, resultsParent); break; case OUTPUT_TITLES: *************** *** 290,293 **** --- 296,300 ---- return n.getTitle() + "\n " + res.getArticleQuote().replace('\n', ' '); } + /* private static String formatResultXml(JreepadSearcher.JreepadSearchResult res) { *************** *** 297,300 **** --- 304,308 ---- // return "<node title=\"" + n.getTitle() + "\">" + n.getContent() + "</node>"; } + */ private static void printUsage() Index: JreepadViewer.java =================================================================== RCS file: /cvsroot/jreepad/jreepad/src/jreepad/JreepadViewer.java,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** JreepadViewer.java 16 Jan 2007 23:56:02 -0000 1.44 --- JreepadViewer.java 18 Jan 2007 09:37:27 -0000 1.45 *************** *** 47,50 **** --- 47,54 ---- import java.lang.reflect.*; + import jreepad.io.JreepadWriter; + import jreepad.io.TreepadWriter; + import jreepad.io.XmlWriter; + public class JreepadViewer extends JFrame // implements ApplicationListener { *************** *** 1648,1665 **** setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); ! // Get the output to be written - as HJT or as XML ! String writeMe; if(getPrefs().mainFileType==JreepadPrefs.FILETYPE_XML) ! writeMe = theJreepad.getRootJreepadNode().toXml(getPrefs().getEncoding()); else ! writeMe = theJreepad.getRootJreepadNode().toTreepadString(); - FileOutputStream fO = new FileOutputStream(getPrefs().saveLocation); - DataOutputStream dO = new DataOutputStream(fO); - BufferedWriter bO = new BufferedWriter(new OutputStreamWriter(dO, getPrefs().getEncoding())); - bO.write(writeMe); - bO.close(); - dO.close(); - fO.close(); if(MAC_OS_X){ com.apple.eio.FileManager.setFileTypeAndCreator(getPrefs().saveLocation.toString(), --- 1652,1665 ---- setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); ! // Write to either HJT or XML ! JreepadWriter writer; if(getPrefs().mainFileType==JreepadPrefs.FILETYPE_XML) ! writer = new XmlWriter(getPrefs().getEncoding()); else ! writer = new TreepadWriter(getPrefs().getEncoding()); ! OutputStream fos = new FileOutputStream(getPrefs().saveLocation); ! writer.write(fos, theJreepad.getRootJreepadNode()); ! fos.close(); if(MAC_OS_X){ com.apple.eio.FileManager.setFileTypeAndCreator(getPrefs().saveLocation.toString(), *************** *** 1697,1714 **** getPrefs().saveLocation = fileChooser.getSelectedFile(); ! // Get the output to be written - as HJT or as XML ! String writeMe; ! if(getPrefs().mainFileType==JreepadPrefs.FILETYPE_XML) ! writeMe = theJreepad.getRootJreepadNode().toXml(getPrefs().getEncoding()); else ! writeMe = theJreepad.getRootJreepadNode().toTreepadString(); - FileOutputStream fO = new FileOutputStream(getPrefs().saveLocation); - DataOutputStream dO = new DataOutputStream(fO); - BufferedWriter bO = new BufferedWriter(new OutputStreamWriter(dO, getPrefs().getEncoding())); - bO.write(writeMe); - bO.close(); - dO.close(); - fO.close(); if(MAC_OS_X){ com.apple.eio.FileManager.setFileTypeAndCreator(getPrefs().saveLocation.toString(), --- 1697,1710 ---- getPrefs().saveLocation = fileChooser.getSelectedFile(); ! // Write to either HJT or XML ! JreepadWriter writer; ! if(getPrefs().mainFileType == JreepadPrefs.FILETYPE_XML) ! writer = new XmlWriter(getPrefs().getEncoding()); else ! writer = new TreepadWriter(getPrefs().getEncoding()); ! OutputStream fos = new FileOutputStream(getPrefs().saveLocation); ! writer.write(fos, theJreepad.getRootJreepadNode()); ! fos.close(); if(MAC_OS_X){ com.apple.eio.FileManager.setFileTypeAndCreator(getPrefs().saveLocation.toString(), *************** *** 1741,1750 **** setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); getPrefs().backupLocation = fileChooser.getSelectedFile(); ! String writeMe = theJreepad.getRootJreepadNode().toTreepadString(); ! FileOutputStream fO = new FileOutputStream(getPrefs().backupLocation); ! DataOutputStream dO = new DataOutputStream(fO); ! dO.writeBytes(writeMe); ! dO.close(); ! fO.close(); setCursor(Cursor.getDefaultCursor()); return true; --- 1737,1747 ---- setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); getPrefs().backupLocation = fileChooser.getSelectedFile(); ! ! // Write to either HJT ! JreepadWriter writer = new TreepadWriter(getPrefs().getEncoding()); ! OutputStream fos = new FileOutputStream(getPrefs().backupLocation); ! writer.write(fos, theJreepad.getRootJreepadNode()); ! fos.close(); ! setCursor(Cursor.getDefaultCursor()); return true; *************** *** 1886,1892 **** switch(exportFormat) { - case FILE_FORMAT_HJT: - output = theJreepad.getCurrentNode().toTreepadString(); - break; case FILE_FORMAT_HTML: output = theJreepad.getCurrentNode().exportAsHtml(getPrefs().htmlExportArticleType, --- 1883,1886 ---- *************** *** 1895,1901 **** break; case FILE_FORMAT_XML: ! // output = theJreepad.getCurrentNode().exportAsSimpleXml(); ! output = theJreepad.getCurrentNode().toXml(getPrefs().getEncoding()); ! break; case FILE_FORMAT_TEXT: output = theJreepad.getCurrentNode().getContent(); --- 1889,1904 ---- break; case FILE_FORMAT_XML: ! case FILE_FORMAT_HJT: ! JreepadWriter writer; ! if (exportFormat == FILE_FORMAT_XML) ! writer= new XmlWriter(getPrefs().getEncoding()); ! else ! writer= new TreepadWriter(getPrefs().getEncoding()); ! OutputStream fos = new FileOutputStream(getPrefs().exportLocation); ! writer.write(fos, theJreepad.getCurrentNode()); ! fos.close(); ! setCursor(Cursor.getDefaultCursor()); ! return; ! case FILE_FORMAT_TEXT: output = theJreepad.getCurrentNode().getContent(); Index: JreepadNode.java =================================================================== RCS file: /cvsroot/jreepad/jreepad/src/jreepad/JreepadNode.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** JreepadNode.java 16 Jan 2007 23:56:03 -0000 1.20 --- JreepadNode.java 18 Jan 2007 09:37:27 -0000 1.21 *************** *** 24,29 **** import java.io.IOException; import java.io.InputStreamReader; - import java.io.ObjectInputStream; - import java.io.ObjectOutputStream; import java.io.Serializable; import java.text.CharacterIterator; --- 24,27 ---- *************** *** 673,677 **** } ! private void writeObject(ObjectOutputStream out) throws IOException { --- 671,675 ---- } ! /* private void writeObject(ObjectOutputStream out) throws IOException { *************** *** 686,705 **** constructFromInputStream(new InputStreamReader(in), false); } ! public String toTreepadString() ! { ! return "<Treepad version 2.7>\n" + toTreepadString(0); ! } ! public String toTreepadString(int currentDepth) ! { ! StringBuffer ret = new StringBuffer("dt=Text\n<node>\n"); ! ret.append(getTitle() + "\n" + (currentDepth++) + "\n" + getContent() ! + "\n" ! // + (currentDepth==1?"ROOTNODEMANIA":"\n") // Not sure why I need to be slightly unusual with the root node... ! + "<end node> 5P9i0s8y19Z\n"); ! for(int i=0; i<getChildCount(); i++) ! ret.append(((JreepadNode)getChildAt(i)).toTreepadString(currentDepth)); ! // System.out.println("\n\n____________________NODE AT DEPTH " + currentDepth + "_________________________\n" + ret); ! return ret.toString(); ! } public void add(JreepadNode child) --- 684,688 ---- constructFromInputStream(new InputStreamReader(in), false); } ! */ public void add(JreepadNode child) *************** *** 1283,1351 **** } - public String toXml(String encoding) - { - String ret = "<?xml version=\"1.0\" encoding=\"" + encoding + "\"?>\n"; - ret += toXmlNoHeader(encoding, 0, true); - return stripControlChars(ret); - } - - public String toXmlNoHeader(String encoding, int depth, boolean incChildren) - { - StringBuffer ret = new StringBuffer("<node "); - if(depth==0) - ret.append("xmlns=\"http://jreepad.sourceforge.net/formats\" |
