[CIShell-SVN] SF.net SVN: cishell: [240] trunk/clients/gui/org.cishell.reference.gui. persistence/src/org/cishell/reference/gui/persistence

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

Revision: 240
          http://svn.sourceforge.net/cishell/?rev=240&view=rev
Author:   bh2
Date:     2006-10-02 10:05:45 -0700 (Mon, 02 Oct 2006)

Log Message:
-----------
updated file load and save's loading and saving default directories

Modified Paths:
--------------
    trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/load/FileLoad.java
    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/load/FileLoad.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/load/FileLoad.java	2006-10-02 16:15:44 UTC (rev 239)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/load/FileLoad.java	2006-10-02 17:05:45 UTC (rev 240)
@@ -99,7 +99,12 @@
     	    	FileDialog dialog = new FileDialog(window.getShell(), SWT.OPEN);
 		        if (currentDir == null) {
 		            currentDir = new File(System.getProperty("user.dir") + File.separator + "sampledata");
-//		            currentDir = new File(System.getProperty("user.dir") + File.separator + "sampledata" + File.separator + "anything");
+                    
+                    if (!currentDir.exists()) {
+                        currentDir = new File(System.getProperty("user.home") + File.separator + "anything");
+                    } else {
+                        currentDir = new File(System.getProperty("user.dir") + File.separator + "sampledata" + File.separator + "anything");
+                    }
 		        }
 		        dialog.setFilterPath(currentDir.getPath());
 		        dialog.setText("Select a File");
@@ -110,12 +115,12 @@
 		        
 		   		File file = new File(fileName);
 		        
-		   		if (file.isDirectory()) {
-		        	currentDir = file;
-		        } else {
-		        	currentDir = new File(file.getPath());
-		        }
-		   		
+                if (file.isDirectory()) {
+                    currentDir = new File(file + File.separator + "anything");
+                } else {
+                    currentDir = new File(file.getParent() + File.separator + "anything");
+                }
+                
 		   		String fileExtension = getFileExtension(file);
 	       		String filter = "(&(type=converter)(in_data=file-ext:"+fileExtension+"))";
 		        try {

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-10-02 16:15:44 UTC (rev 239)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java	2006-10-02 17:05:45 UTC (rev 240)
@@ -44,14 +44,14 @@
     private boolean confirmFileOverwrite(File file) {
         String message = "The file:\n" + file.getPath()
             + "\nalready exists. Are you sure you want to overwrite it?";
-        return guiBuilder.showConfirm("File Overwrite", message, message);
+        return guiBuilder.showConfirm("File Overwrite", message, "");
     }
 
     private boolean isSaveFileValid(File file) {
         boolean valid = false;
         if (file.isDirectory()) {
             String message = "Destination cannot be a directory. Please choose a file";
-            guiBuilder.showError("Invalid Destination", message, message);
+            guiBuilder.showError("Invalid Destination", message, "");
             valid = false;
         } else if (file.exists()) {
             valid = confirmFileOverwrite(file);
@@ -68,21 +68,24 @@
 
     	String ext = outDataStr.substring(outDataStr.indexOf(':')+1);
         
+        if ((""+ext).startsWith(".")) {
+            ext = ext.substring(1);
+        }
+        
         FileDialog dialog = new FileDialog(parent, SWT.SAVE);
         
         if (currentDir == null) {
-            currentDir = new File(System.getProperty("user.home"));
+            currentDir = new File(System.getProperty("user.home") + File.separator + "anything");
         }
         dialog.setFilterPath(currentDir.getPath());
         
-        dialog.setFilterExtensions(new String[]{"*" + ext});
+        dialog.setFilterExtensions(new String[]{"*." + ext});
         dialog.setText("Choose File");
         
         String fileLabel = (String)data.getMetaData().get(DataProperty.LABEL);
         if (fileLabel == null) {
-        	dialog.setFileName("*" + ext);
-        }
-        else {
+        	dialog.setFileName("*." + ext);
+        } else {
         	dialog.setFileName(fileLabel + '.' + ext);        	
         }
 
@@ -96,19 +99,19 @@
                     continue;
                 if (ext != null && ext.length() != 0)
                     if (!selectedFile.getPath().endsWith(ext))
-                        selectedFile = new File(selectedFile.getPath() + ext) ;
+                        selectedFile = new File(selectedFile.getPath()+'.'+ ext);
 
                 Data newData = converter.convert(data);
                 
                 copy((File)newData.getData(), selectedFile);
                 
                 if (selectedFile.isDirectory()) {
-                	currentDir = selectedFile;
+                	currentDir = new File(selectedFile + File.separator + "anything");
                 } else {
-                	currentDir = new File(selectedFile.getParent());
+                	currentDir = new File(selectedFile.getParent() + File.separator + "anything");
                 }
                     
-                done = true ;
+                done = true;
        
                 logService.log(LogService.LOG_INFO, "Saved: " + selectedFile.getPath() + "\n");
             } else {


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