From dfe3e7e5fc1c4c61c83347dac2a09398561fb8d7 Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk>
Date: Tue, 20 Dec 2011 13:45:04 +0000
Subject: [PATCH] LMS-2695 - DSU Downloader Polishing and Release
SVN: 24065
---
.../generic/shared/api/v1/Translator.java | 2 ++
.../generic/shared/api/v1/dto/Sample.java | 24 +++++++++++++++++++
2 files changed, 26 insertions(+)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/Translator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/Translator.java
index c81a21ada3c..30aaf1ed9f8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/Translator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/Translator.java
@@ -106,6 +106,8 @@ public class Translator
{
SampleInitializer initializer = new SampleInitializer();
initializer.setId(privateSample.getId());
+ initializer.setSpaceCode(privateSample.getSpace() != null ? privateSample.getSpace()
+ .getCode() : null);
initializer.setPermId(privateSample.getPermId());
initializer.setCode(privateSample.getCode());
initializer.setIdentifier(privateSample.getIdentifier());
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Sample.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Sample.java
index 7e7022768b1..d2738aefdfa 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Sample.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Sample.java
@@ -51,6 +51,8 @@ public final class Sample implements Serializable, IIdentifierHolder
{
private Long id;
+ private String spaceCode;
+
private String permId;
private String code;
@@ -77,6 +79,16 @@ public final class Sample implements Serializable, IIdentifierHolder
return id;
}
+ public void setSpaceCode(String spaceCode)
+ {
+ this.spaceCode = spaceCode;
+ }
+
+ public String getSpaceCode()
+ {
+ return spaceCode;
+ }
+
public void setPermId(String permId)
{
this.permId = permId;
@@ -160,6 +172,8 @@ public final class Sample implements Serializable, IIdentifierHolder
private Long id;
+ private String spaceCode;
+
private String permId;
private String code;
@@ -186,6 +200,8 @@ public final class Sample implements Serializable, IIdentifierHolder
InitializingChecks.checkValidLong(initializer.getId(), "Unspecified id.");
this.id = initializer.getId();
+ this.spaceCode = initializer.getSpaceCode();
+
InitializingChecks.checkValidString(initializer.getPermId(), "Unspecified permanent id.");
this.permId = initializer.getPermId();
@@ -221,6 +237,14 @@ public final class Sample implements Serializable, IIdentifierHolder
return id;
}
+ /**
+ * Returns the space code.
+ */
+ public String getSpaceCode()
+ {
+ return spaceCode;
+ }
+
/**
* Returns the sample permanent id.
*/
--
GitLab