WIP

knime-ip · Aug 30, 2016 · fa4c988 · fa4c988
1 parent 6eaf0be
commit fa4c988
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 7 deletions.
diff --git a/org.knime.scijava.commands/scripts/myjython.py b/org.knime.scijava.commands/scripts/myjython.py
@@ -0,0 +1,6 @@
+# @double value
+# @OUTPUT double greeting
+
+greeting = value
+
+print greeting
diff --git a/org.knime.scijava.commands/scripts/test.clj b/org.knime.scijava.commands/scripts/test.clj
@@ -0,0 +1,4 @@
+; @Integer(label="My integer",description="Input integer.",value=17) test-int
+; @OUTPUT Integer output-int
+
+(def output-int test-int)
diff --git a/org.knime.scijava.commands/src/org/knime/scijava/commands/SciJavaTestCommand.java b/org.knime.scijava.commands/src/org/knime/scijava/commands/SciJavaTestCommand.java
@@ -12,7 +12,7 @@ public class SciJavaTestCommand implements Command {
     @Parameter
     private MultiOutputListener rowOutput;
 
-    @Parameter(label = "From Text")
+    @Parameter(label = "From Text", style = StyleHook.COLUMNSELECTION)
     private String fromText;
 
     @Parameter(label = "From Int")
@@ -23,12 +23,11 @@ public class SciJavaTestCommand implements Command {
 
     @Override
     public void run() {
-
         for (int i = 0; i < fromInt; i++) {
             outInt = i;
             rowOutput.notifyListener();
         }
-
     }
 
+
 }
diff --git a/.../knime/scijava/commands/EnforcerHook.java → ...org/knime/scijava/commands/StyleHook.java b/.../knime/scijava/commands/EnforcerHook.java → ...org/knime/scijava/commands/StyleHook.java
@@ -1,5 +1,5 @@
 package org.knime.scijava.commands;
 
-public interface EnforcerHook {
+public interface StyleHook {
     public final static String COLUMNSELECTION = "colSel";
 }
diff --git a/...nime.scijava.commands/src/org/knime/scijava/commands/converter/ConverterCacheService.java b/...nime.scijava.commands/src/org/knime/scijava/commands/converter/ConverterCacheService.java
@@ -11,6 +11,9 @@
 import org.knime.core.node.ExecutionContext;
 import org.scijava.service.Service;
 
+// FIXME NAMING (KNIPConverterCache?!)
+// FIXME CACHING (isn't implemented everywhere, yet)
+// FIXME can we always delegate to Jonathans implementations?
 public interface ConverterCacheService extends Service {
 
     /**

diff --git a/org.knime.scijava.commands/src/org/knime/scijava/commands/module/DefaultNodeModule.java b/org.knime.scijava.commands/src/org/knime/scijava/commands/module/DefaultNodeModule.java
@@ -59,6 +59,8 @@ public DefaultNodeModule(final Context context, final ModuleInfo info,
         }
 
         // FIXME: do we need them all?
+        // FIXME add our own preprocessors, i.e. to call preprocess?
+        // FIXME or move this to "preprocess"
         final List<PreprocessorPlugin> pre = ps
                 .createInstancesOfType(PreprocessorPlugin.class);
 
@@ -77,6 +79,7 @@ public DefaultNodeModule(final Context context, final ModuleInfo info,
     }
 
     private void preProcess(final DataRow input) throws Exception {
+        // input can be null if source node
         if (input != null) {
             for (final Entry<Integer, ModuleItem<?>> entry : inputMapping
                     .entrySet()) {
@@ -90,6 +93,7 @@ private void preProcess(final DataRow input) throws Exception {
 
     private void postProcess(final CellOutput output,
             final ExecutionContext ctx) throws Exception {
+        // output can be null if sink node
         if (output != null) {
             final List<DataCell> cells = new ArrayList<DataCell>();
             for (final ModuleItem<?> entry : module.getInfo().outputs()) {
@@ -109,6 +113,8 @@ private void postProcess(final CellOutput output,
     @Override
     public void run(final DataRow input, final CellOutput output,
             final ExecutionContext ctx) throws Exception {
+
+        // FIXME: Nicer logic possible here?
         preProcess(input);
 
         if (outputListener != null) {

diff --git a/org.knime.scijava.commands/src/org/knime/scijava/commands/nodes/SciJavaCommandNodeModel.java b/org.knime.scijava.commands/src/org/knime/scijava/commands/nodes/SciJavaCommandNodeModel.java
@@ -224,6 +224,7 @@ public OutputPortRole[] getOutputPortRoles() {
         }
     }
 
+    // FIXME must be super performant
     @Override
     public StreamableOperator createStreamableOperator(
             final PartitionInfo partitionInfo, final PortObjectSpec[] inSpecs)

diff --git a/org.knime.scijava.commands/src/org/knime/scijava/commands/nodes/SciJavaNodeSetFactory.java b/org.knime.scijava.commands/src/org/knime/scijava/commands/nodes/SciJavaNodeSetFactory.java
@@ -106,7 +106,7 @@ public String getAfterID(final String id) {
 
     @Override
     public ConfigRO getAdditionalSettings(final String id) {
-        // TODO manage versions?
+        // FIXME manage versions?
         final NodeSettings settings = new NodeSettings(
                 "scijavacommand-factory");
         settings.addString(SCIJAVA_COMMAND_KEY, id);

diff --git a/...ava.commands/src/org/knime/scijava/commands/settings/DefaultSettingsModelTypeService.java b/...ava.commands/src/org/knime/scijava/commands/settings/DefaultSettingsModelTypeService.java
@@ -5,7 +5,7 @@
 
 import org.knime.core.data.convert.util.ClassUtil;
 import org.knime.core.node.defaultnodesettings.SettingsModel;
-import org.knime.scijava.commands.EnforcerHook;
+import org.knime.scijava.commands.StyleHook;
 import org.knime.scijava.commands.converter.ConverterCacheService;
 import org.knime.scijava.commands.settings.types.SettingsModelColumnSelectionType;
 import org.scijava.module.ModuleItem;
@@ -59,7 +59,7 @@ public SettingsModelType getSettingsModelTypeFor(final ModuleItem<?> item) {
 
         // FIXME why do I need this check in case of scripts?
         if (item.getWidgetStyle() != null
-                && item.getWidgetStyle().equals(EnforcerHook.COLUMNSELECTION)) {
+                && item.getWidgetStyle().equals(StyleHook.COLUMNSELECTION)) {
             return new SettingsModelColumnSelectionType();
         } else {