Skip to content

Commit b0d5eb0

Browse files
dietzcdietzc
committed
bump to 1.1.0
* changed KNIME/KNIP minimum versions * changed to Java 8
1 parent 8a7b00f commit b0d5eb0

File tree

11 files changed

+45
-46
lines changed

11 files changed

+45
-46
lines changed

‎org.knime.knip.imagej3d.base/.classpath

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
3+
<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 kind="src" path="src"/>
66
<classpathentry exported="true" kind="lib" path="lib/ij3d_knip_build.jar"/>

‎org.knime.knip.imagej3d.base/.settings/org.eclipse.jdt.core.prefs

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
66
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
77
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
88
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
9-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
9+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
1010
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
11-
org.eclipse.jdt.core.compiler.compliance=1.7
11+
org.eclipse.jdt.core.compiler.compliance=1.8
1212
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
1313
org.eclipse.jdt.core.compiler.debug.localVariable=generate
1414
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -96,4 +96,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
9696
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
9797
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
9898
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99-
org.eclipse.jdt.core.compiler.source=1.7
99+
org.eclipse.jdt.core.compiler.source=1.8

‎org.knime.knip.imagej3d.base/META-INF/MANIFEST.MF

+7-6
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,25 @@ Manifest-Version: 1.0
22
Bundle-Name: KNIME ImageJ 3D Viewer Integration
33
Bundle-SymbolicName: org.knime.knip.imagej3d.base;singleton:=true
44
Bundle-ManifestVersion: 2
5-
Bundle-Version: 1.0.1.qualifier
5+
Bundle-Version: 1.1.0.qualifier
66
Eclipse-RegisterBuddy: org.knime.knip.imagej2.core
77
Bundle-Vendor: University of Konstanz / FIJI (http://3dviewer.neurofly.de/)
8-
Require-Bundle: org.knime.workbench.repository;bundle-version="[2.10.0,3.0.0)",
8+
Require-Bundle: org.knime.workbench.repository;bundle-version="[3.0.0,4.0.0)",
99
org.apache.log4j;bundle-version="1.2.15",
1010
org.eclipse.core.runtime,
1111
org.eclipse.ui,
1212
org.knime.knip.base;bundle-version="[1.2.0,2.0.0)",
1313
org.knime.knip.core;bundle-version="[1.2.0,2.0.0)",
14-
org.knime.knip.imagej2.core;bundle-version="[0.9.0,0.10.0)",
15-
org.knime.core;bundle-version="[2.10.0,3.0.0)",
14+
org.knime.knip.imagej2.core;bundle-version="[0.10.0,0.11.0)",
15+
org.knime.core;bundle-version="[3.0.0,4.0.0)",
1616
imglib2;bundle-version="2.2.0",
1717
imagej-common;bundle-version="0.12.0",
1818
ij;bundle-version="1.49.0",
1919
imglib2-ij;bundle-version="2.0.0",
2020
knip-tmp-imglib2-ops;bundle-version="0.1.4",
21-
scijava-common;bundle-version="2.37.0"
22-
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
21+
scijava-common;bundle-version="2.47.0",
22+
scijava-cache;bundle-version="0.1.0"
23+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
2324
Bundle-ClassPath: .,
2425
lib/ij3d_knip_build.jar,
2526
lib/j3dcore.jar,

‎org.knime.knip.imagej3d.base/src/org/knime/knip/imagej3d/ImageJ3DTableCellView.java

+17-19
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,6 @@
4949

5050
package org.knime.knip.imagej3d;
5151

52-
import ij.ImagePlus;
53-
import ij.process.ByteProcessor;
54-
import ij.process.ImageProcessor;
55-
import ij3d.Content;
56-
import ij3d.ContentConstants;
57-
import ij3d.Image3DUniverse;
58-
import ij3d.ImageWindow3D;
59-
6052
import java.awt.BorderLayout;
6153
import java.awt.Color;
6254
import java.awt.Component;
@@ -75,17 +67,6 @@
7567
import javax.swing.SwingWorker;
7668
import javax.swing.ToolTipManager;
7769

78-
import net.imagej.ImgPlus;
79-
import net.imglib2.converter.Converter;
80-
import net.imglib2.ops.operation.Operations;
81-
import net.imglib2.ops.operation.iterableinterval.unary.MinMax;
82-
import net.imglib2.ops.operation.real.unary.Normalize;
83-
import net.imglib2.type.Type;
84-
import net.imglib2.type.numeric.RealType;
85-
import net.imglib2.type.numeric.real.DoubleType;
86-
import net.imglib2.type.numeric.real.FloatType;
87-
import net.imglib2.util.ValuePair;
88-
8970
import org.knime.core.data.DataValue;
9071
import org.knime.core.node.NodeLogger;
9172
import org.knime.core.node.config.ConfigRO;
@@ -97,6 +78,23 @@
9778
import org.knime.knip.imagej2.core.util.ImageProcessorFactory;
9879
import org.knime.knip.imagej2.core.util.ImgToIJ;
9980

81+
import ij.ImagePlus;
82+
import ij.process.ByteProcessor;
83+
import ij.process.ImageProcessor;
84+
import ij3d.Content;
85+
import ij3d.ContentConstants;
86+
import ij3d.Image3DUniverse;
87+
import ij3d.ImageWindow3D;
88+
import net.imagej.ImgPlus;
89+
import net.imglib2.converter.Converter;
90+
import net.imglib2.ops.operation.Operations;
91+
import net.imglib2.ops.operation.iterableinterval.unary.MinMax;
92+
import net.imglib2.ops.operation.real.unary.Normalize;
93+
import net.imglib2.type.Type;
94+
import net.imglib2.type.numeric.RealType;
95+
import net.imglib2.type.numeric.real.DoubleType;
96+
import net.imglib2.type.numeric.real.FloatType;
97+
import net.imglib2.util.ValuePair;
10098
import view4d.Timeline;
10199
import view4d.TimelineGUI;
102100

‎org.knime.knip.imagej3d.bin.linux.amd64/META-INF/MANIFEST.MF

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: ImageJ 3D Viewer Libraries for Linux x86_64
44
Bundle-SymbolicName: org.knime.knip.imagej3d.bin.linux.amd64;singleton:=true
5-
Bundle-Version: 1.0.1.qualifier
6-
Fragment-Host: org.knime.knip.imagej3d.base;bundle-version="1.0.1"
7-
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
5+
Bundle-Version: 1.1.0.qualifier
6+
Fragment-Host: org.knime.knip.imagej3d.base;bundle-version="1.1.0"
7+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
88
Bundle-Vendor: University of Konstanz
99
Eclipse-PlatformFilter: (&(osgi.os=linux)(osgi.arch=x86_64))
1010

‎org.knime.knip.imagej3d.bin.linux.x86/META-INF/MANIFEST.MF

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: ImageJ 3D Viewer Libraries for Linux x86
44
Bundle-SymbolicName: org.knime.knip.imagej3d.bin.linux.x86
5-
Bundle-Version: 1.0.1.qualifier
5+
Bundle-Version: 1.1.0.qualifier
66
Bundle-Vendor: University of Konstanz
7-
Fragment-Host: org.knime.knip.imagej3d.base;bundle-version="1.0.1"
8-
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
7+
Fragment-Host: org.knime.knip.imagej3d.base;bundle-version="1.1.0"
8+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
99
Eclipse-PlatformFilter: (&(osgi.os=linux)(osgi.arch=x86))

‎org.knime.knip.imagej3d.bin.macosx.amd64/META-INF/MANIFEST.MF

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: ImageJ 3D Viewer Libraries for OSX
44
Bundle-SymbolicName: org.knime.knip.imagej3d.bin.macosx.amd64;singleton:=true
5-
Bundle-Version: 1.0.1.qualifier
5+
Bundle-Version: 1.1.0.qualifier
66
Bundle-Vendor: University of Konstanz
7-
Fragment-Host: org.knime.knip.imagej3d.base;bundle-version="1.0.1"
8-
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
7+
Fragment-Host: org.knime.knip.imagej3d.base;bundle-version="1.1.0"
98
Eclipse-PlatformFilter: (&(osgi.os=macosx)(osgi.arch=x86_64))
109
Bundle-ClassPath: .
10+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
1111

1212

‎org.knime.knip.imagej3d.bin.windows.amd64/META-INF/MANIFEST.MF

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: ImageJ 3D Viewer Libraries for Windows x86_64
44
Bundle-SymbolicName: org.knime.knip.imagej3d.bin.windows.amd64
5-
Bundle-Version: 1.0.1.qualifier
5+
Bundle-Version: 1.1.0.qualifier
66
Bundle-Vendor: University of Konstanz
7-
Fragment-Host: org.knime.knip.imagej3d.base;bundle-version="1.0.1"
8-
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
7+
Fragment-Host: org.knime.knip.imagej3d.base;bundle-version="1.1.0"
8+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
99
Eclipse-PlatformFilter: (&(osgi.os=win32)(osgi.arch=x86_64))

‎org.knime.knip.imagej3d.bin.windows.x86/META-INF/MANIFEST.MF

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: ImageJ 3D Viewer Libraries for Linux x86
44
Bundle-SymbolicName: org.knime.knip.imagej3d.bin.windows.x86
5-
Bundle-Version: 1.0.1.qualifier
5+
Bundle-Version: 1.1.0.qualifier
66
Bundle-Vendor: University of Konstanz
7-
Fragment-Host: org.knime.knip.imagej3d.base;bundle-version="1.0.1"
8-
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
7+
Fragment-Host: org.knime.knip.imagej3d.base;bundle-version="1.1.0"
8+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
99
Eclipse-PlatformFilter: (&(osgi.os=win32)(osgi.arch=x86))

‎org.knime.knip.imagej3d.feature/feature.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<feature
33
id="org.knime.knip.imagej3d.feature"
44
label="KNIME Image Processing - ImageJ 3D Viewer Integration"
5-
version="1.0.1.qualifier"
5+
version="1.1.0.qualifier"
66
provider-name="KNIME / FIJI (http://3dviewer.neurofly.de/)">
77

88
<description>

‎org.knime.knip.imagej3d.update/feature.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<feature
33
id="org.knime.knip.imagej3d.update"
44
label="KNIME Image Processing - ImageJ 3D Viewer Integration"
5-
version="1.0.1.qualifier">
5+
version="1.1.0.qualifier">
66

77
<includes
88
id="org.knime.knip.imagej3d.feature"

0 commit comments

Comments
 (0)