Skip to content

Commit f5e223a

Browse files
dietzcSquareys
authored andcommitted
Refactor scijava integration
1 parent 4f2c7ef commit f5e223a

File tree

75 files changed

+2119
-1791
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+2119
-1791
lines changed

org.knime.scijava.commands/.classpath

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
55
<classpathentry excluding="org/knime/knip/scijava/commands/adapter/basic/ImgInputAdapter.java|org/knime/knip/scijava/commands/adapter/basic/ImgOutputAdapter.java|org/knime/knip/scijava/commands/adapter/basic/ImgPlusInputAdapter.java|org/knime/knip/scijava/commands/adapter/basic/ImgPlusOutputAdapter.java" kind="src" path="src"/>
6+
<classpathentry exported="true" kind="lib" path="lib/tools.jar"/>
67
<classpathentry kind="output" path="bin"/>
78
</classpath>

org.knime.scijava.commands/META-INF/MANIFEST.MF

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,16 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.11.0",
1616
scijava-plugins-text-plain;bundle-version="0.1.2",
1717
scijava-ui-awt;bundle-version="0.1.4",
1818
scijava-ui-swing;bundle-version="0.8.0",
19-
org.knime.scijava.core;bundle-version="0.2.1"
19+
org.knime.scijava.core;bundle-version="0.2.1",
20+
com.google.guava;bundle-version="19.0.0",
21+
scripting-jython;bundle-version="0.3.0",
22+
jython-shaded;bundle-version="2.5.3",
23+
scripting-java;bundle-version="0.4.0",
24+
scripting-clojure;bundle-version="0.1.4"
2025
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
2126
Bundle-ActivationPolicy: lazy
22-
Bundle-ClassPath: scijava_commands.jar
27+
Bundle-ClassPath: scijava_commands.jar,
28+
lib/tools.jar
2329
Export-Package: org.knime.scijava.commands,
2430
org.knime.scijava.commands.adapter,
2531
org.knime.scijava.commands.adapter.basic,

org.knime.scijava.commands/build.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ bin.includes = plugin.xml,\
66
lib/,\
77
icons/,\
88
lib/mvn/scijava-common-2.1.0.jar,\
9-
scijava_commands.jar
9+
scijava_commands.jar,\
10+
lib/tools.jar
1011
output.knipknime.jar = bin/
1112
src.includes = lib/src/,\
1213
src/
17.3 MB
Binary file not shown.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<?eclipse version="3.0"?>
33
<plugin>
4+
<extension
5+
point="org.knime.workbench.repository.nodes">
6+
</extension>
7+
<extension
8+
point="org.knime.workbench.repository.nodesets">
9+
<nodeset
10+
default-category-icon="org.knime.scijava.commands.nodes.SciJavaNodeSetFactory"
11+
deprecated="false"
12+
factory-class="org.knime.scijava.commands.nodes.SciJavaNodeSetFactory"
13+
id="SciJavaNodeSet (TMP)">
14+
</nodeset>
15+
</extension>
416
</plugin>
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# @double value
2+
# @OUTPUT double greeting
3+
4+
greeting = value
5+
6+
print greeting
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
; @Integer(label="My integer",description="Input integer.",value=17) test-int
2+
; @OUTPUT Integer output-int
3+
4+
(def output-int test-int)
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package org.knime.scijava.commands;
2+
3+
import org.knime.core.data.DataCell;
4+
5+
public interface CellOutput {
6+
void push(final DataCell[] cells);
7+
}

org.knime.scijava.commands/src/org/knime/scijava/commands/DefaultKnimeExecutionService.java

Lines changed: 0 additions & 47 deletions
This file was deleted.

org.knime.scijava.commands/src/org/knime/scijava/commands/KNIMEExecutionService.java

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)