refactored code for up/down output columns moving. Fixed selection lost

Author: rssdev10

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

@@ -21,6 +21,8 @@
 import java.util.Iterator;
 import java.util.Map;
 
+import java.util.function.*;
+
 import javax.swing.Box;
 import javax.swing.BoxLayout;
 import javax.swing.DefaultCellEditor;
@@ -144,41 +146,6 @@ public void actionPerformed(final ActionEvent e) {
             }
         });
 
-        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);
 
@@ -190,6 +157,17 @@ public void actionPerformed(final ActionEvent e) {
         m_counter++;
         m_table.setModel(model);
 
+        JButton upButton = createButtonForRowsMoving("Up",
+                selectedRows -> model.moveRowsUp(selectedRows));
+        JButton downButton = createButtonForRowsMoving("Down",
+                selectedRows -> model.moveRowsDown(selectedRows));
+
+		outputButtonPanel.add(addButton);
+		outputButtonPanel.add(removeButton);
+		outputButtonPanel.add(Box.createHorizontalStrut(40));
+		outputButtonPanel.add(upButton);
+		outputButtonPanel.add(downButton);
+
         outputMainPanel.add(m_table.getTableHeader(), BorderLayout.PAGE_START);
         outputMainPanel.add(m_table, BorderLayout.CENTER);
         outputPanel.add(newtableCBPanel);
@@ -562,4 +540,27 @@ protected final void clearErrorHighlight() {
         m_scriptPanel.revalidate();
         m_scriptPanel.repaint();
     }
+
+	protected JButton createButtonForRowsMoving(String title,
+			Function<int[], int[]> mover) {
+		JButton button = new JButton(title);
+		button.addActionListener(new ActionListener() {
+			public void actionPerformed(final ActionEvent e) {
+				int[] selectedRows = m_table.getSelectedRows();
+				logger.debug("selectedRows = " + selectedRows);
+
+				if (selectedRows.length == 0) {
+					return;
+				}
+
+				int[] selection = mover.apply(selectedRows);
+
+				m_table.addRowSelectionInterval(
+						selection[0],
+						selection[selection.length - 1]);
+			}
+		});
+
+		return button;
+	}
 }

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

@@ -88,19 +88,30 @@ 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();
-    }
+	public final int[] moveRowsUp(int[] rows) {
+		int[] newSelection = rows.clone();
+
+		if (rows[0] != 0) {
+			for (int j = 0; j < rows.length; j++) {
+				Collections.swap(data, rows[j], rows[j] - 1);
+				newSelection[j] -= 1;
+			}
+			fireTableDataChanged();
+		}
+
+		return newSelection;
+	}
+
+	public final int[] moveRowsDown(int[] rows) {
+		int[] newSelection = rows.clone();
+
+		if (rows[rows.length - 1] != data.size() - 1) {
+			for (int j = rows.length - 1; j >= 0; j--) {
+				Collections.swap(data, rows[j], rows[j] + 1);
+				newSelection[j] += 1;
+			}
+			fireTableDataChanged();
+		}
+		return newSelection;
+	}
 }