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

[<mwl...@us...>]

Revision: 407
          http://svn.sourceforge.net/cishell/?rev=407&view=rev
Author:   mwlinnem
Date:     2007-06-28 14:32:33 -0700 (Thu, 28 Jun 2007)

Log Message:
-----------
Changed suggested name for saved files to be more reasonable.

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	2007-06-27 18:55:18 UTC (rev 406)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java	2007-06-28 21:32:33 UTC (rev 407)
@@ -108,11 +108,15 @@
         dialog.setText("Choose File");
         
         String fileLabel = (String)data.getMetaData().get(DataProperty.LABEL);
-        if (fileLabel == null) {
-        	dialog.setFileName("*." + ext);
-        } else {
-        	dialog.setFileName(fileLabel + '.' + ext);        	
-        }
+        String suggestedFileName = getFileName(fileLabel);
+        dialog.setFileName(suggestedFileName + "." + ext);
+//        String fileLabel = (String)data.getMetaData().get(DataProperty.LABEL);
+//        
+//        if (fileLabel == null) {
+//        	dialog.setFileName("*." + ext);
+//        } else {
+//        	dialog.setFileName(fileLabel + '.' + ext);        	
+//        }
 
         boolean done = false;
         
@@ -173,4 +177,16 @@
             return false;
     	}
     }
+    
+    private String getFileName(String fileLabel) {
+    	int descriptionEndIndex = fileLabel.lastIndexOf(":");
+    	int filePathEndIndex = fileLabel.lastIndexOf(File.separator);
+    	int extensionBeginIndex = fileLabel.indexOf(".");
+    	
+    	int startIndex = Math.max(descriptionEndIndex, filePathEndIndex) + 1;
+    	int endIndex = Math.min(extensionBeginIndex, fileLabel.length());
+    	
+    	String fileName = fileLabel.substring(startIndex, endIndex);
+    	return fileName;
+    }
 }
\ No newline at end of file


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