From 6b950024dd5ccb3ca9022a0db0f5da9cc815f3bb Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Fri, 9 Sep 2011 12:23:31 +0000
Subject: [PATCH] LMS-2502 minor refactoring
SVN: 22852
---
.../shared/imaging/dataaccess/ImgChannelDTO.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/imaging/dataaccess/ImgChannelDTO.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/imaging/dataaccess/ImgChannelDTO.java
index 3393eabfa40..ff2d9e6a57a 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/imaging/dataaccess/ImgChannelDTO.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/imaging/dataaccess/ImgChannelDTO.java
@@ -18,6 +18,7 @@ package ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess;
import net.lemnik.eodsql.ResultColumn;
+import ch.systemsx.cisd.openbis.generic.shared.basic.CodeNormalizer;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.ImageChannelColor;
/**
@@ -25,12 +26,12 @@ import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.ImageChannelCo
*/
public class ImgChannelDTO extends AbstractImageTransformerFactoryHolder
{
- @ResultColumn("LABEL")
- private String label;
-
@ResultColumn("CODE")
private String code;
+ @ResultColumn("LABEL")
+ private String label;
+
@ResultColumn("DESCRIPTION")
private String descriptionOrNull;
@@ -49,7 +50,7 @@ public class ImgChannelDTO extends AbstractImageTransformerFactoryHolder
@ResultColumn("COLOR")
private String channelColor;
- // GWT only
+ // EODSQL only
@SuppressWarnings("unused")
private ImgChannelDTO()
{
@@ -62,7 +63,7 @@ public class ImgChannelDTO extends AbstractImageTransformerFactoryHolder
{
assert (datasetIdOrNull == null && experimentIdOrNull != null)
|| (datasetIdOrNull != null && experimentIdOrNull == null);
- this.code = code.toUpperCase();
+ this.code = CodeNormalizer.normalize(code);
this.label = label;
this.descriptionOrNull = descriptionOrNull;
this.wavelengthOrNull = wavelengthOrNull;
--
GitLab