code cleanup

Author: gab1one

org.knime.knip.scripting.base/src/org/knime/knip/scripting/base/CommandCompileProductHelper.java

@@ -1,8 +1,5 @@
 package org.knime.knip.scripting.base;
 
-import javax.script.ScriptContext;
-import javax.script.ScriptEngine;
-
 import org.scijava.Context;
 import org.scijava.command.CommandInfo;
 import org.scijava.module.Module;

org.knime.knip.scripting.base/src/org/knime/knip/scripting/base/ScriptingGateway.java

@@ -20,7 +20,6 @@
 import org.scijava.Context;
 import org.scijava.command.CommandService;
 import org.scijava.display.DisplayPostprocessor;
-import org.scijava.log.slf4j.SLF4JLogService;
 import org.scijava.object.ObjectService;
 import org.scijava.plugin.DefaultPluginFinder;
 import org.scijava.plugin.PluginIndex;

org.knime.knip.scripting.base/src/org/knime/knip/scripting/parameters/DefaultParameterCodeGeneratorService.java

@@ -1,6 +1,7 @@
 package org.knime.knip.scripting.parameters;
 
 import java.util.HashMap;
+import java.util.Map;
 
 import org.scijava.plugin.AbstractSingletonService;
 import org.scijava.plugin.Plugin;
@@ -18,7 +19,7 @@ public class DefaultParameterCodeGeneratorService
 		extends AbstractSingletonService<ParameterCodeGenerator>
 		implements ParameterCodeGeneratorService {
 
-	private HashMap<String, ParameterCodeGenerator> m_generatorMap = null;
+	private Map<String, ParameterCodeGenerator> m_generatorMap = null;
 
 	@Override
 	public Class<ParameterCodeGenerator> getPluginType() {
@@ -33,7 +34,8 @@ public ParameterCodeGenerator getGeneratorForLanguage(
 		}
 
 		for (String name : language.getNames()) {
-			ParameterCodeGenerator generator = m_generatorMap.get(name.toLowerCase());
+			ParameterCodeGenerator generator = m_generatorMap
+					.get(name.toLowerCase());
 			if (generator != null) {
 				return generator;
 			}

org.knime.knip.scripting.base/src/org/knime/knip/scripting/parameters/JavaParameterCodeGenerator.java

@@ -18,8 +18,8 @@ public String generateInputParameter(String code, String memberName,
 				|| type == String.class) ? type.getSimpleName()
 						: type.getName();
 
-		return "\n\t@Parameter(type = ItemIO.INPUT)\n\tprivate " + typeName
-				+ " " + memberName + ";\n";
+		return "\n\n\t@Parameter(type = ItemIO.INPUT)\n\tprivate " + typeName
+				+ " " + memberName + ";";
 	}
 
 	@Override

org.knime.knip.scripting.node/src/org/knime/knip/scripting/ui/ScriptingNodeDialogListener.java

@@ -4,8 +4,10 @@
 import java.awt.event.ActionListener;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
+import java.util.Set;
 
 import javax.swing.JOptionPane;
 
@@ -104,23 +106,15 @@ protected void insertParameterCodeSnippetForColumn(final int index) {
 				final DataColumnSpec cspec = (DataColumnSpec) o;
 
 				final String columnName = cspec.getName();
-				String memberName = removeIntegers(
-						Character.toLowerCase(columnName.charAt(0))
-								+ columnName.substring(1));
-
-				int i = 0;
-				String chosen = memberName;
-				while (m_gui.columnInputMatchingTable().getModuleInfo()
-						.getInput(chosen) != null) {
-					chosen = memberName + i;
-					++i;
-				}
-				memberName = chosen;
+				String memberName = cleanupMemberName(columnName);
 
 				// get the Name of the first createable type
 				@SuppressWarnings("rawtypes")
 				final Iterator<InputAdapter> itor = m_inputAdapters
-						.getMatchingInputAdapters(cspec.getType()).iterator();
+						.getMatchingInputAdapters(
+								cspec.getType().getPreferredValueClass())
+						.iterator();
+
 				final Class<?> type;
 				if (itor.hasNext()) {
 					type = itor.next().getOutputType();
@@ -162,6 +156,29 @@ protected void insertParameterCodeSnippetForColumn(final int index) {
 		}
 	}
 
+	/**
+	 * Cleans the columnname from illegal characters to make it usable as a
+	 * parameter.
+	 * 
+	 * @param columnName the name of the column
+	 * @return name of the parameter 
+	 */
+	private String cleanupMemberName(final String columnName) {
+		String memberName = removeIntegers(
+				Character.toLowerCase(columnName.charAt(0))
+						+ columnName.substring(1));
+
+		int i = 0;
+		String chosen = memberName;
+		while (m_gui.columnInputMatchingTable().getModuleInfo()
+				.getInput(chosen) != null) {
+			chosen = memberName + i;
+			++i;
+		}
+		memberName = chosen;
+		return memberName;
+	}
+
 	private String removeIntegers(final String memberName) {
 		String ret = memberName;
 		while (Character.isDigit(ret.charAt(ret.length() - 1))) {