GUI: fixed input column's spec reading

Author: rssdev10

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

@@ -17,6 +17,7 @@
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -68,6 +69,8 @@ public class RubyScriptNodeDialog extends NodeDialogPane {
     private JCheckBox m_appendColsCB;
     private RubyScriptNodeFactory m_factory;
 
+    private JTable m_columnTable;
+
     /**
      * New pane for configuring ScriptedNode node dialog.
      * 
@@ -262,8 +265,7 @@ public void actionPerformed(final ActionEvent e) {
         scriptMainPanel.add(splitPane, BorderLayout.CENTER);
 
         // add output column list
-        List<DataColumnSpec> list = m_factory.getModel().getInputColumnList();
-        JPanel inputColumnsPanel = addColumnPane("Input[0] columns: ", list);
+        JPanel inputColumnsPanel = addColumnPane("Input[0] columns: ");
 
         // add flow variables
         JPanel flowVariablesPanel = addFlowVariablesPane("Flow variables: ");
@@ -296,7 +298,7 @@ public void actionPerformed(final ActionEvent e) {
      * @param list of columns
      * @return JPanel
      */
-    private final JPanel addColumnPane(String label, List<DataColumnSpec> list) {
+    private final JPanel addColumnPane(String label) {
         JPanel panel = new JPanel(new BorderLayout());
         JTable table = new JTable();
         table.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
@@ -311,23 +313,30 @@ private final JPanel addColumnPane(String label, List<DataColumnSpec> list) {
         model.setReadOnly(true);
         table.setModel(model);
 
-        if (list != null) {
-            for (Iterator<DataColumnSpec> i = list.iterator(); i.hasNext();) {
-                DataColumnSpec spec = i.next();
-                ((ScriptNodeOutputColumnsTableModel) (table.getModel()))
-                        .addRow(spec.getName(), spec.getType().toString());
-            }
-        }
         JScrollPane scrollPane = new JScrollPane(table);
         table.setFillsViewportHeight(true);
 
         panel.add(new JLabel(label), BorderLayout.NORTH);
         // inputColumnsPanel.add(m_inpputColumnsTable.getTableHeader(),
         // BorderLayout.PAGE_START);
         panel.add(scrollPane, BorderLayout.CENTER);
+        m_columnTable = table;
         return panel;
     }
 
+    private final void updateColumnTable(final DataTableSpec[] specs) {
+        if (specs != null && specs.length > 0) {
+            ScriptNodeOutputColumnsTableModel model = 
+                    (ScriptNodeOutputColumnsTableModel) (m_columnTable.getModel());
+            model.clearRows();
+            for (Iterator<DataColumnSpec> item = specs[0].iterator(); item
+                    .hasNext();) {
+                DataColumnSpec spec = item.next();
+                model.addRow(spec.getName(), spec.getType().toString());
+            }
+        }
+    }
+
     /**
      * Creates a panel with flow variable list
      * @param label
@@ -430,6 +439,8 @@ protected final void loadSettingsFrom(final NodeSettingsRO settings,
             ((ScriptNodeOutputColumnsTableModel) m_table.getModel()).addRow(
                     dataTableColumnNames[i], dataTableColumnTypes[i]);
         }
+
+        updateColumnTable(specs);
     }
 
     /**

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

@@ -13,11 +13,7 @@
 import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
-import java.util.Vector;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -75,27 +71,26 @@ public class RubyScriptNodeModel extends NodeModel {
     protected boolean m_appendCols = true;
     protected String[] m_columnNames;
     protected String[] m_columnTypes;
-    private ArrayList<DataColumnSpec> m_inputColumnList = null;
 
     private static String m_javaExtDirsExtensionsPath;
     private static String m_javaClasspathExtensionsPath;
 
     private boolean m_snippetMode;
 
     private static Object m_ScriptingContainerLock = new Object();
-    
+
     public class ScriptError {
         public int lineNum;
         public int columnNum;
         public String type;
         public String text;
         public String trace;
-        public String msg;        
+        public String msg;
 
         public ScriptError() {
           clear();
         }
-        
+
         public void clear() {
             lineNum = -1;
             columnNum = -1;
@@ -370,14 +365,6 @@ protected final DataTableSpec[] configure(final DataTableSpec[] inSpecs)
         // append the property columns to the data table spec
         DataTableSpec newSpec = m_appendCols ? inSpecs[0] : new DataTableSpec();
 
-        if (m_numInputs > 0) {
-            m_inputColumnList = new ArrayList<DataColumnSpec>();
-            for (Iterator<DataColumnSpec> item = inSpecs[0].iterator(); item
-                    .hasNext();) {
-                m_inputColumnList.add(item.next());
-            }
-        }
-
         if (m_columnNames == null) {
             return new DataTableSpec[] { newSpec };
         }
@@ -620,8 +607,4 @@ private int findErrorSource(Throwable thr, String filename) {
         }
         return m_script_error.lineNum;
     }
-
-    public ArrayList<DataColumnSpec> getInputColumnList() {
-        return m_inputColumnList;
-    }
 }