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

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

Revision: 309
          http://svn.sourceforge.net/cishell/?rev=309&view=rev
Author:   bh2
Date:     2006-10-23 14:49:51 -0700 (Mon, 23 Oct 2006)

Log Message:
-----------
finally finished feature to allow files to be saved w/o a converter.

Modified Paths:
--------------
    trunk/clients/gui/org.cishell.reference.gui.persistence/OSGI-INF/save.properties
    trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/Save.java
    trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/SaveFactory.java

Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/OSGI-INF/save.properties
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/OSGI-INF/save.properties	2006-10-23 21:19:35 UTC (rev 308)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/OSGI-INF/save.properties	2006-10-23 21:49:51 UTC (rev 309)
@@ -1,7 +1,7 @@
 menu_path=File/start
 label=Save...
 description=Saves data to disk
-in_data=file:*
+in_data=java.lang.Object
 out_data=null
 service.pid=org.cishell.reference.gui.persistence.save.Save
 remoteable=false

Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/Save.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/Save.java	2006-10-23 21:19:35 UTC (rev 308)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/Save.java	2006-10-23 21:49:51 UTC (rev 309)
@@ -26,9 +26,8 @@
     Data[] data;
     Dictionary parameters;
     CIShellContext context;
+    Shell parentShell;
     
-    final Shell parentShell;
-    
     private GUIBuilderService guiBuilder;    
     private DataConversionService conversionManager;
     
@@ -44,8 +43,6 @@
         this.parameters = parameters;
         this.context = context;
         
-        this.parentShell = PlatformUI.getWorkbench().getWorkbenchWindows()[0].getShell();
-
         this.conversionManager = (DataConversionService) context.getService(
         		DataConversionService.class.getName());
         
@@ -64,9 +61,11 @@
     	if (converters.length < 1 && !(data[0].getData() instanceof File)) {
     		guiBuilder.showError("No Converters", 
     				"No valid converters for data type: " + 
-    				data[0].getData().getClass().getName(), 
+    				data[0].getFormat(), 
     				"Please install a plugin that will save the data type to a file");
     	} else {
+            parentShell = PlatformUI.getWorkbench().getWorkbenchWindows()[0].getShell();
+            
     		if (!parentShell.isDisposed()) {
     			guiRun(new Runnable() {
     				public void run() {

Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/SaveFactory.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/SaveFactory.java	2006-10-23 21:19:35 UTC (rev 308)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/SaveFactory.java	2006-10-23 21:49:51 UTC (rev 309)
@@ -16,6 +16,10 @@
 
 /**
  * Create a Save object
+ * 
+ * TODO: Should also support if we can convert to file, but have
+ * no final file:X->file-ext:* converter.
+ * 
  * @author bmarkine
  *
  */


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