Merge pull request #1 from knime-ip/1.0.1

1.0.1
knime-ip · Jul 9, 2014 · f7af380 · f7af380
2 parents b8e83e7 + d88dc12
commit f7af380
Show file tree

Hide file tree

Showing 63 changed files with 126 additions and 183 deletions.
diff --git a/org.knime.knip.imagej3d.base/.classpath b/org.knime.knip.imagej3d.base/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="lib/ij3d_knip_build.jar"/>

diff --git a/org.knime.knip.imagej3d.base/.settings/org.eclipse.jdt.core.prefs b/org.knime.knip.imagej3d.base/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -96,4 +96,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.knime.knip.imagej3d.base/META-INF/MANIFEST.MF b/org.knime.knip.imagej3d.base/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-Name: KNIME ImageJ 3D Viewer Integration
 Bundle-SymbolicName: org.knime.knip.imagej3d.base;singleton:=true
 Bundle-ManifestVersion: 2
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
 Eclipse-RegisterBuddy: org.knime.knip.imagej2.core
 Bundle-Vendor: University of Konstanz / FIJI (http://3dviewer.neurofly.de/)
-Require-Bundle: org.knime.workbench.repository;bundle-version="[2.8.0,3.0.0)",
+Require-Bundle: org.knime.workbench.repository;bundle-version="[2.10.0,3.0.0)",
  org.apache.log4j;bundle-version="1.2.15",
  org.eclipse.core.runtime,
  org.eclipse.ui,
- org.knime.knip.base;bundle-version="[1.1.0,2.0.0)",
- org.knime.knip.core;bundle-version="[1.1.0,2.0.0)",
- org.knime.knip.imagej2.core;bundle-version="[0.8.0,0.9.0)",
- org.knime.core;bundle-version="[2.8.2,3.0.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ org.knime.knip.base;bundle-version="[1.2.0,2.0.0)",
+ org.knime.knip.core;bundle-version="[1.2.0,2.0.0)",
+ org.knime.knip.imagej2.core;bundle-version="[0.9.0,0.10.0)",
+ org.knime.core;bundle-version="[2.10.0,3.0.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ClassPath: .,
  lib/ij3d_knip_build.jar,
  lib/j3dcore.jar,