scala: refactoring

Author: rssdev10

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

@@ -26,7 +26,8 @@ class RubyScriptNodeFactory extends NodeFactory[RubyScriptNodeModel] {
 
   override def getNrNodeViews(): Int = 0
 
-  override def createNodeView(viewIndex: Int, nodeModel: RubyScriptNodeModel): NodeView[RubyScriptNodeModel] = null
+  override def createNodeView(viewIndex: Int,
+    nodeModel: RubyScriptNodeModel): NodeView[RubyScriptNodeModel] = null
 
   override def hasDialog(): Boolean = true
 

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

@@ -43,7 +43,8 @@ object RubyScriptNodeModel {
   val COLUMN_NAMES = "new_column_names"
   val COLUMN_TYPES = "new_column_types"
 
-  private var logger: NodeLogger = NodeLogger.getLogger(classOf[RubyScriptNodeModel])
+  private var logger: NodeLogger = 
+    NodeLogger.getLogger(classOf[RubyScriptNodeModel])
 
   private var javaExtDirsExtensionsPath: String = _
 

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

@@ -5,8 +5,7 @@ import org.knime.core.node.NodeView
 class RubyScriptNodeView protected (nodeModel: RubyScriptNodeModel) extends NodeView[RubyScriptNodeModel](nodeModel) {
 
   protected override def modelChanged() {
-    val nodeModel = getNodeModel.asInstanceOf[RubyScriptNodeModel]
-    assert(nodeModel != null)
+    assert(getNodeModel.asInstanceOf[RubyScriptNodeModel] != null)
   }
 
   protected override def onClose() {

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

@@ -61,10 +61,8 @@ class ScriptNodeOutputColumnsTableModel extends AbstractTableModel {
 
   private def getDataTableValues(colIndex: Int): Array[String] = {
     val dataTableColumnValues = Array.ofDim[String](data.size)
-    val i = data.iterator()
     var rowNum = 0
-    while (i.hasNext) {
-      val row = i.next()
+    for (row <- data) {
       dataTableColumnValues(rowNum) = row.get(colIndex).asInstanceOf[String]
       rowNum += 1
     }
@@ -76,15 +74,14 @@ class ScriptNodeOutputColumnsTableModel extends AbstractTableModel {
   }
 
   def moveRowsUp(rows: Array[Int]) {
-    for (j <- 0 until rows.length if rows(j) != 0) Collections.swap(data, rows(j), rows(j) - 1)
+    for (j <- 0 until rows.length if rows(j) != 0)
+      Collections.swap(data, rows(j), rows(j) - 1)
     fireTableDataChanged()
   }
 
   def moveRowsDown(rows: Array[Int]) {
-    var j = rows.length - 1
-    while (j >= 0) {
+    for (j <- rows.length - 1 to 0) {
       if (rows(j) != data.size - 1) Collections.swap(data, rows(j), rows(j) + 1)
-      j -= 1
     }
     fireTableDataChanged()
   }