scala: fixed movement of multiple selected rows of column's names in a configuration dialog

Author: rssdev10

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

@@ -121,30 +121,39 @@ class RubyScriptNodeDialog(private var factory: RubyScriptNodeFactory)
         }
       }
     })
-    val upButton = new JButton("Up")
-    upButton.addActionListener(new ActionListener() {
 
-      def actionPerformed(e: ActionEvent) {
-        val selectedRows = table.getSelectedRows
-        logger.debug("selectedRows = " + selectedRows)
-        if (selectedRows.length > 0) {
-          table.getModel.asInstanceOf[ScriptNodeOutputColumnsTableModel]
-            .moveRowsUp(selectedRows)
-        }
-      }
-    })
-    val downButton = new JButton("Down")
-    downButton.addActionListener(new ActionListener() {
+    table = new JTable()
+    table.putClientProperty("terminateEditOnFocusLost", true)
+    table.setAutoscrolls(true)
+    val model = new ScriptNodeOutputColumnsTableModel()
+    model.addColumn("Column name")
+    model.addColumn("Column type")
+    model.addRow("script output " + columnCounter, "String")
+    columnCounter += 1
+    table.setModel(model)
 
-      def actionPerformed(e: ActionEvent) {
-        val selectedRows = table.getSelectedRows
-        logger.debug("selectedRows = " + selectedRows)
-        if (selectedRows.length > 0) {
-          table.getModel.asInstanceOf[ScriptNodeOutputColumnsTableModel]
-            .moveRowsDown(selectedRows)
+    def createButtonForRowsMoving(title: String, func: (Array[Int]) => (Int, Int)): JButton = {
+      val result = new JButton(title)
+      result.addActionListener(new ActionListener() {
+
+        def actionPerformed(e: ActionEvent) {
+          val selectedRows = table.getSelectedRows
+          logger.debug("selectedRows = " + selectedRows)
+          if (selectedRows.length > 0) {
+            val position = func(selectedRows)
+            table.setRowSelectionInterval(position._1, position._2)
+          }
         }
-      }
-    })
+      })
+      result
+    }
+
+    val upButton = createButtonForRowsMoving(
+        "Up",
+        table.getModel.asInstanceOf[ScriptNodeOutputColumnsTableModel].moveRowsUp)
+    val downButton = createButtonForRowsMoving(
+        "Down",
+        table.getModel.asInstanceOf[ScriptNodeOutputColumnsTableModel].moveRowsDown)
 
     Array(addButton, removeButton, Box.createHorizontalStrut(40),
       upButton, downButton).foreach(outputButtonPanel.add)
@@ -154,15 +163,7 @@ class RubyScriptNodeDialog(private var factory: RubyScriptNodeFactory)
 //    outputButtonPanel.add(Box.createHorizontalStrut(40))
 //    outputButtonPanel.add(upButton)
 //    outputButtonPanel.add(downButton)
-    table = new JTable()
-    table.putClientProperty("terminateEditOnFocusLost", true)
-    table.setAutoscrolls(true)
-    val model = new ScriptNodeOutputColumnsTableModel()
-    model.addColumn("Column name")
-    model.addColumn("Column type")
-    model.addRow("script output " + columnCounter, "String")
-    columnCounter += 1
-    table.setModel(model)
+
     outputMainPanel.add(table.getTableHeader, BorderLayout.PAGE_START)
     outputMainPanel.add(table, BorderLayout.CENTER)
     outputPanel.add(newtableCBPanel)

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

@@ -82,15 +82,27 @@ class ScriptNodeOutputColumnsTableModel extends AbstractTableModel {
     s(j) = v
   }
 
-  def moveRowsUp(rows: Array[Int]) {
-    for (j <- 0 until rows.length if rows(j) != 0)
-      swap(data, rows(j), rows(j) - 1)
-    fireTableDataChanged()
+  def moveRowsUp(rows: Array[Int]):(Int,Int) = {
+    val limit = 0
+    var range = Array(rows.head, rows.last)
+    if (rows.head > limit) {
+      rows.foreach(i => swap(data, i, i - 1))
+      fireTableDataChanged()
+
+      range = range.map(i => if (i - 1 < limit) limit else i - 1)
+    }
+    (range(0), range(1))
   }
 
-  def moveRowsDown(rows: Array[Int]) {
-    for (j <- rows.length - 1 to 0 if rows(j) != data.size - 1)
-      swap(data, rows(j), rows(j) + 1)
-    fireTableDataChanged()
+  def moveRowsDown(rows: Array[Int]): (Int, Int) = {
+    val limit = data.size - 1;
+    var range = Array(rows.head, rows.last)
+    if (rows.last < limit) {
+      rows.view.reverse.foreach(i => swap(data, i + 1, i))
+
+      fireTableDataChanged()
+      range = range.map(i => if (i + 1 > limit) limit else i + 1)
+    }
+    (range(0), range(1))
   }
 }