Rename project and adjust package layout

Author: gab1one

Diff for: org.knime.scijava.scripting.node/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.knime.scijava.scripting.node</name>
+	<name>org.knime.scijava.scripting.nodes</name>
 	<comment></comment>
 	<projects>
 	</projects>

Diff for: org.knime.scijava.scripting.node/META-INF/MANIFEST.MF

@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-Name: KNIME Scijava Scripting Nodes
-Bundle-SymbolicName: org.knime.scijava.scripting.node;singleton:=true
+Bundle-SymbolicName: org.knime.scijava.scripting.nodes;singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Version: 0.9.0.qualifier
 Bundle-Vendor: University of Konstanz
@@ -26,4 +26,4 @@ Require-Bundle: org.knime.workbench.repository;bundle-version="3.0.0",
  com.fifesoft.rsyntaxtextarea;bundle-version="2.5.8"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: scijava_scripting_node.jar
-Export-Package: org.knime.scijava.scripting.node.ui
+Export-Package: org.knime.scijava.scripting.nodes.interactive.ui

Diff for: org.knime.scijava.scripting.node/plugin.xml

@@ -5,7 +5,7 @@
          point="org.knime.workbench.repository.nodesets">
       <nodeset
             expert-flag="false"
-            factory-class="org.knime.scijava.scripting.node.SciJavaScriptingNodeSetFactory"
+            factory-class="org.knime.scijava.scripting.nodes.SciJavaScriptingNodeSetFactory"
             id="org.knime.knip.scripting.node.ScriptingNodeSetFactory">
       </nodeset>
    </extension>

Diff for: org.knime.scijava.scripting.node/src/org/knime/scijava/scripting/node/SciJavaScriptingNodeSetFactory.java renamed to org.knime.scijava.scripting.node/src/org/knime/scijava/scripting/nodes/SciJavaScriptingNodeSetFactory.java

@@ -46,7 +46,7 @@
  * --------------------------------------------------------------------- *
  *
  */
-package org.knime.scijava.scripting.node;
+package org.knime.scijava.scripting.nodes;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -56,6 +56,8 @@
 import org.knime.core.node.NodeModel;
 import org.knime.core.node.NodeSetFactory;
 import org.knime.core.node.config.ConfigRO;
+import org.knime.scijava.scripting.nodes.interactive.SciJavaScriptingNodeFactory;
+import org.knime.scijava.scripting.nodes.scriptrunner.SciJavaScriptRunnerNodeFactory;;
 
 /**
  * @author <a href="mailto:[email protected]">Jonathan Hale</a>
@@ -112,6 +114,9 @@ public Collection<String> getNodeFactoryIds() {
         m_nodeFactories.put(
                 SciJavaScriptingNodeFactory.class.getCanonicalName(),
                 "/community/knip/");
+        // m_nodeFactories.put(
+        // SciJavaScriptRunnerNodeFactory.class.getCanonicalName(),
+        // "/community/knip/");
         return m_nodeFactories.keySet();
     }
 

Diff for: org.knime.scijava.scripting.node/src/org/knime/scijava/scripting/node/SciJavaScriptingNodeFactory.java renamed to org.knime.scijava.scripting.node/src/org/knime/scijava/scripting/nodes/interactive/SciJavaScriptingNodeFactory.java

@@ -46,15 +46,15 @@
  * --------------------------------------------------------------------- *
  *
  */
-package org.knime.scijava.scripting.node;
+package org.knime.scijava.scripting.nodes.interactive;
 
 import org.knime.core.node.NodeDialogPane;
 import org.knime.core.node.NodeFactory;
 import org.knime.core.node.NodeView;
 import org.knime.core.node.NotConfigurableException;
 import org.knime.scijava.scripting.base.ScriptingGateway;
