[CIShell-SVN] SF.net SVN: cishell:[862] trunk/clients/gui/org.cishell.reference.gui. menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper .java

[<pat...@us...>]

Revision: 862
          http://cishell.svn.sourceforge.net/cishell/?rev=862&view=rev
Author:   pataphil
Date:     2009-02-20 18:25:45 +0000 (Fri, 20 Feb 2009)

Log Message:
-----------
* Changed AlgorithmWrapper to "fail" upon the target algorithm's mutateParameters failing.
* Cleaned up code a little bit.

Modified Paths:
--------------
    trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java

Modified: trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java	2009-02-20 17:54:54 UTC (rev 861)
+++ trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java	2009-02-20 18:25:45 UTC (rev 862)
@@ -77,42 +77,74 @@
 	 * @see org.cishell.framework.algorithm.Algorithm#execute()
 	 */
 	public Data[] execute() {
-		AlgorithmFactory factory = getAlgorithmFactory(bContext, ref);
-		if (factory == null) return null;
-		String pid = (String) ref.getProperty(Constants.SERVICE_PID);
+		try {
+			AlgorithmFactory factory = getAlgorithmFactory(bContext, ref);
+			
+			if (factory == null)
+				return null;
+		
+			String pid = (String)ref.getProperty(Constants.SERVICE_PID);
 
-		// convert input data to the correct format
-		boolean conversionSuccessful = tryConvertingDataToRequiredFormat(data, converters);
-		if (!conversionSuccessful) return null;
-		boolean inputIsValid = testDataValidityIfPossible(factory, data);
-		if (!inputIsValid) return null;
+			// Convert input data to the correct format.
+			boolean conversionSuccessful =
+				tryConvertingDataToRequiredFormat(data, converters);
+		
+			if (!conversionSuccessful)
+				return null;
+			
+			boolean inputIsValid = testDataValidityIfPossible(factory, data);
+			
+			if (!inputIsValid)
+				return null;
 
-		// create algorithm parameters
-		String metatype_pid = getMetaTypeID(ref);
+			// Create algorithm parameters.
+			String metatype_pid = getMetaTypeID(ref);
 
-		MetaTypeProvider provider = getPossiblyMutatedMetaTypeProvider(metatype_pid, pid, factory);
-		Dictionary parameters = getUserEnteredParameters(metatype_pid, provider);
+			MetaTypeProvider provider =
+				getPossiblyMutatedMetaTypeProvider(metatype_pid, pid, factory);
+			
+			Dictionary parameters =
+				getUserEnteredParameters(metatype_pid, provider);
 
-		// check to see if the user cancelled the operation
-		if (parameters == null) return null;
+			// Check to see if the user cancelled the operation.
+			if (parameters == null)
+				return null;
 
-		printParameters(metatype_pid, provider, parameters);
+			printParameters(metatype_pid, provider, parameters);
 
-		// create the algorithm
-		algorithm = createAlgorithm(factory, data, parameters, ciContext);
-		if (algorithm == null) return null;
-		trackAlgorithmIfPossible(algorithm);
+			// Create the algorithm.
+			algorithm = createAlgorithm(factory, data, parameters, ciContext);
+			
+			if (algorithm == null)
+				return null;
+			
+			trackAlgorithmIfPossible(algorithm);
 
-		// execute the algorithm
-		Data[] outData = tryExecutingAlgorithm(algorithm);
-		if (outData == null) return null;
+			// Execute the algorithm.
+			Data[] outData = tryExecutingAlgorithm(algorithm);
+			
+			if (outData == null)
+				return null;
 
-		// process and return the algorithm's output
-		doParentage(outData);
-		outData = removeNullData(outData);
-		addDataToDataManager(outData);
+			// Process and return the algorithm's output.
+			doParentage(outData);
+			outData = removeNullData(outData);
+			addDataToDataManager(outData);
 
-		return outData;
+			return outData;
+		}
+		catch (Exception e) {
+			GUIBuilderService builder = (GUIBuilderService)ciContext.getService
+				(GUIBuilderService.class.getName());
+			
+			String errorMessage = "An error occurred while preparing to run the " +
+				"algorithm \"" + ref.getProperty(AlgorithmProperty.LABEL) + ".\"";
+			
+			builder.showError("Error!", errorMessage, e);
+			log(LogService.LOG_ERROR, errorMessage, e);
+		}
+		
+		return null;
 	}
 
 	protected AlgorithmFactory getAlgorithmFactory(BundleContext bContext, ServiceReference ref) {
@@ -259,12 +291,6 @@
 				}
 			} catch (IllegalArgumentException e) {
 				log(LogService.LOG_DEBUG, pid + " has an invalid metatype id: " + metatypePID, e);
-			} catch (Exception e) {
-				GUIBuilderService builder = (GUIBuilderService) ciContext.getService(GUIBuilderService.class.getName());
-				String errorMessage = "An error occurred while preparing to run the algorithm  "
-						+ ref.getProperty(AlgorithmProperty.LABEL) + ".\"";
-				builder.showError("Error!", errorMessage, e);
-				log(LogService.LOG_ERROR, errorMessage, e);
 			}
 		}
 


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