[CIShell-SVN] SF.net SVN: cishell: [340] trunk/clients/gui/org.cishell.reference.gui. persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java

[<bh...@us...>]

Revision: 340
          http://svn.sourceforge.net/cishell/?rev=340&view=rev
Author:   bh2
Date:     2006-11-27 09:24:41 -0800 (Mon, 27 Nov 2006)

Log Message:
-----------
Bug fix for bug: https://nwb.slis.indiana.edu/wiki/?n=Nwbtool.SaveTextFile
Now saving files without a file:*->file-ext:* converter can be saved correctly.

Modified Paths:
--------------
    trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java

Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java	2006-11-21 22:31:51 UTC (rev 339)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java	2006-11-27 17:24:41 UTC (rev 340)
@@ -100,7 +100,11 @@
         }
         dialog.setFilterPath(currentDir.getPath());
         
-        dialog.setFilterExtensions(new String[]{"*." + ext});
+     
+        if (ext != null && !ext.equals("*")) {
+            dialog.setFilterExtensions(new String[]{"*." + ext});
+        }
+        
         dialog.setText("Choose File");
         
         String fileLabel = (String)data.getMetaData().get(DataProperty.LABEL);
@@ -119,7 +123,7 @@
                 if (!isSaveFileValid(selectedFile))
                     continue;
                 if (ext != null && ext.length() != 0)
-                    if (!selectedFile.getPath().endsWith(ext))
+                    if (!selectedFile.getPath().endsWith(ext) && !ext.equals("*"))
                         selectedFile = new File(selectedFile.getPath()+'.'+ ext);
 
                 Data newData = converter.convert(data);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.