From 7bcc3446f1502e50cf2d9b493f45c605b269fcc0 Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Wed, 5 Dec 2012 13:29:48 +0000
Subject: [PATCH] SP-416 BIS-270 Fix the problem with backwards compatibility
of v1 enums
SVN: 27871
---
.../cisd/openbis/dss/etl/dto/api/Channel.java | 16 ----
.../etl/dto/api/SimpleImageDataConfig.java | 4 +-
.../dto/api/impl/ImageDataSetStructure.java | 5 +-
.../dto/api/v1/BasicDataSetInformation.java | 2 +
.../openbis/dss/etl/dto/api/v1/Channel.java | 7 +-
.../dss/etl/dto/api/v1/ChannelColor.java | 91 +++++--------------
.../etl/dto/api/v1/ChannelColorComponent.java | 65 +++++--------
.../dss/etl/dto/api/v1/ChannelColorRGB.java | 2 +
.../dss/etl/dto/api/v1/ImageFileInfo.java | 2 +
.../dss/etl/dto/api/v1/ImageIdentifier.java | 2 +
.../dss/etl/dto/api/v1/ImageMetadata.java | 2 +
.../dto/api/v1/ImageStorageConfiguraton.java | 2 +
.../dss/etl/dto/api/v1/IntensityRange.java | 2 +
.../openbis/dss/etl/dto/api/v1/Location.java | 2 +
.../v1/SimpleImageContainerDataConfig.java | 2 +
.../etl/dto/api/v1/SimpleImageDataConfig.java | 2 +
.../api/v1/SimpleOverviewImageDataConfig.java | 2 +
.../dto/api/v1/ThumbnailsStorageFormat.java | 2 +
18 files changed, 71 insertions(+), 141 deletions(-)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/Channel.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/Channel.java
index 8a8465b4cff..c760f44d67a 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/Channel.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/Channel.java
@@ -49,15 +49,6 @@ public class Channel extends AbstractHashable implements Serializable
this(code, label, convertColor(channelColorOrNull));
}
- /**
- * Version of method for v1 channel color to keep backwards compatibility
- */
- public Channel(String code, String label,
- ch.systemsx.cisd.openbis.dss.etl.dto.api.v1.ChannelColor channelColorOrNull)
- {
- this(code, label, channelColorOrNull.getIndependentChannelColor());
- }
-
/**
* Constructs a channel with a specified code and label. The channel will be presented in a
* specified color.
@@ -156,13 +147,6 @@ public class Channel extends AbstractHashable implements Serializable
this.channelColorOrNull = convertColor(channelColor);
}
- /** version of method for v1 ChannelColor kept for backwards compatibility */
- public void setChannelColor(
- ch.systemsx.cisd.openbis.dss.etl.dto.api.v1.ChannelColor channelColor)
- {
- setChannelColor(channelColor.getIndependentChannelColor());
- }
-
/** Sets RGB color in which this channel will be displayed. */
public void setChannelColorRGB(ChannelColorRGB channelColor)
{
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/SimpleImageDataConfig.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/SimpleImageDataConfig.java
index f37ad01d1a8..e39c0e858bf 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/SimpleImageDataConfig.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/SimpleImageDataConfig.java
@@ -398,9 +398,7 @@ abstract public class SimpleImageDataConfig
List<ChannelColorComponent> channelColorComponents)
{
this.channels = channels;
- channelColorComponentsOrNull =
- ch.systemsx.cisd.openbis.dss.etl.dto.api.v1.ChannelColorComponent
- .convertToIndependentChannelColorList(channelColorComponents);
+ channelColorComponentsOrNull = channelColorComponents;
}
/** should thumbnails be generated? False by default. */
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/impl/ImageDataSetStructure.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/impl/ImageDataSetStructure.java
index d9a2e08f15f..60ffcebb1f8 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/impl/ImageDataSetStructure.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/impl/ImageDataSetStructure.java
@@ -124,10 +124,7 @@ public class ImageDataSetStructure implements Serializable
}
this.channels = channels;
- // potentially necessary conversion of v1 ChanelColorComponent
- this.channelColorComponentsOrNull =
- ch.systemsx.cisd.openbis.dss.etl.dto.api.v1.ChannelColorComponent
- .convertToIndependentChannelColorList(channelColorComponents);
+ this.channelColorComponentsOrNull = channelColorComponents;
}
/**
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/BasicDataSetInformation.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/BasicDataSetInformation.java
index a25f0eae3e3..40143ec0ddb 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/BasicDataSetInformation.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/BasicDataSetInformation.java
@@ -21,7 +21,9 @@ package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1;
* {@link ch.systemsx.cisd.openbis.dss.etl.dto.api.BasicDataSetInformation} instead
*
* @author Jakub Straszewski
+ * @deprecated
*/
+@Deprecated
public class BasicDataSetInformation extends
ch.systemsx.cisd.openbis.dss.etl.dto.api.BasicDataSetInformation
{
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/Channel.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/Channel.java
index 2e5551425c1..3ba4f54012a 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/Channel.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/Channel.java
@@ -7,7 +7,9 @@ import ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColorRGB;
* {@link ch.systemsx.cisd.openbis.dss.etl.dto.api.Channel} instead
*
* @author Jakub Straszewski
+ * @deprecated
*/
+@Deprecated
public final class Channel extends ch.systemsx.cisd.openbis.dss.etl.dto.api.Channel
{
private static final long serialVersionUID = 1L;
@@ -18,11 +20,6 @@ public final class Channel extends ch.systemsx.cisd.openbis.dss.etl.dto.api.Chan
super(code, label, channelColorOrNull);
}
- public Channel(String code, String label, ChannelColor channelColorOrNull)
- {
- super(code, label, channelColorOrNull);
- }
-
public Channel(String code, String label, ChannelColorRGB channelColorOrNull)
{
super(code, label, channelColorOrNull);
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ChannelColor.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ChannelColor.java
index e1fbb8b140f..5ea5865cfb9 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ChannelColor.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ChannelColor.java
@@ -5,89 +5,42 @@ package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1;
* {@link ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColor} instead
*
* @author Jakub Straszewski
+ * @deprecated
*/
-public enum ChannelColor
+@Deprecated
+public class ChannelColor
{
- BLUE(0), GREEN(1), RED(2), RED_GREEN(3), RED_BLUE(4), GREEN_BLUE(5);
+ public static ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColor BLUE =
+ ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColor.BLUE;
- private static final int MAX_COLOR = calcMaxColorIndex();
+ public static ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColor GREEN =
+ ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColor.GREEN;
- // If no mapping between channels and colors has been provided then channels get consecutive
- // colors. This field determines the order in which colors are assigned.
- // It is important for backward compatibility as well.
- private final int orderIndex;
+ public static ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColor RED =
+ ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColor.RED;
- private ChannelColor(int orderIndex)
- {
- this.orderIndex = orderIndex;
- }
+ public static ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColor RED_GREEN =
+ ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColor.RED_GREEN;
- private static int calcMaxColorIndex()
- {
- int max = 0;
- for (ChannelColor color : values())
- {
- max = Math.max(max, color.getColorOrderIndex());
- }
- return max;
- }
+ public static ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColor RED_BLUE =
+ ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColor.RED_BLUE;
- public int getColorOrderIndex()
- {
- return orderIndex;
- }
+ public static ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColor GREEN_BLUE =
+ ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColor.GREEN_BLUE;
- public static ChannelColor createFromIndex(int colorIndex)
+ public static ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColor createFromIndex(
+ int colorIndex)
{
- for (ChannelColor color : values())
- {
- if (color.getColorOrderIndex() == colorIndex % (MAX_COLOR + 1))
- {
- return color;
- }
- }
- throw new IllegalStateException("Invalid color index: " + colorIndex + "!");
+ return ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColor.createFromIndex(colorIndex);
}
- public ChannelColorRGB getRGB()
+ public static ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColor valueOf(String item)
{
- switch (this)
- {
- case RED:
- return new ChannelColorRGB(255, 0, 0);
- case GREEN:
- return new ChannelColorRGB(0, 255, 0);
- case BLUE:
- return new ChannelColorRGB(0, 0, 255);
- case RED_GREEN:
- return new ChannelColorRGB(255, 255, 0);
- case GREEN_BLUE:
- return new ChannelColorRGB(0, 255, 255);
- case RED_BLUE:
- return new ChannelColorRGB(255, 0, 255);
- default:
- throw new IllegalStateException("unhandled enum " + this);
- }
+ return ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColor.valueOf(item);
}
- public ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColor getIndependentChannelColor()
+ public static ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColor[] values()
{
- switch (this)
- {
- case RED:
- return ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColor.RED;
- case GREEN:
- return ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColor.GREEN;
- case BLUE:
- return ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColor.BLUE;
- case RED_GREEN:
- return ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColor.RED_GREEN;
- case GREEN_BLUE:
- return ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColor.GREEN_BLUE;
- case RED_BLUE:
- return ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColor.RED_BLUE;
- default:
- throw new IllegalStateException("unhandled enum " + this);
- }
+ return ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColor.values();
}
}
\ No newline at end of file
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ChannelColorComponent.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ChannelColorComponent.java
index f5356ea7cdc..708e207f77e 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ChannelColorComponent.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ChannelColorComponent.java
@@ -16,9 +16,6 @@
package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1;
-import java.util.LinkedList;
-import java.util.List;
-
import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.ColorComponent;
/**
@@ -26,57 +23,36 @@ import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.Color
* {@link ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColorComponent} instead
*
* @author Jakub Straszewski
+ * @deprecated
*/
-public enum ChannelColorComponent
+@Deprecated
+public final class ChannelColorComponent
{
- RED, GREEN, BLUE;
+ public static ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColorComponent RED =
+ ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColorComponent.RED;
+
+ public static ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColorComponent GREEN =
+ ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColorComponent.GREEN;
- public ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColorComponent getIndependentChannelColorComponent()
+ public static ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColorComponent BLUE =
+ ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColorComponent.BLUE;
+
+ private ChannelColorComponent()
{
- switch (this)
- {
- case BLUE:
- return ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColorComponent.BLUE;
- case GREEN:
- return ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColorComponent.GREEN;
- case RED:
- return ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColorComponent.RED;
- }
- return null;
}
- /**
- * Gets the list of enums which are either of this type or of the version independent
- * CahnnelColorComponent. Returns the list of the independent type
- */
- public static List<ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColorComponent> convertToIndependentChannelColorList(
- List<?> inputList)
+ public static ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColorComponent valueOf(String item)
{
- if (inputList == null)
- {
- return null;
- }
+ return ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColorComponent.valueOf(item);
+ }
- List<ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColorComponent> results =
- new LinkedList<ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColorComponent>();
- for (Object o : inputList)
- {
- if (o instanceof ChannelColorComponent)
- {
- results.add(((ChannelColorComponent) o).getIndependentChannelColorComponent());
- } else if (o instanceof ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColorComponent)
- {
- results.add((ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColorComponent) o);
- } else
- {
- throw new IllegalArgumentException(
- "List items must be of one of ChannelColorComponent types.");
- }
- }
- return results;
+ public static ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColorComponent[] values()
+ {
+ return ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColorComponent.values();
}
- public static ColorComponent getColorComponent(ChannelColorComponent channelColorComponent)
+ public static ColorComponent getColorComponent(
+ ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColorComponent channelColorComponent)
{
switch (channelColorComponent)
{
@@ -87,6 +63,7 @@ public enum ChannelColorComponent
case RED:
return ColorComponent.RED;
}
+
return null;
}
}
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ChannelColorRGB.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ChannelColorRGB.java
index cdb75551fb0..200d16c1466 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ChannelColorRGB.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ChannelColorRGB.java
@@ -21,7 +21,9 @@ package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1;
* {@link ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColorRGB} instead
*
* @author Jakub Straszewski
+ * @deprecated
*/
+@Deprecated
public class ChannelColorRGB extends ch.systemsx.cisd.openbis.dss.etl.dto.api.ChannelColorRGB
{
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ImageFileInfo.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ImageFileInfo.java
index db8cc9b0fd4..61d770b5533 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ImageFileInfo.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ImageFileInfo.java
@@ -5,7 +5,9 @@ package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1;
* {@link ch.systemsx.cisd.openbis.dss.etl.dto.api.ImageFileInfo} instead
*
* @author Jakub Straszewski
+ * @deprecated
*/
+@Deprecated
public final class ImageFileInfo extends ch.systemsx.cisd.openbis.dss.etl.dto.api.ImageFileInfo
{
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ImageIdentifier.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ImageIdentifier.java
index b11302b2353..b0ea4403f29 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ImageIdentifier.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ImageIdentifier.java
@@ -21,7 +21,9 @@ package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1;
* {@link ch.systemsx.cisd.openbis.dss.etl.dto.api.ImageIdentifier} instead
*
* @author Jakub Straszewski
+ * @deprecated
*/
+@Deprecated
public class ImageIdentifier extends ch.systemsx.cisd.openbis.dss.etl.dto.api.ImageIdentifier
{
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ImageMetadata.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ImageMetadata.java
index 54089767f9f..3bb73504e5a 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ImageMetadata.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ImageMetadata.java
@@ -5,7 +5,9 @@ package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1;
* {@link ch.systemsx.cisd.openbis.dss.etl.dto.api.ImageMetadata} instead
*
* @author Jakub Straszewski
+ * @deprecated
*/
+@Deprecated
public class ImageMetadata extends ch.systemsx.cisd.openbis.dss.etl.dto.api.ImageMetadata
{
}
\ No newline at end of file
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ImageStorageConfiguraton.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ImageStorageConfiguraton.java
index ffc0ddf3cae..e1db40ea2c6 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ImageStorageConfiguraton.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ImageStorageConfiguraton.java
@@ -21,7 +21,9 @@ package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1;
* {@link ch.systemsx.cisd.openbis.dss.etl.dto.api.ImageStorageConfiguraton} instead
*
* @author Jakub Straszewski
+ * @deprecated
*/
+@Deprecated
public class ImageStorageConfiguraton extends
ch.systemsx.cisd.openbis.dss.etl.dto.api.ImageStorageConfiguraton
{
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/IntensityRange.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/IntensityRange.java
index 213361f4a46..fccf62d9bdd 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/IntensityRange.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/IntensityRange.java
@@ -21,7 +21,9 @@ package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1;
* {@link ch.systemsx.cisd.openbis.dss.etl.dto.api.IntensityRange} instead
*
* @author Jakub Straszewski
+ * @deprecated
*/
+@Deprecated
public class IntensityRange extends ch.systemsx.cisd.openbis.dss.etl.dto.api.IntensityRange
{
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/Location.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/Location.java
index 4b764d6da1c..2b11daaf110 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/Location.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/Location.java
@@ -5,7 +5,9 @@ package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1;
* {@link ch.systemsx.cisd.openbis.dss.etl.dto.api.Location} instead
*
* @author Jakub Straszewski
+ * @deprecated
*/
+@Deprecated
public class Location extends ch.systemsx.cisd.openbis.dss.etl.dto.api.Location
{
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/SimpleImageContainerDataConfig.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/SimpleImageContainerDataConfig.java
index 18d40e6fe88..20563d3dd16 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/SimpleImageContainerDataConfig.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/SimpleImageContainerDataConfig.java
@@ -21,7 +21,9 @@ package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1;
* {@link ch.systemsx.cisd.openbis.dss.etl.dto.api.SimpleImageContainerDataConfig} instead
*
* @author Jakub Straszewski
+ * @deprecated
*/
+@Deprecated
public class SimpleImageContainerDataConfig extends
ch.systemsx.cisd.openbis.dss.etl.dto.api.SimpleImageContainerDataConfig
{
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 21131836b6a..3d249e4fb77 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
@@ -21,7 +21,9 @@ package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1;
* {@link ch.systemsx.cisd.openbis.dss.etl.dto.api.SimpleImageDataConfig} instead
*
* @author Jakub Straszewski
+ * @deprecated
*/
+@Deprecated
abstract public class SimpleImageDataConfig extends
ch.systemsx.cisd.openbis.dss.etl.dto.api.SimpleImageDataConfig
{
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/SimpleOverviewImageDataConfig.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/SimpleOverviewImageDataConfig.java
index f6d3a3f9db5..f9fa87c3bb7 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/SimpleOverviewImageDataConfig.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/SimpleOverviewImageDataConfig.java
@@ -21,7 +21,9 @@ package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1;
* {@link ch.systemsx.cisd.openbis.dss.etl.dto.api.SimpleOverviewImageDataConfig} instead
*
* @author Jakub Straszewski
+ * @deprecated
*/
+@Deprecated
public class SimpleOverviewImageDataConfig extends
ch.systemsx.cisd.openbis.dss.etl.dto.api.SimpleOverviewImageDataConfig
{
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ThumbnailsStorageFormat.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ThumbnailsStorageFormat.java
index 53e40f03611..d0e51b6089d 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ThumbnailsStorageFormat.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ThumbnailsStorageFormat.java
@@ -21,7 +21,9 @@ package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1;
* {@link ch.systemsx.cisd.openbis.dss.etl.dto.api.ThumbnailsStorageFormat} instead
*
* @author Jakub Straszewski
+ * @deprecated
*/
+@Deprecated
public class ThumbnailsStorageFormat extends
ch.systemsx.cisd.openbis.dss.etl.dto.api.ThumbnailsStorageFormat
{
--
GitLab