-import org.knime.scijava.scripting.node.ui.ErrorDialogPane;
-import org.knime.scijava.scripting.node.ui.SciJavaScriptingNodeDialog;
+import org.knime.scijava.scripting.nodes.interactive.ui.ErrorDialogPane;
+import org.knime.scijava.scripting.nodes.interactive.ui.SciJavaScriptingNodeDialog;
 import org.scijava.Context;
 
 /**

Diff for: org.knime.scijava.scripting.node/src/org/knime/scijava/scripting/node/SciJavaScriptingNodeFactory.xml renamed to org.knime.scijava.scripting.node/src/org/knime/scijava/scripting/nodes/interactive/SciJavaScriptingNodeFactory.xml

@@ -1,4 +1,4 @@
-package org.knime.scijava.scripting.node;
+package org.knime.scijava.scripting.nodes.interactive;
 
 import java.io.File;
 import java.io.IOException;
@@ -47,9 +47,9 @@
 import org.knime.scijava.scripting.base.CompileHelper;
 import org.knime.scijava.scripting.base.CompileProductHelper;
 import org.knime.scijava.scripting.base.ScriptingGateway;
-import org.knime.scijava.scripting.node.settings.ColumnCreationMode;
-import org.knime.scijava.scripting.node.settings.SciJavaScriptingNodeSettings;
-import org.knime.scijava.scripting.node.settings.ScriptDialogMode;
+import org.knime.scijava.scripting.nodes.interactive.settings.ColumnCreationMode;
+import org.knime.scijava.scripting.nodes.interactive.settings.SciJavaScriptingNodeSettings;
+import org.knime.scijava.scripting.nodes.interactive.settings.ScriptDialogMode;
 import org.scijava.AbstractContextual;
 import org.scijava.Context;
 import org.scijava.module.Module;

Diff for: org.knime.scijava.scripting.node/src/org/knime/scijava/scripting/node/SciJavaScriptingNodeModel.java renamed to org.knime.scijava.scripting.node/src/org/knime/scijava/scripting/nodes/interactive/SciJavaScriptingNodeModel.java

@@ -1,4 +1,4 @@
-package org.knime.scijava.scripting.node.settings;
+package org.knime.scijava.scripting.nodes.interactive.settings;
 
 /**
  * Enum for column creation mode settings values.

Diff for: org.knime.scijava.scripting.node/src/org/knime/scijava/scripting/node/icon.png renamed to org.knime.scijava.scripting.node/src/org/knime/scijava/scripting/nodes/interactive/icon.png

@@ -1,4 +1,4 @@
-package org.knime.scijava.scripting.node.settings;
+package org.knime.scijava.scripting.nodes.interactive.settings;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -10,8 +10,8 @@
 import org.knime.core.node.defaultnodesettings.SettingsModelString;
 import org.knime.core.node.defaultnodesettings.SettingsModelStringArray;
 import org.knime.scijava.commands.settings.NodeSettingsService;
-import org.knime.scijava.scripting.node.SciJavaScriptingNodeModel;
-import org.knime.scijava.scripting.node.ui.SciJavaScriptingNodeDialog;
+import org.knime.scijava.scripting.nodes.interactive.SciJavaScriptingNodeModel;
+import org.knime.scijava.scripting.nodes.interactive.ui.SciJavaScriptingNodeDialog;
 import org.knime.scijava.scripting.util.ScriptUtils;
 
 /**

Diff for: org.knime.scijava.scripting.node/src/org/knime/scijava/scripting/node/settings/ColumnCreationMode.java renamed to org.knime.scijava.scripting.node/src/org/knime/scijava/scripting/nodes/interactive/settings/ColumnCreationMode.java

@@ -1,4 +1,4 @@
-package org.knime.scijava.scripting.node.settings;
+package org.knime.scijava.scripting.nodes.interactive.settings;
 
 /**
  * @author gabriel

Diff for: org.knime.scijava.scripting.node/src/org/knime/scijava/scripting/node/settings/SciJavaScriptingNodeSettings.java renamed to org.knime.scijava.scripting.node/src/org/knime/scijava/scripting/nodes/interactive/settings/SciJavaScriptingNodeSettings.java

@@ -1,4 +1,4 @@
-package org.knime.scijava.scripting.node.ui;
+package org.knime.scijava.scripting.nodes.interactive.ui;
 
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;

Diff for: org.knime.scijava.scripting.node/src/org/knime/scijava/scripting/node/settings/ScriptDialogMode.java renamed to org.knime.scijava.scripting.node/src/org/knime/scijava/scripting/nodes/interactive/settings/ScriptDialogMode.java

@@ -1,4 +1,4 @@
-package org.knime.scijava.scripting.node.ui;
+package org.knime.scijava.scripting.nodes.interactive.ui;
 
 import org.knime.core.node.defaultnodesettings.DefaultNodeSettingsPane;
 import org.knime.core.node.defaultnodesettings.DialogComponentLabel;

Diff for: org.knime.scijava.scripting.node/src/org/knime/scijava/scripting/node/ui/CodeEditorDialogComponent.java renamed to org.knime.scijava.scripting.node/src/org/knime/scijava/scripting/nodes/interactive/ui/CodeEditorDialogComponent.java

@@ -1,4 +1,4 @@
-package org.knime.scijava.scripting.node.ui;
+package org.knime.scijava.scripting.nodes.interactive.ui;
 
 import java.awt.Component;
 import java.awt.Dimension;

Diff for: org.knime.scijava.scripting.node/src/org/knime/scijava/scripting/node/ui/ErrorDialogPane.java renamed to org.knime.scijava.scripting.node/src/org/knime/scijava/scripting/nodes/interactive/ui/ErrorDialogPane.java

@@ -46,7 +46,7 @@
  * --------------------------------------------------------------------- *
  *
  */
