[Jreepad-CVS] jreepad/src/jreepad find.java, 1.7, 1.8 JreepadTreeModel.java, 1.4, 1.5 JreepadPrefs.java, 1.25, 1.26 JreepadViewer.java, 1.56, 1.57

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

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

Modified Files:
	find.java JreepadTreeModel.java JreepadPrefs.java 
	JreepadViewer.java 
Log Message:
Save files in the same format and with the same encoding as opened

Index: JreepadPrefs.java
===================================================================
RCS file: /cvsroot/jreepad/jreepad/src/jreepad/JreepadPrefs.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** JreepadPrefs.java	23 Mar 2007 09:37:36 -0000	1.25
--- JreepadPrefs.java	26 Mar 2007 11:49:24 -0000	1.26
***************
*** 121,126 ****
    public boolean addQuotesToCsvOutput;
  
!   static final int FILETYPE_XML = 0;
!   static final int FILETYPE_HJT = 1;
    int mainFileType;
    public static final String[] mainFileTypes = {"Jreepad XML","Treepad HJT"};
--- 121,126 ----
    public boolean addQuotesToCsvOutput;
  
!   public static final int FILETYPE_XML = 0;
!   public static final int FILETYPE_HJT = 1;
    int mainFileType;
    public static final String[] mainFileTypes = {"Jreepad XML","Treepad HJT"};

Index: find.java
===================================================================
RCS file: /cvsroot/jreepad/jreepad/src/jreepad/find.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** find.java	26 Jan 2007 21:47:55 -0000	1.7
--- find.java	26 Mar 2007 11:49:24 -0000	1.8
***************
*** 236,240 ****
          InputStream in = new FileInputStream(userFile);
          JreepadReader reader = new AutoDetectReader(encoding, false);
!         root = reader.read(in);
  	}
  	catch(IOException err)
--- 236,240 ----
          InputStream in = new FileInputStream(userFile);
          JreepadReader reader = new AutoDetectReader(encoding, false);
!         root = reader.read(in).getRootNode();
  	}
  	catch(IOException err)
***************
*** 280,284 ****
          else
              writer= new TreepadWriter(outputEncoding);
!         writer.write(System.out, resultsParent);
          break;
        case OUTPUT_TITLES:
--- 280,284 ----
          else
              writer= new TreepadWriter(outputEncoding);
!         writer.write(System.out, new JreepadTreeModel(resultsParent));
          break;
        case OUTPUT_TITLES:

Index: JreepadViewer.java
===================================================================
RCS file: /cvsroot/jreepad/jreepad/src/jreepad/JreepadViewer.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** JreepadViewer.java	23 Mar 2007 09:37:36 -0000	1.56
--- JreepadViewer.java	26 Mar 2007 11:49:24 -0000	1.57
***************
*** 306,310 ****
          InputStream in = new FileInputStream(firstTimeFile);
          JreepadReader reader = new AutoDetectReader(getPrefs().getEncoding(), getPrefs().autoDetectHtmlArticles);
!         document = new JreepadTreeModel(reader.read(in));
          document.setSaveLocation(firstTimeFile);
          theJreepad = new JreepadView(document);
--- 306,310 ----
          InputStream in = new FileInputStream(firstTimeFile);
          JreepadReader reader = new AutoDetectReader(getPrefs().getEncoding(), getPrefs().autoDetectHtmlArticles);
!         document = reader.read(in);
          document.setSaveLocation(firstTimeFile);
          theJreepad = new JreepadView(document);
***************
*** 1329,1333 ****
          InputStream in = new FileInputStream(f);
          JreepadReader reader = new AutoDetectReader(getPrefs().getEncoding(), getPrefs().autoDetectHtmlArticles);
!         document = new JreepadTreeModel(reader.read(in));
          document.setSaveLocation(f);
          theJreepad = new JreepadView(document);
--- 1329,1333 ----
          InputStream in = new FileInputStream(f);
          JreepadReader reader = new AutoDetectReader(getPrefs().getEncoding(), getPrefs().autoDetectHtmlArticles);
