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

[<bea...@us...>]

Revision: 272
          http://svn.sourceforge.net/cishell/?rev=272&view=rev
Author:   bearsfan
Date:     2006-10-13 10:18:53 -0700 (Fri, 13 Oct 2006)

Log Message:
-----------
Checked for current thread, and debug print outs in the save plugin.

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/Save.java
    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/load/FileLoad.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/load/FileLoad.java	2006-10-11 20:54:35 UTC (rev 271)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/load/FileLoad.java	2006-10-13 17:18:53 UTC (rev 272)
@@ -61,7 +61,13 @@
     
     	Display display = PlatformUI.getWorkbench().getDisplay();
     	DataUpdater dataUpdater = new DataUpdater (windows[0]);
-    	display.syncExec(dataUpdater);
+    	
+    	if (Thread.currentThread() != display.getThread()) {
+    		display.syncExec(dataUpdater);
+		} else {
+			dataUpdater.run();
+		}
+    	
     	if (!dataUpdater.returnList.isEmpty()){
     		int size = dataUpdater.returnList.size();
     		returnDM = new Data[size];

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-11 20:54:35 UTC (rev 271)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/Save.java	2006-10-13 17:18:53 UTC (rev 272)
@@ -1,6 +1,8 @@
 package org.cishell.reference.gui.persistence.save;
 
 import java.util.Dictionary;
+import java.util.Set;
+import java.util.TreeSet;
 
 import org.cishell.framework.CIShellContext;
 import org.cishell.framework.algorithm.Algorithm;
@@ -10,6 +12,8 @@
 import org.cishell.service.guibuilder.GUIBuilderService;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PlatformUI;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceReference;
 
 /**
  * Save algorithm for persisting a data object
@@ -55,6 +59,19 @@
     	//This only checks the first Data in the array
     	final Converter[] converters = conversionManager.findConverters(data[0], "file-ext:*");
 
+    	Set conversionSet = new TreeSet();
+    	for (int i=0; i < converters.length; i++) {
+    		if (!conversionSet.contains(converters[i])) {
+    			conversionSet.add(converters[i]);
+    			
+    			ServiceReference[] refs = converters[i].getConverterChain();
+    			for (int j=0; j < refs.length; j++) {
+    				System.out.print(refs[j].getProperty(Constants.SERVICE_PID+"->"));
+    			}
+    			
+    		}
+    	}
+    	
     	if (converters.length < 1) {
     		guiBuilder.showError("No Converters", 
     				"No valid converters for data type: " + 

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:54:35 UTC (rev 271)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/SaveDataChooser.java	2006-10-13 17:18:53 UTC (rev 272)
@@ -12,6 +12,7 @@
 import org.cishell.framework.CIShellContext;
 import org.cishell.framework.algorithm.AlgorithmProperty;
 import org.cishell.framework.data.Data;
+import org.cishell.reference.gui.common.AbstractDialog;
 import org.cishell.service.conversion.Converter;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StyleRange;
@@ -29,8 +30,6 @@
 import org.eclipse.swt.widgets.List;
 import org.eclipse.swt.widgets.Shell;
 
-import org.cishell.reference.gui.common.AbstractDialog;
-
 /**
  * SaveDataChooser is a simple user interface to allow for selection
  * among several Persisters that support the selected model, in the event
@@ -118,26 +117,32 @@
      */
     private void initConverterList() {
         for (int i = 0; i < converterArray.length; ++i) {
-            Dictionary dict = converterArray[i].getProperties();
+			if (converterArray[i] != null) {
+				Dictionary dict = converterArray[i].getProperties();
 
-            // get the name of the persister from the property map
-            String outData = (String) dict.get(AlgorithmProperty.LABEL);
+				// get the name of the persister from the property map
+				String outData = (String) dict.get(AlgorithmProperty.LABEL);
 
-            // if someone was sloppy enough to not provide a name, then use the
-            // name of the class instead.
-            if ((outData == null) || (outData.length() == 0)) {
-                outData = converterArray[i].getClass().getName();
-            }
+				// if someone was sloppy enough to not provide a name, then use
+				// the
+				// name of the class instead.
+				if ((outData == null) || (outData.length() == 0)) {
+					outData = converterArray[i].getClass().getName();
+				}
 
-            converterList.add(outData);
-        }
+				converterList.add(outData);
+			}
+		}
     }
 
     /**
-     * Sets up the DetailPane where the details from the Persister PropertyMaps are displayed.
-     * @param detailsGroup The detail pane to init
-     * @return A style of the text 
-     */
+	 * Sets up the DetailPane where the details from the Persister PropertyMaps
+	 * are displayed.
+	 * 
+	 * @param detailsGroup
+	 *            The detail pane to init
+	 * @return A style of the text
+	 */
     private StyledText initDetailPane(Group detailsGroup) {
         StyledText detailPane = new StyledText(detailsGroup, SWT.H_SCROLL | SWT.V_SCROLL);
         detailPane.setEditable(false);


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