move convert transformation to the api package

SVN: 20870

screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/SimpleImageDataConfig.java

@@ -20,7 +20,7 @@ import java.util.List;
 
 import ch.systemsx.cisd.base.image.IImageTransformerFactory;
 import ch.systemsx.cisd.common.shared.basic.utils.StringUtils;
-import ch.systemsx.cisd.openbis.dss.etl.biozentrum.ConvertToolImageTransformerFactory;
+import ch.systemsx.cisd.openbis.dss.etl.dto.api.v1.transformations.ConvertToolImageTransformerFactory;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.Geometry;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.ScreeningConstants;
 

screening/source/java/ch/systemsx/cisd/openbis/dss/etl/biozentrum/ConvertToolImageTransformer.java → screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.dss.etl.biozentrum;
+package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1.transformations;
 
 import java.awt.image.BufferedImage;
 import java.io.BufferedReader;
@@ -50,6 +50,9 @@ import ch.systemsx.cisd.imagereaders.ImageReaderFactory;
 
 /**
  * An {@link IImageTransformer} using the convert command line tool for transformations.
+ * <p>
+ * Warning: The serialized version of this class can be stored in the database for each image.
+ * Moving this class to a different package would make all the saved transformations invalid.
  * 
  * @author Kaloyan Enimanev
  */
@@ -113,7 +116,7 @@ public class ConvertToolImageTransformer implements IImageTransformer
         final ByteArrayOutputStream bos = new ByteArrayOutputStream();
         final List<String> errorLines = new ArrayList<String>();
         ProcessIOStrategy customIOStrategy = createCustomProcessIOStrategy(input, bos, errorLines);
-        
+
         ProcessResult result =
                 ProcessExecutionHelper.run(getCommandLine(), operationLog, machineLog,
                         ConcurrencyUtilities.NO_TIMEOUT, customIOStrategy, false);
@@ -137,9 +140,9 @@ public class ConvertToolImageTransformer implements IImageTransformer
     {
         return ProcessIOStrategy.createCustom(new IProcessIOHandler()
             {
-                
-                public void handle(AtomicBoolean processRunning, OutputStream stdin, InputStream stdout,
-                        InputStream stderr) throws IOException
+
+                public void handle(AtomicBoolean processRunning, OutputStream stdin,
+                        InputStream stdout, InputStream stderr) throws IOException
                 {
                     stdin.write(input);
                     stdin.flush();

screening/source/java/ch/systemsx/cisd/openbis/dss/etl/biozentrum/ConvertToolImageTransformerFactory.java → screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformerFactory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.dss.etl.biozentrum;
+package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1.transformations;
 
 import ch.systemsx.cisd.base.image.IImageTransformer;
 import ch.systemsx.cisd.base.image.IImageTransformerFactory;

screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/biozentrum/ConvertToolImageTransformerTest.java → screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformerTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.dss.etl.biozentrum;
+package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1.transformations;
 
 import java.awt.image.BufferedImage;
 import java.io.File;
@@ -23,6 +23,7 @@ import org.testng.AssertJUnit;
 import org.testng.annotations.Test;
 
 import ch.systemsx.cisd.base.image.IImageTransformer;
+import ch.systemsx.cisd.openbis.dss.etl.dto.api.v1.transformations.ConvertToolImageTransformerFactory;
 import ch.systemsx.cisd.openbis.dss.generic.shared.utils.ImageUtil;
 
 /**