Merge pull request #9 from clemensvonschwerin/enh/AP-7241-improved-python-integration

Using new typeextension plugin as dependency, removed python2 extensi…

Author: dietzc

org.knime.knip.knimepython/META-INF/MANIFEST.MF

@@ -11,7 +11,6 @@ Require-Bundle: org.knime.base;bundle-version="2.11.0",
  org.eclipse.core.runtime,
  org.eclipse.ui,
  org.knime.knip.base;bundle-version="[1.0.1,2.0.0)",
- org.knime.python;bundle-version="3.0.0",
  org.knime.knip.core;bundle-version="[1.0.1,2.0.0)",
  org.knime.knip.io;bundle-version="[1.2.0,2.0.0)",
  imglib2;bundle-version="2.2.0",
@@ -20,8 +19,7 @@ Require-Bundle: org.knime.base;bundle-version="2.11.0",
  scijava-common;bundle-version="2.37.0",
  imagej-common;bundle-version="0.12.1",
  scifio-bf-compat;bundle-version="1.11.0",
- org.knime.python.nodes;bundle-version="3.0.0",
- org.knime.python2;bundle-version="3.4.0"
+ org.knime.python.typeextensions;bundle-version="3.4.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: .
 Export-Package: org.knime.knip.knimepython

org.knime.knip.knimepython/src/org/knime/knip/knimepython/ImgPlusDeserializer.java

@@ -5,21 +5,10 @@
 import org.knime.core.data.DataCell;
 import org.knime.core.data.filestore.FileStoreFactory;
 import org.knime.knip.base.data.img.ImgPlusCell;
-import org.knime.knip.base.data.img.ImgPlusCellFactory;
-import org.knime.knip.io.ScifioGateway;
 import org.knime.knip.serialization.BytesToImgPlusConvertor;
 import org.knime.python.typeextension.Deserializer;
 import org.knime.python.typeextension.DeserializerFactory;
 
-import io.scif.Format;
-import io.scif.FormatException;
-import io.scif.Metadata;
-import io.scif.Parser;
-import io.scif.Reader;
-import io.scif.config.SCIFIOConfig;
-import io.scif.img.ImgOpener;
-import io.scif.io.RandomAccessInputStream;
-import net.imagej.ImgPlus;
 
 /**
  * Deserializer using the extension points in org.knime.python.

org.knime.knip.knimepython/src/org/knime/knip/knimepython/ImgPlusSerializer.java

@@ -1,33 +1,12 @@
 package org.knime.knip.knimepython;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 
 import org.knime.knip.base.data.img.ImgPlusValue;
-import org.knime.knip.io.ScifioGateway;
 import org.knime.knip.serialization.ImgPlusToBytesConvertor;
 import org.knime.python.typeextension.Serializer;
 import org.knime.python.typeextension.SerializerFactory;
 
-import io.scif.DefaultImageMetadata;
-import io.scif.DefaultMetadata;
-import io.scif.FormatException;
-import io.scif.ImageMetadata;
-import io.scif.Metadata;
-import io.scif.Translator;
-import io.scif.Writer;
-import io.scif.config.SCIFIOConfig;
-import io.scif.img.ImgIOException;
-import io.scif.img.ImgSaver;
-import io.scif.img.SCIFIOImgPlus;
-import io.scif.io.ByteArrayHandle;
-import io.scif.io.RandomAccessOutputStream;
-import net.imagej.ImgPlus;
-import net.imagej.axis.Axes;
-import net.imagej.axis.CalibratedAxis;
-
 /**
  * Serializer using the extension points in org.knime.python.
  *