jreepad-cvs

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

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

Modified Files:
	SaveFileChooser.java 
Log Message:
Fixes to the file saving and loading code

Index: SaveFileChooser.java
===================================================================
RCS file: /cvsroot/jreepad/jreepad/src/jreepad/ui/SaveFileChooser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SaveFileChooser.java	26 Mar 2007 13:28:16 -0000	1.2
--- SaveFileChooser.java	3 Apr 2007 12:41:30 -0000	1.3
***************
*** 24,35 ****
      public static final FileFilter TREEPAD_FILE_FILTER = new ExtensionFileFilter("Treepad file (*.hjt)", "hjt");
  
      public SaveFileChooser(int defaultFileFormat)
      {
          addChoosableFileFilter(JREEPAD_FILE_FILTER);
          addChoosableFileFilter(TREEPAD_FILE_FILTER);
!         if (defaultFileFormat == JreepadPrefs.FILETYPE_XML)
!             setFileFilter(JREEPAD_FILE_FILTER);
!         else
              setFileFilter(TREEPAD_FILE_FILTER);
      }
  
--- 24,59 ----
      public static final FileFilter TREEPAD_FILE_FILTER = new ExtensionFileFilter("Treepad file (*.hjt)", "hjt");
  
+     private int defaultFileFormat;
+ 
      public SaveFileChooser(int defaultFileFormat)
      {
+         this.defaultFileFormat = defaultFileFormat;
+ 
          addChoosableFileFilter(JREEPAD_FILE_FILTER);
          addChoosableFileFilter(TREEPAD_FILE_FILTER);
! 
!         switch (defaultFileFormat)
!         {
!         case JreepadPrefs.FILETYPE_HJT:
              setFileFilter(TREEPAD_FILE_FILTER);
+             break;
+         case JreepadPrefs.FILETYPE_XML: // default
+         default:
+             setFileFilter(JREEPAD_FILE_FILTER);
+             break;
+         }
+     }
+ 
+     /**
+      * Returns the selected file type or the default file type
+      * if "All files" filter is selected.
+      */
+     public int getFileType()
+     {
+         if (getFileFilter() == SaveFileChooser.JREEPAD_FILE_FILTER)
+             return JreepadPrefs.FILETYPE_XML;
+         if (getFileFilter() == SaveFileChooser.TREEPAD_FILE_FILTER)
+             return JreepadPrefs.FILETYPE_HJT;
+         return defaultFileFormat;
      }