Skip to content

Commit f01811c

Browse files
committed
scala: refactoring 'if' to 'case'
1 parent 13f2b19 commit f01811c

1 file changed

Lines changed: 30 additions & 21 deletions

File tree

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

Lines changed: 30 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -174,15 +174,21 @@ end
174174

175175
buffer ++= templateFlowVar
176176

177-
if (snippetMode) {
178-
buffer ++= templateSnippet
179-
} else {
180-
if (numInputs > 0) {
181-
buffer ++= templateScriptMultiInput
182-
} else {
183-
buffer ++= templateScript
184-
}
185-
}
177+
buffer ++= (snippetMode match {
178+
case true => templateSnippet
179+
case _ if (numInputs > 0) => templateScriptMultiInput
180+
case _ => templateScript
181+
})
182+
183+
// if (snippetMode) {
184+
// buffer ++= templateSnippet
185+
// } else {
186+
// if (numInputs > 0) {
187+
// buffer ++= templateScriptMultiInput
188+
// } else {
189+
// buffer ++= templateScript
190+
// }
191+
// }
186192
script = buffer.toString()
187193

188194
if (snippetMode) {
@@ -324,9 +330,6 @@ end
324330
result
325331
}
326332

327-
protected def reset() {
328-
}
329-
330333
protected override def loadInternals(nodeInternDir: File, exec: ExecutionMonitor) {
331334
}
332335

@@ -403,15 +406,21 @@ end
403406
//break
404407
}
405408
}
406-
script_error.msg = "script"
407-
if (script_error.lineNum != -1) {
408-
script_error.msg += " stopped with error in line " + script_error.lineNum
409-
if (script_error.columnNum != -1) {
410-
script_error.msg += " at column " + script_error.columnNum
411-
}
412-
} else {
413-
script_error.msg += "] stopped with error at line --unknown--"
414-
}
409+
script_error.msg = "script" + (script_error.lineNum match {
410+
case -1 => "] stopped with error at line --unknown--"
411+
case _ =>
412+
" stopped with error in line " + script_error.lineNum +
413+
(if (script_error.columnNum != -1) " at column " + script_error.columnNum)
414+
})
415+
416+
// if (script_error.lineNum != -1) {
417+
// script_error.msg += " stopped with error in line " + script_error.lineNum
418+
// if (script_error.columnNum != -1) {
419+
// script_error.msg += " at column " + script_error.columnNum
420+
// }
421+
// } else {
422+
// script_error.msg += "] stopped with error at line --unknown--"
423+
// }
415424
if (script_error.`type` == "RuntimeError") {
416425
logger.error(script_error.msg + "\n" + script_error.`type` + " ( " + script_error.text + " )")
417426
val cause = thr.getCause

0 commit comments

Comments
 (0)