[Jreepad-CVS] jreepad/src/jreepad/io TreepadReader.java, 1.3, 1.4 AutoDetectReader.java, 1.1, 1.2 XmlReader.java, 1.3, 1.4

[PeWu <pe...@us...>]

Update of /cvsroot/jreepad/jreepad/src/jreepad/io
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv27250/src/jreepad/io

Modified Files:
	TreepadReader.java AutoDetectReader.java XmlReader.java 
Log Message:
Fixes to the file saving and loading code

Index: AutoDetectReader.java
===================================================================
RCS file: /cvsroot/jreepad/jreepad/src/jreepad/io/AutoDetectReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AutoDetectReader.java	20 Jan 2007 13:01:19 -0000	1.1
--- AutoDetectReader.java	3 Apr 2007 12:41:30 -0000	1.2
***************
*** 23,27 ****
  import java.io.InputStream;
  
! import jreepad.JreepadNode;
  
  /**
--- 23,27 ----
  import java.io.InputStream;
  
! import jreepad.JreepadTreeModel;
  
  /**
***************
*** 43,47 ****
      }
  
!     public JreepadNode read(InputStream in)
          throws IOException
      {
--- 43,47 ----
      }
  
!     public JreepadTreeModel read(InputStream in)
          throws IOException
      {

Index: XmlReader.java
===================================================================
RCS file: /cvsroot/jreepad/jreepad/src/jreepad/io/XmlReader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** XmlReader.java	26 Mar 2007 11:49:24 -0000	1.3
--- XmlReader.java	3 Apr 2007 12:41:30 -0000	1.4
***************
*** 79,83 ****
  
          JreepadTreeModel document = new JreepadTreeModel(readNode(reader, currentXmlContent, 0).node);
!         document.setFileFormat(JreepadPrefs.FILETYPE_XML);
          document.setEncoding(encoding);
          return document;
--- 79,83 ----
  
          JreepadTreeModel document = new JreepadTreeModel(readNode(reader, currentXmlContent, 0).node);
!         document.setFileType(JreepadPrefs.FILETYPE_XML);
          document.setEncoding(encoding);
          return document;

Index: TreepadReader.java
===================================================================
RCS file: /cvsroot/jreepad/jreepad/src/jreepad/io/TreepadReader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TreepadReader.java	26 Mar 2007 11:49:24 -0000	1.3
--- TreepadReader.java	3 Apr 2007 12:41:30 -0000	1.4
***************
*** 123,127 ****
  
          JreepadTreeModel document = new JreepadTreeModel(rootNode);
!         document.setFileFormat(JreepadPrefs.FILETYPE_HJT);
          document.setEncoding(encoding);
          return document;
--- 123,127 ----
  
          JreepadTreeModel document = new JreepadTreeModel(rootNode);
!         document.setFileType(JreepadPrefs.FILETYPE_HJT);
          document.setEncoding(encoding);
          return document;