cishell-svn

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

[<hu...@us...>]

Revision: 265
          http://svn.sourceforge.net/cishell/?rev=265&view=rev
Author:   huangb
Date:     2006-10-11 13:38:15 -0700 (Wed, 11 Oct 2006)

Log Message:
-----------
update the SaveDataChooser constructor. remove the input parameter: 
String brandPluginID, since it is not used.

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

Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/SaveDataChooser.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/SaveDataChooser.java	2006-10-11 20:36:20 UTC (rev 264)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/SaveDataChooser.java	2006-10-11 20:38:15 UTC (rev 265)
@@ -58,7 +58,7 @@
      * @param context The CIShellContext to retrieve available services
      */
     public SaveDataChooser(Data data, Shell parent, Converter[] converterArray,
-    						String title, String brandPluginID, CIShellContext context) {
+    						String title, CIShellContext context) {
     	super(parent, title, QUESTION);
         this.data = data;        
         this.converterArray = converterArray;


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

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

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

Revision: 281
          http://svn.sourceforge.net/cishell/?rev=281&view=rev
Author:   bh2
Date:     2006-10-16 10:13:55 -0700 (Mon, 16 Oct 2006)

Log Message:
-----------
* cleaned up the converter text
* made save grab the label from the last converter

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

Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/SaveDataChooser.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/SaveDataChooser.java	2006-10-16 15:04:20 UTC (rev 280)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/SaveDataChooser.java	2006-10-16 17:13:55 UTC (rev 281)
@@ -29,6 +29,7 @@
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.List;
 import org.eclipse.swt.widgets.Shell;
+import org.osgi.framework.ServiceReference;
 
 /**
  * SaveDataChooser is a simple user interface to allow for selection
@@ -121,7 +122,17 @@
 				Dictionary dict = converterArray[i].getProperties();
 
 				// get the name of the persister from the property map
-				String outData = (String) dict.get(AlgorithmProperty.LABEL);
+				String outData = null;
+                
+                ServiceReference[] refs = converterArray[i].getConverterChain();
+                if (refs != null && refs.length > 0) {
+                    outData = (String) refs[refs.length-1].getProperty(
+                            AlgorithmProperty.LABEL);
+                }
+                    
+                if (outData == null) {
+                    outData = (String) dict.get(AlgorithmProperty.LABEL);
+                }
 
 				// if someone was sloppy enough to not provide a name, then use
 				// the


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