From 139982e71adf01167c081b559baeafec2d0eceb5 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 5 Dec 2012 08:16:21 +0000
Subject: [PATCH] bug fixed: ConvertToolImageTransformer classes got a
 JsonObject annotation instead of ConvertToolImageTransformerFactory classes.

SVN: 27863
---
 .../dto/api/transformations/ConvertToolImageTransformer.java   | 2 --
 .../transformations/ConvertToolImageTransformerFactory.java    | 2 ++
 .../api/v1/transformations/ConvertToolImageTransformer.java    | 2 --
 .../v1/transformations/ConvertToolImageTransformerFactory.java | 3 +++
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/transformations/ConvertToolImageTransformer.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/transformations/ConvertToolImageTransformer.java
index 2e4d7a056c7..9c061da8410 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/transformations/ConvertToolImageTransformer.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/transformations/ConvertToolImageTransformer.java
@@ -32,7 +32,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.log4j.Logger;
 
-import ch.systemsx.cisd.base.annotation.JsonObject;
 import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
 import ch.systemsx.cisd.base.image.IStreamingImageTransformer;
 import ch.systemsx.cisd.base.utilities.OSUtilities;
@@ -56,7 +55,6 @@ import ch.systemsx.cisd.openbis.dss.generic.shared.utils.ImageUtil;
  * 
  * @author Kaloyan Enimanev
  */
-@JsonObject(value="ConvertToolImageTransformer")
 public class ConvertToolImageTransformer implements IStreamingImageTransformer
 {
 
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/transformations/ConvertToolImageTransformerFactory.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/transformations/ConvertToolImageTransformerFactory.java
index df3e6e75f22..126ad24c568 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/transformations/ConvertToolImageTransformerFactory.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/transformations/ConvertToolImageTransformerFactory.java
@@ -16,6 +16,7 @@
 
 package ch.systemsx.cisd.openbis.dss.etl.dto.api.transformations;
 
+import ch.systemsx.cisd.base.annotation.JsonObject;
 import ch.systemsx.cisd.base.image.IStreamingImageTransformerFactory;
 
 /**
@@ -28,6 +29,7 @@ import ch.systemsx.cisd.base.image.IStreamingImageTransformerFactory;
  * 
  * @author Kaloyan Enimanev
  */
+@JsonObject(value="ConvertToolImageTransformerFactory")
 public class ConvertToolImageTransformerFactory implements IStreamingImageTransformerFactory
 {
     private static final long serialVersionUID = 1L;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformer.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformer.java
index 7889caaf29f..51e8ca6a3ae 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformer.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformer.java
@@ -16,7 +16,6 @@
 
 package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1.transformations;
 
-import ch.systemsx.cisd.base.annotation.JsonObject;
 import ch.systemsx.cisd.openbis.dss.etl.dto.api.transformations.ConvertToolImageTransformerFactory.ToolChoice;
 
 /**
@@ -26,7 +25,6 @@ import ch.systemsx.cisd.openbis.dss.etl.dto.api.transformations.ConvertToolImage
  * 
  * @author Jakub Straszewski
  */
-@JsonObject(value="ConvertToolImageTransformer_obsolete")
 public class ConvertToolImageTransformer extends
         ch.systemsx.cisd.openbis.dss.etl.dto.api.transformations.ConvertToolImageTransformer
 {
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformerFactory.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformerFactory.java
index 9b63be17052..7bd9e8cef0c 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformerFactory.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformerFactory.java
@@ -16,6 +16,8 @@
 
 package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1.transformations;
 
+import ch.systemsx.cisd.base.annotation.JsonObject;
+
 /**
  * This class is obsolete, and should not be used. Use
  * {@link ch.systemsx.cisd.openbis.dss.etl.dto.api.transformations.ConvertToolImageTransformerFactory}
@@ -23,6 +25,7 @@ package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1.transformations;
  * 
  * @author Jakub Straszewski
  */
+@JsonObject(value="ConvertToolImageTransformerFactory_obsolete")
 public class ConvertToolImageTransformerFactory extends
         ch.systemsx.cisd.openbis.dss.etl.dto.api.transformations.ConvertToolImageTransformerFactory
 {
-- 
GitLab