prepared for output table constraction with columns of any type

Author: rssdev10

RubyScript/rb/knime.rb

@@ -22,31 +22,28 @@ def add_cell(cell)
       @cells << cell
     end
 
-    def int(val)
-      add_cell IntCell.new(val)
-      self
-    end
-
-    def long(val)
-      add_cell LongCell.new(val)
-      self
-    end
-
-    def string(val)
-      add_cell StringCell.new(val)
-      self
-    end
-
-    def double(val)
-      add_cell DoubleCell.new(val)
-      self
-    end
-
-    # workadound for RowKey class
-    def stringCell(val)
-      add_cell StringCell.new(val)
-      self
-    end
+    # generate methods for compatibility with previous release
+    [
+      [:int, IntCell],
+      [:long, LongCell],
+      [:string, StringCell],
+      [:double, DoubleCell],
+      [:stringCell, StringCell] # workaround for RowKey class
+    ].each do |name, cls|
+      Object.send(:define_method, name) do |val| 
+        add_cell cls.new(val)
+        self 
+      end
+    end    
+
+    # generate an appropriate methods for any types annotated in the output model
+    $outColumnTypes.each do |name|      
+      cls = const_get name
+      Object.send(:define_method, name) do |val|
+        add_cell cls.new(val)
+        self
+      end
+    end    
   end
 
   class Cells
@@ -56,7 +53,7 @@ class Cells
   end
 
   # This method allows to display any text to indicate current
-  # calclulation progress
+  # calculation progress
   def setProgress(*val)
     $exec.setProgress(*val)
   end
@@ -88,25 +85,15 @@ def snippetRunner
     end
   end
 end
-include Knime
-
-# Extended knime class
-class DoubleCell
-  include DataConverter
-end
 
-# Extended knime class
-class IntCell
-  include DataConverter
-end
+include Knime
 
-# Extended knime class
-class LongCell
-  include DataConverter
+[DoubleCell, IntCell, LongCell].each do |cls|
+  cls.class_exec { include DataConverter }
 end
 
 # Extended knime class
-class Java::OrgKnimeCoreDataContainer::BlobSupportDataRow
+class BlobSupportDataRow
   include CellUtility
 
   # Append new columns by previously added chain of cells
@@ -130,7 +117,7 @@ def [](idx)
 end
 
 # Extended knime class
-class Java::OrgKnimeCoreNode::BufferedDataTable
+class BufferedDataTable
   # Add Ruby specific methods
   def length
     getRowCount
@@ -154,7 +141,7 @@ def new_row(obj_cells = nil)
 end
 
 # Extended knime class
-class Java::OrgKnimeCoreDataContainer::DataContainer
+class DataContainer
   # Add row in the data container.
   # Row can be copied from input data container or created.
   def <<(obj)

RubyScript/src/org/knime/ext/jruby/RubyScriptNodeDialog.java

@@ -116,9 +116,9 @@ public void actionPerformed(final ActionEvent e) {
 
         TableColumn typeColumn = table.getColumnModel().getColumn(1);
         JComboBox<String> typeSelector = new JComboBox<String>();
-        typeSelector.addItem("String");
-        typeSelector.addItem("Integer");
-        typeSelector.addItem("Double");
+        typeSelector.addItem("StringCell");
+        typeSelector.addItem("IntegerCell");
+        typeSelector.addItem("DoubleCell");
         typeColumn.setCellEditor(new DefaultCellEditor(typeSelector));
 
         // construct the panel for script loading/authoring

RubyScript/src/org/knime/ext/jruby/RubyScriptNodeModel.java

@@ -18,6 +18,7 @@
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
 import org.knime.base.data.append.column.AppendedColumnTable;
+import org.knime.core.data.DataCell;
 import org.knime.core.data.DataColumnSpec;
 import org.knime.core.data.DataColumnSpecCreator;
 import org.knime.core.data.DataTableSpec;
@@ -306,6 +307,18 @@ protected final DataTableSpec[] configure(final DataTableSpec[] inSpecs)
                 type = IntCell.TYPE;
             } else if ("Double".equals(columnType)) {
                 type = DoubleCell.TYPE;
+            } else {
+                try {
+                    Class<DataCell> cls = (Class<DataCell>) Class.forName(columnType);
+                    if (cls != null)
+                        type = DataType.getType(cls);
+                    else
+                        columnType = "StringCell";
+
+                } catch (ClassNotFoundException e) {
+                    // e.printStackTrace();
+                    columnType = "StringCell";
+                }
             }
             DataColumnSpec newColumn = new DataColumnSpecCreator(
                     columnNames[i], type).createSpec();