From a349bc07a466cc88f5445ff5ef3d3add93395dbc Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Fri, 11 Feb 2011 12:45:32 +0000
Subject: [PATCH] LMS-2027 minor: better toString
SVN: 19908
---
.../dss/etl/dto/api/v1/ImageDataSetInformation.java | 7 +++++--
.../dss/etl/dto/api/v1/ImageStorageConfiguraton.java | 4 +++-
.../dss/etl/dto/api/v1/ThumbnailsStorageFormat.java | 4 +++-
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ImageDataSetInformation.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ImageDataSetInformation.java
index 3d51fa509ff..2f54c2e3565 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ImageDataSetInformation.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ImageDataSetInformation.java
@@ -133,8 +133,11 @@ public class ImageDataSetInformation extends BasicDataSetInformation
@Override
public String toString()
{
- return "[ dataset code: " + super.getDataSetCode() + ", tile Rows Number: "
- + tileRowsNumber + ", tile Columns Number: " + tileColumnsNumber + ", channels: "
+ String imgConfig =
+ imageStorageConfiguratonOrNull != null ? ", config = "
+ + imageStorageConfiguratonOrNull.toString() : "";
+ return "[ dataset: " + super.getDataSetCode() + ", tile: " + tileRowsNumber + "x"
+ + tileColumnsNumber + imgConfig + ", channels: "
+ CollectionUtils.abbreviate(channels, -1) + ", images: "
+ CollectionUtils.abbreviate(images, 20);
}
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 7dde8735f4b..5674ac8a276 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
@@ -16,6 +16,8 @@
package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1;
+import ch.systemsx.cisd.common.utilities.AbstractHashable;
+
/**
* Configuration of how images should be stored. By default:
* <UL>
@@ -25,7 +27,7 @@ package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1;
*
* @author Tomasz Pylak
*/
-public class ImageStorageConfiguraton
+public class ImageStorageConfiguraton extends AbstractHashable
{
/** No thumbnails are generated by default. */
private ThumbnailsStorageFormat thumbnailsStorageFormatOrNull = null;
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 990a3b6f4de..e75029fa8ac 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
@@ -16,12 +16,14 @@
package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1;
+import ch.systemsx.cisd.common.utilities.AbstractHashable;
+
/**
* Configuration parameters which describe how thumbnails should be generated.
*
* @author Tomasz Pylak
*/
-public class ThumbnailsStorageFormat
+public class ThumbnailsStorageFormat extends AbstractHashable
{
/** Maximum default width and height of a thumbnail */
public static final int DEFAULT_THUMBNAIL_MAX_SIZE = 200;
--
GitLab