GUI: added possibility of output table's rows move up/down

Author: rssdev10

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

@@ -21,7 +21,7 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import javax.swing.AbstractAction;
+import javax.swing.Box;
 import javax.swing.BoxLayout;
 import javax.swing.DefaultCellEditor;
 import javax.swing.JButton;
@@ -100,10 +100,8 @@ private final void createColumnSelectionTab() {
         m_appendColsCB = new JCheckBox("Append columns to input table spec");
         newtableCBPanel.add(m_appendColsCB, BorderLayout.WEST);
 
-        JButton addButton = new JButton(new AbstractAction() {
-
-            private static final long serialVersionUID = -743704737927962277L;
-
+        JButton addButton = new JButton("Add Output Column");
+        addButton.addActionListener( new ActionListener() {
             public void actionPerformed(final ActionEvent e) {
                 String name;
                 ScriptNodeOutputColumnsTableModel model = ((ScriptNodeOutputColumnsTableModel) m_table
@@ -126,12 +124,9 @@ public void actionPerformed(final ActionEvent e) {
                 model.addRow(name, "String");
             }
         });
-        addButton.setText("Add Output Column");
-
-        JButton removeButton = new JButton(new AbstractAction() {
-
-            private static final long serialVersionUID = 743704737927962277L;
 
+        JButton removeButton = new JButton("Remove Output Column");
+        removeButton.addActionListener( new ActionListener() {
             public void actionPerformed(final ActionEvent e) {
                 int[] selectedRows = m_table.getSelectedRows();
                 logger.debug("selectedRows = " + selectedRows);
@@ -148,10 +143,41 @@ public void actionPerformed(final ActionEvent e) {
                 }
             }
         });
-        removeButton.setText("Remove Output Column");
+
+        JButton upButton = new JButton("Up");
+        upButton.addActionListener(new ActionListener() {
+            public void actionPerformed(final ActionEvent e) {
+                int[] selectedRows = m_table.getSelectedRows();
+                logger.debug("selectedRows = " + selectedRows);
+
+                if (selectedRows.length == 0) {
+                    return;
+                }
+                ((ScriptNodeOutputColumnsTableModel) m_table.getModel())
+                        .moveRowsUp(selectedRows);
+            }
+        });
+
+        JButton downButton = new JButton("Down");
+        downButton.addActionListener(new ActionListener() {
+            public void actionPerformed(final ActionEvent e) {
+                int[] selectedRows = m_table.getSelectedRows();
+                logger.debug("selectedRows = " + selectedRows);
+
+                if (selectedRows.length == 0) {
+                    return;
+                }
+
+                ((ScriptNodeOutputColumnsTableModel) m_table.getModel())
+                        .moveRowsDown(selectedRows);
+            }
+        });
 
         outputButtonPanel.add(addButton);
         outputButtonPanel.add(removeButton);
+        outputButtonPanel.add(Box.createHorizontalStrut(40));
+        outputButtonPanel.add(upButton);
+        outputButtonPanel.add(downButton);
 
         m_table = new JTable();
         m_table.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
@@ -211,9 +237,8 @@ private final void createScriptTab() {
         JPanel scriptButtonPanel = new JPanel();
 
         // script load button
-        JButton scriptButton = new JButton(new AbstractAction() {
-
-            private static final long serialVersionUID = 6097485154386131768L;
+        JButton scriptButton = new JButton("Load Script from File");
+        scriptButton.addActionListener( new ActionListener() {
             private JFileChooser fileChooser = new JFileChooser();
 
             public void actionPerformed(final ActionEvent e) {
@@ -252,7 +277,6 @@ public void actionPerformed(final ActionEvent e) {
                 clearErrorHighlight();
             }
         });
-        scriptButton.setText("Load Script from File");
         scriptButtonPanel.add(scriptButton);
 
         JPanel scriptMainPanel = new JPanel(new BorderLayout());
@@ -273,7 +297,9 @@ public void actionPerformed(final ActionEvent e) {
 
         JPanel inputColumnsPanel = new JPanel();
         inputColumnsPanel.setLayout(new BoxLayout(inputColumnsPanel, BoxLayout.PAGE_AXIS));
-        inputColumnsPanel.setMinimumSize(new Dimension(20, 150));
+
+        if (num > 0)
+            inputColumnsPanel.setMinimumSize(new Dimension(20, 150));
 
         for (int i = 0; i < num; i++) {
             inputColumnsPanel.add(addColumnPane(

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

@@ -32,7 +32,7 @@ public final boolean isCellEditable(int row, int col) {
         return !m_readOnly;
     }
 
-    public final void setReadOnly(boolean readOnly){
+    public final void setReadOnly(boolean readOnly) {
         m_readOnly = readOnly;
     }
 
@@ -87,4 +87,20 @@ private String[] getDataTableValues(final int colIndex) {
     public final void clearRows() {
         data = new ArrayList<ArrayList<Object>>();
     }
+
+    public final void moveRowsUp(int[] rows) {
+        for (int j = 0; j < rows.length; j++) {
+            if (rows[j] != 0)
+                Collections.swap(data, rows[j], rows[j] - 1);
+        }
+        fireTableDataChanged();
+    }
+
+    public final void moveRowsDown(int[] rows) {
+        for (int j = rows.length - 1; j >= 0; j--) {
+            if (rows[j] != data.size() - 1)
+                Collections.swap(data, rows[j], rows[j] + 1);
+        }
+        fireTableDataChanged();
+    }
 }