Skip to content

Commit 6f61954

Browse files
committed
scala: restored javadocs. It lost when was automatically converted from java to scala
1 parent a7012e1 commit 6f61954

12 files changed

Lines changed: 177 additions & 1 deletion

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ import RubyScriptNodeDialog._
4040
import scala.collection.JavaConversions._
4141
import scala.collection.convert.WrapAsScala.enumerationAsScalaIterator
4242

43+
/**
44+
* <code>NodeDialog</code> for the "JRuby Script" Node.
45+
*
46+
* @author rss
47+
*
48+
*/
4349
object RubyScriptNodeDialog {
4450

4551
private val TEMPLATE_FLOW_VAR = "FlowVariableList['%s'] "
@@ -73,6 +79,9 @@ class RubyScriptNodeDialog(private var factory: RubyScriptNodeFactory)
7379

7480
createScriptTab()
7581

82+
/**
83+
* Create column selection tab panel
84+
*/
7685
private def createColumnSelectionTab() {
7786
val outputPanel = new JPanel()
7887
outputPanel.setLayout(new BoxLayout(outputPanel, BoxLayout.Y_AXIS))
@@ -169,6 +178,10 @@ class RubyScriptNodeDialog(private var factory: RubyScriptNodeFactory)
169178
addTab("Script Output", outputPanel)
170179
}
171180

181+
/**
182+
* Create script tab panel which contains lists of columns, flow variables,
183+
* Ruby script etc.
184+
*/
172185
private def createScriptTab() {
173186
errorMessage = new JTextArea()
174187
spErrorMessage = new JScrollPane(errorMessage)
@@ -243,6 +256,12 @@ class RubyScriptNodeDialog(private var factory: RubyScriptNodeFactory)
243256
addTab("Script", config_and_sript, false)
244257
}
245258

259+
/**
260+
* Create a panel of input columns
261+
* @param label
262+
* @param list of columns
263+
* @return JPanel
264+
*/
246265
private def addColumnPane(label: String, index: Int): JPanel = {
247266
val panel = new JPanel(new BorderLayout())
248267
val table = new JTable()
@@ -303,6 +322,11 @@ class RubyScriptNodeDialog(private var factory: RubyScriptNodeFactory)
303322
}
304323
}
305324

325+
/**
326+
* Create a panel with flow variable list
327+
* @param label
328+
* @return JPanel
329+
*/
306330
private def addFlowVariablesPane(label: String): JPanel = {
307331
val flowVariablesPanel = new JPanel(new BorderLayout())
308332
val table = new JTable()
@@ -341,6 +365,9 @@ class RubyScriptNodeDialog(private var factory: RubyScriptNodeFactory)
341365
flowVariablesPanel
342366
}
343367

368+
/* (non-Javadoc)
369+
* @see org.knime.core.node.NodeDialogPane#loadSettingsFrom(org.knime.core.node.NodeSettingsRO, org.knime.core.data.DataTableSpec[])
370+
*/
344371
override protected def loadSettingsFrom(settings: NodeSettingsRO,
345372
specs: Array[DataTableSpec]) {
346373
var script = Option(settings.getString(RubyScriptNodeModel.SCRIPT, null))
@@ -381,6 +408,9 @@ class RubyScriptNodeDialog(private var factory: RubyScriptNodeFactory)
381408
updateColumnTable(specs)
382409
}
383410

411+
/* (non-Javadoc)
412+
* @see org.knime.core.node.NodeDialogPane#saveSettingsTo(org.knime.core.node.NodeSettingsWO)
413+
*/
384414
protected def saveSettingsTo(settings: NodeSettingsWO) {
385415
val editingRow = table.getEditingRow
386416
val editingColumn = table.getEditingColumn
@@ -403,6 +433,9 @@ class RubyScriptNodeDialog(private var factory: RubyScriptNodeFactory)
403433
settings.addStringArray(RubyScriptNodeModel.COLUMN_TYPES, columnTypes: _*)
404434
}
405435