-package org.knime.scijava.scripting.node.ui;
+package org.knime.scijava.scripting.nodes.interactive.ui;
 
 import java.awt.BorderLayout;
 import java.awt.GridBagLayout;
@@ -88,11 +88,11 @@
 import org.knime.scijava.scripting.base.CompileHelper;
 import org.knime.scijava.scripting.base.CompileProductHelper;
 import org.knime.scijava.scripting.base.ScriptingGateway;
-import org.knime.scijava.scripting.node.SciJavaScriptingNodeFactory;
-import org.knime.scijava.scripting.node.SciJavaScriptingNodeModel;
-import org.knime.scijava.scripting.node.settings.ColumnCreationMode;
-import org.knime.scijava.scripting.node.settings.SciJavaScriptingNodeSettings;
-import org.knime.scijava.scripting.node.settings.ScriptDialogMode;
+import org.knime.scijava.scripting.nodes.interactive.SciJavaScriptingNodeFactory;
+import org.knime.scijava.scripting.nodes.interactive.SciJavaScriptingNodeModel;
+import org.knime.scijava.scripting.nodes.interactive.settings.ColumnCreationMode;
+import org.knime.scijava.scripting.nodes.interactive.settings.SciJavaScriptingNodeSettings;
+import org.knime.scijava.scripting.nodes.interactive.settings.ScriptDialogMode;
 import org.scijava.Context;
 import org.scijava.InstantiableException;
 import org.scijava.command.CommandService;

Diff for: org.knime.scijava.scripting.node/src/org/knime/scijava/scripting/node/ui/SciJavaScriptingCodeEditor.java renamed to org.knime.scijava.scripting.node/src/org/knime/scijava/scripting/nodes/interactive/ui/SciJavaScriptingCodeEditor.java

@@ -1,4 +1,4 @@
-package org.knime.scijava.scripting.node.ui;
+package org.knime.scijava.scripting.nodes.interactive.ui;
 
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
@@ -9,7 +9,7 @@
 import org.knime.core.data.DataColumnSpec;
 import org.knime.core.node.NodeLogger;
 import org.knime.scijava.commands.converter.ConverterCacheService;
-import org.knime.scijava.scripting.node.settings.SciJavaScriptingNodeSettings;
+import org.knime.scijava.scripting.nodes.interactive.settings.SciJavaScriptingNodeSettings;
 import org.knime.scijava.scripting.parameters.ParameterCodeGenerator;
 import org.knime.scijava.scripting.parameters.ParameterCodeGeneratorService;
 import org.scijava.AbstractContextual;