!         document = reader.read(in);
          document.setSaveLocation(f);
          theJreepad = new JreepadView(document);
***************
*** 1418,1429 ****
            setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
  
            // Write to either HJT or XML
            JreepadWriter writer;
            if(fileType == JreepadPrefs.FILETYPE_XML)
!             writer = new XmlWriter(getPrefs().getEncoding());
            else
!             writer = new TreepadWriter(getPrefs().getEncoding());
            OutputStream fos = new FileOutputStream(saveLocation);
!           writer.write(fos, document.getRootNode());
            fos.close();
  
--- 1418,1436 ----
            setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
  
+           // Select default application encoding or document encoding
+           String encoding;
+           if (askForFilename || document.getEncoding() == null)
+             encoding = getPrefs().getEncoding();
+           else
+             encoding = document.getEncoding();
+ 
            // Write to either HJT or XML
            JreepadWriter writer;
            if(fileType == JreepadPrefs.FILETYPE_XML)
!             writer = new XmlWriter(encoding);
            else
!             writer = new TreepadWriter(encoding);
            OutputStream fos = new FileOutputStream(saveLocation);
!           writer.write(fos, document);
            fos.close();
  
***************
*** 1466,1470 ****
          JreepadWriter writer = new TreepadWriter(getPrefs().getEncoding());
          OutputStream fos = new FileOutputStream(getPrefs().backupLocation);
!         writer.write(fos, document.getRootNode());
          fos.close();
  
--- 1473,1477 ----
          JreepadWriter writer = new TreepadWriter(getPrefs().getEncoding());
          OutputStream fos = new FileOutputStream(getPrefs().backupLocation);
!         writer.write(fos, document);
          fos.close();
  
***************
*** 1527,1531 ****
              InputStream in = new FileInputStream(getPrefs().importLocation);
              JreepadReader reader = new AutoDetectReader(getPrefs().getEncoding(), getPrefs().autoDetectHtmlArticles);
!             theJreepad.addChild(reader.read(in));
  			break;
  		  case FILE_FORMAT_TEXT:
--- 1534,1538 ----
              InputStream in = new FileInputStream(getPrefs().importLocation);
              JreepadReader reader = new AutoDetectReader(getPrefs().getEncoding(), getPrefs().autoDetectHtmlArticles);
!             theJreepad.addChild(reader.read(in).getRootNode());
  			break;
  		  case FILE_FORMAT_TEXT:
***************
*** 1618,1622 ****
          if (writer != null)
          {
!           writer.write(fos, theJreepad.getCurrentNode());
            fos.close();
          }
--- 1625,1629 ----
          if (writer != null)
          {
!           writer.write(fos, new JreepadTreeModel(theJreepad.getCurrentNode()));
            fos.close();
          }

Index: JreepadTreeModel.java
===================================================================
RCS file: /cvsroot/jreepad/jreepad/src/jreepad/JreepadTreeModel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** JreepadTreeModel.java	23 Mar 2007 09:37:36 -0000	1.4
--- JreepadTreeModel.java	26 Mar 2007 11:49:24 -0000	1.5
***************
*** 19,22 ****
--- 19,32 ----
  
      /**
+      * Format of the loaded file.
+      */
+     private int fileFormat = -1;
+ 
+     /**
+      * Encoding of the loaded file.
+      */
+     private String encoding = null;
+ 
+     /**
       * True if the current document content has been saved.
       */
***************
*** 81,87 ****
--- 91,117 ----
      }
  
+     public void setFileFormat(int fileFormat)
+     {
+         this.fileFormat = fileFormat;
+     }
+ 
      public File getSaveLocation()
      {
          return saveLocation;
      }
+ 
+     public int getFileFormat()
+     {
+         return fileFormat;
+     }
+ 
+     public String getEncoding()
+     {
+         return encoding;
+     }
+ 
+     public void setEncoding(String encoding)
+     {
+         this.encoding = encoding;
+     }
  }