436+
/**
437+
* Delete highlight in the script pane and hide error window
438+
*/
406439
protected def clearErrorHighlight() {
407440
scriptTextArea.removeAllLineHighlights()
408441
spErrorMessage.setVisible(false)

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ import org.knime.core.node.NodeFactory
55
import org.knime.core.node.NodeView
66
import org.knime.ext.jruby.RubyScriptNodeModel._
77

8+
/**
9+
* <code>NodeFactory</code> for the "RubyScript" Node.
10+
*
11+
* @author rss
12+
*
13+
*/
814
class RubyScriptNodeFactory extends NodeFactory[RubyScriptNodeModel] {
915

1016
private var model: RubyScriptNodeModel = _
@@ -20,17 +26,32 @@ class RubyScriptNodeFactory extends NodeFactory[RubyScriptNodeModel] {
2026

2127
def getDialog(): RubyScriptNodeDialog = dialog
2228

29+
/* (non-Javadoc)
30+
* @see org.knime.core.node.NodeFactory#createNodeModel()
31+
*/
2332
override def createNodeModel(): RubyScriptNodeModel = {
2433
setModel(new RubyScriptNodeModel(1, 1, false))
2534
}
2635

36+
/* (non-Javadoc)
37+
* @see org.knime.core.node.NodeFactory#getNrNodeViews()
38+
*/
2739
override def getNrNodeViews(): Int = 0
2840

41+
/* (non-Javadoc)
42+
* @see org.knime.core.node.NodeFactory#createNodeView()
43+
*/
2944
override def createNodeView(viewIndex: Int,
3045
nodeModel: RubyScriptNodeModel): NodeView[RubyScriptNodeModel] = null
3146

47+
/* (non-Javadoc)
48+
* @see org.knime.core.node.NodeFactory#hasDialog()
49+
*/
3250
override def hasDialog(): Boolean = true
3351

52+
/* (non-Javadoc)
53+
* @see org.knime.core.node.NodeFactory#createNodeDialogPane()
54+
*/
3455
override def createNodeDialogPane(): NodeDialogPane = {
3556
dialog = new RubyScriptNodeDialog(this)
3657
dialog

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
11
package org.knime.ext.jruby
22

3+
/**
4+
* <code>NodeFactory</code> for the "RubyScript" Node.
5+
*
6+
* @author rss
7+
*
8+
*/
39
class RubyScriptNodeFactory01 extends RubyScriptNodeFactory {
410

11+
/* (non-Javadoc)
12+
* @see org.knime.ext.jruby.RubyScriptNodeFactory#createNodeModel()
13+
*/
514
override def createNodeModel(): RubyScriptNodeModel = {
615
setModel(new RubyScriptNodeModel(0, 1, false))
716
}

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
11
package org.knime.ext.jruby
22

3+
/**
4+
* <code>NodeFactory</code> for the "RubyScript" Node.
5+
*
6+
* @author rss
7+
*
8+
*/
39
class RubyScriptNodeFactory22 extends RubyScriptNodeFactory {
410

11+
/* (non-Javadoc)
12+
* @see org.knime.ext.jruby.RubyScriptNodeFactory#createNodeModel()
13+
*/
514
override def createNodeModel(): RubyScriptNodeModel = {
615
setModel(new RubyScriptNodeModel(2, 2, false))
716
}

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

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,14 @@ import org.knime.ext.jruby.preferences.PreferenceConstants
3636
import scala.collection.JavaConversions._
3737
import scala.util.matching.Regex
3838

39+
/**
40+
* This is the model implementation of RubyScript.
41+
*
42+
* This source code based on PythonScriptNodeModel.java from org.knime.ext.jython.source_2.9.0.0040102 by Tripos
43+
*
44+
* @author rss
45+
*
46+
*/
3947
object RubyScriptNodeModel {
4048

4149
val SCRIPT = "script"
@@ -198,6 +206,9 @@ end
198206
"snippet_runner &func\n"
199207
}
200208

209+
/* (non-Javadoc)
210+
* @see org.knime.core.node.NodeModel#execute(org.knime.core.node.BufferedDataTable[], org.knime.core.node.ExecutionContext)
211+
*/
201212
override protected def execute(inData: Array[BufferedDataTable], exec: ExecutionContext): Array[BufferedDataTable] = {
202213
var i: Int = 0
203214
val outSpecs = configure(if (numInputs > 0) Array(inData(0).getDataTableSpec) else null)
@@ -342,19 +353,31 @@ end
342353
result.toArray
343354
}
344355

356+
/* (non-Javadoc)
357+
* @see org.knime.core.node.NodeModel#loadInternals(java.io.File, org.knime.core.node.ExecutionMonitor)
358+
*/
345359
protected override def loadInternals(nodeInternDir: File, exec: ExecutionMonitor) {
346360
}
347361

362+
/* (non-Javadoc)
363+
* @see org.knime.core.node.NodeModel#saveInternals(java.io.File, org.knime.core.node.ExecutionMonitor)
364+
*/
348365
protected override def saveInternals(nodeInternDir: File, exec: ExecutionMonitor) {
349366
}
350367

368+
/* (non-Javadoc)
369+
* @see org.knime.core.node.NodeModel#saveSettingsTo(org.knime.core.node.NodeSettingsWO)
370+
*/
351371
protected def saveSettingsTo(settings: NodeSettingsWO) {
352372
settings.addString(SCRIPT, script)
353373
settings.addBoolean(APPEND_COLS, appendCols)
354374
settings.addStringArray(COLUMN_NAMES, columnNames:_*)
355375
settings.addStringArray(COLUMN_TYPES, columnTypes:_*)
356376
}
357377

378+
/* (non-Javadoc)
379+
* @see org.knime.core.node.NodeModel#loadValidatedSettingsFrom(org.knime.core.node.NodeSettingsRO)
380+
*/
358381
protected def loadValidatedSettingsFrom(settings: NodeSettingsRO) {
359382
script = settings.getString(SCRIPT)
360383
appendCols = settings.getBoolean(APPEND_COLS, true)
@@ -363,12 +386,21 @@ end
363386
script_error = new ScriptError()
364387
}
365388

389+
/* (non-Javadoc)
390+
* @see org.knime.core.node.NodeModel#validateSettings(org.knime.core.node.NodeSettingsRO)
391+
*/
366392
protected def validateSettings(settings: NodeSettingsRO) {
367393
settings.getString(SCRIPT)
368394
settings.getStringArray(COLUMN_NAMES)
369395
settings.getStringArray(COLUMN_TYPES)
370396
}
371397

398+
/**
399+
* Process an exception stack from JRuby.
400+
* This methods searches a message at top of stack by any code
401+
* from a filename with the value of filename parameter.
402+
*
403+
*/
372404
private def findErrorSource(thr: Throwable, filename: String): Int = {
373405
val err = thr.getMessage
374406
if (err.startsWith("(SyntaxError)")) {
@@ -467,6 +499,9 @@ end
467499
script_error.lineNum
468500
}
469501

502+
/* (non-Javadoc)
503+
* @see org.knime.core.node.NodeModel#reset()
504+
*/
470505
protected def reset() {
471506
}
472507

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ import org.eclipse.ui.plugin.AbstractUIPlugin
44
import org.osgi.framework.BundleContext
55
import RubyScriptNodePlugin._
66

7+
/**
8+
* This is the eclipse bundle activator. Note: KNIME node developers probably
9+
* won't have to do anything in here, as this class is only needed by the
10+
* eclipse platform/plugin mechanism. If you want to move/rename this file, make
11+
* sure to change the plugin.xml file in the project root directory accordingly.
12+
*
13+
* @author rss
14+
*/
715
object RubyScriptNodePlugin {
816

917
private var plugin: RubyScriptNodePlugin = _
@@ -15,10 +23,17 @@ class RubyScriptNodePlugin extends AbstractUIPlugin() {
1523

1624
plugin = this
1725

26+
/* (non-Javadoc)
27+
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
28+
*/
1829
override def start(context: BundleContext) {
1930
super.start(context)
31+
plugin = this
2032
}
2133

34+
/* (non-Javadoc)
35+
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
36+
*/
2237
override def stop(context: BundleContext) {
2338
super.stop(context)
2439
plugin = null

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,30 @@ package org.knime.ext.jruby
22

33
import org.knime.core.node.NodeView
44

5+
/**
6+
* <code>NodeView</code> for the "RubyScript" Node.
7+
*
8+
* @author rss
9+
*
10+
*/
511
class RubyScriptNodeView protected (nodeModel: RubyScriptNodeModel) extends NodeView[RubyScriptNodeModel](nodeModel) {
612

13+
/* (non-Javadoc)
14+
* @see org.knime.core.node.AbstractNodeView#modelChanged()
15+
*/
716
protected override def modelChanged() {
817
assert(getNodeModel.asInstanceOf[RubyScriptNodeModel] != null)
918
}
1019

20+
/* (non-Javadoc)
21+
* @see org.knime.core.node.NodeView#onClose()
22+
*/
1123
protected override def onClose() {
1224
}
1325

26+
/* (non-Javadoc)
27+
* @see org.knime.core.node.NodeView#onOpen()
28+
*/
1429
protected override def onOpen() {
1530
}
1631

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
11
package org.knime.ext.jruby
22

3+
/**
4+
* <code>NodeFactory</code> for the "RubyScript" Node.
5+
*
6+
* @author rss
7+
*
8+
*/
39
class RubySnippetNodeFactory extends RubyScriptNodeFactory {
410

11+
/* (non-Javadoc)
12+
* @see org.knime.ext.jruby.RubyScriptNodeFactory#createNodeModel()
13+
*/
514
override def createNodeModel(): RubyScriptNodeModel = {
615
setModel(new RubyScriptNodeModel(1, 1, true))
716
}

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,13 @@ import java.util._
55
//remove if not needed
66
import scala.collection.JavaConversions._
77

8-
@SerialVersionUID(3748218863796706007L)
8+
/**
9+
* This class realizes a model for the table
10+
* which presents an output columns list
11+
*
12+
* @author rss
13+
*
14+
*/
915
class ScriptNodeOutputColumnsTableModel extends AbstractTableModel {
1016

1117
private var data: ArrayList[ArrayList[Any]] = new ArrayList[ArrayList[Any]]()

RubyScript/src/org/knime/ext/jruby/preferences/PreferenceConstants.scala

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
package org.knime.ext.jruby.preferences
22

3+
/**
4+
* Constant definitions for plug-in preferences.
5+
*
6+
* @author rss
7+
*/
38
object PreferenceConstants {
49

510
val JRUBY_PLUGIN = "org.knime.ext.jruby"

0 commit comments

Comments
 (0)