From 16eed21e9b7b531edc2fd30e8f1c90dfdf7d28ee Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Wed, 13 Apr 2011 10:12:27 +0000
Subject: [PATCH] move convert transformation to the api package
SVN: 20870
---
.../dss/etl/dto/api/v1/SimpleImageDataConfig.java | 2 +-
.../ConvertToolImageTransformer.java | 13 ++++++++-----
.../ConvertToolImageTransformerFactory.java | 2 +-
.../ConvertToolImageTransformerTest.java | 3 ++-
4 files changed, 12 insertions(+), 8 deletions(-)
rename screening/source/java/ch/systemsx/cisd/openbis/dss/etl/{biozentrum => dto/api/v1/transformations}/ConvertToolImageTransformer.java (94%)
rename screening/source/java/ch/systemsx/cisd/openbis/dss/etl/{biozentrum => dto/api/v1/transformations}/ConvertToolImageTransformerFactory.java (95%)
rename screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/{biozentrum => dto/api/v1/transformations}/ConvertToolImageTransformerTest.java (93%)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/SimpleImageDataConfig.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/SimpleImageDataConfig.java
index d866e4ad55e..652d701eb65 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/SimpleImageDataConfig.java
+++ b/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;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/biozentrum/ConvertToolImageTransformer.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformer.java
similarity index 94%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/etl/biozentrum/ConvertToolImageTransformer.java
rename to screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformer.java
index 13c8788752a..2e2f06ab6ca 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/biozentrum/ConvertToolImageTransformer.java
+++ b/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();
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/biozentrum/ConvertToolImageTransformerFactory.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformerFactory.java
similarity index 95%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/etl/biozentrum/ConvertToolImageTransformerFactory.java
rename to screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformerFactory.java
index 8c2591ee481..8bcfeebb62b 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/biozentrum/ConvertToolImageTransformerFactory.java
+++ b/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;
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/biozentrum/ConvertToolImageTransformerTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformerTest.java
similarity index 93%
rename from screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/biozentrum/ConvertToolImageTransformerTest.java
rename to screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformerTest.java
index 17a195b270d..2ad39708e83 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/biozentrum/ConvertToolImageTransformerTest.java
+++ b/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;
/**
--
GitLab