From 72a1a335ca0e86285781e14ec85536d2896e8857 Mon Sep 17 00:00:00 2001
From: kaloyane <kaloyane>
Date: Wed, 14 Sep 2011 13:07:48 +0000
Subject: [PATCH] [LMS-2500] add type to WellMetadata
SVN: 22953
---
.../screening/server/logic/ScreeningApiImpl.java | 3 ++-
.../screening/shared/api/v1/dto/WellMetadata.java | 10 +++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/ScreeningApiImpl.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/ScreeningApiImpl.java
index e512050f5d8..c170eb24cb9 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/ScreeningApiImpl.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/ScreeningApiImpl.java
@@ -926,7 +926,8 @@ public class ScreeningApiImpl
Map<String, String> properties = EntityHelper.convertToStringMap(well.getProperties());
Map<String, Material> materialProperties =
convertMaterialProperties(well.getProperties(), materialsCache);
- return new WellMetadata(plateIdentifier, well.getCode(), well.getPermId(), wellPosition,
+ return new WellMetadata(plateIdentifier, well.getCode(), well.getPermId(), well
+ .getSampleType().getCode(), wellPosition,
properties, materialProperties);
}
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/WellMetadata.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/WellMetadata.java
index d25923affbe..dfea45ff1d8 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/WellMetadata.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/WellMetadata.java
@@ -32,16 +32,19 @@ public class WellMetadata extends WellIdentifier
private final String code;
+ private final String type;
+
private final Map<String, String> properties;
private final Map<String, Material> materialProperties;
- public WellMetadata(PlateIdentifier plateIdentifier, String code, String permId,
+ public WellMetadata(PlateIdentifier plateIdentifier, String code, String permId, String type,
WellPosition wellPosition, Map<String, String> properties,
Map<String, Material> materialProperties)
{
super(plateIdentifier, wellPosition, permId);
this.code = code;
+ this.type = type;
this.properties = new HashMap<String, String>(properties);
this.materialProperties = new HashMap<String, Material>(materialProperties);
}
@@ -106,4 +109,9 @@ public class WellMetadata extends WellIdentifier
return true;
}
+ public String getType()
+ {
+ return type;
+ }
+
}
--
GitLab