From e7ffc2ca576fecafabebcd2ed83d21ac8d53f36e Mon Sep 17 00:00:00 2001
From: gpawel <gpawel>
Date: Fri, 2 Sep 2011 09:40:05 +0000
Subject: [PATCH] LMS-2494 Flexible import/upload: when space identifier is
requested and there is no '/' at the beginning, it is assumed that space is
in the home db instance
SVN: 22769
---
.../generic/shared/basic/dto/NewSample.java | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewSample.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewSample.java
index c48c16415c5..4e340782315 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewSample.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewSample.java
@@ -118,14 +118,14 @@ public class NewSample extends Identifier<NewSample> implements Comparable<NewSa
}
public NewSample(final String identifier, SampleType sampleType, String containerIdentifier,
- String[] parentsOrNull, String experimentIdentifier, String spaceCode,
+ String[] parentsOrNull, String experimentIdentifier, String defaultSpaceIdentifier,
String defaultContainerIdentifier, IEntityProperty[] properties,
List<NewAttachment> attachments)
{
this(identifier, sampleType, containerIdentifier);
this.parentsOrNull = parentsOrNull;
this.experimentIdentifier = experimentIdentifier;
- this.defaultSpaceIdentifier = spaceCode;
+ this.setDefaultSpaceIdentifier(defaultSpaceIdentifier);
this.defaultContainerIdentifier = defaultContainerIdentifier;
this.properties = properties;
this.attachments = attachments;
@@ -241,9 +241,15 @@ public class NewSample extends Identifier<NewSample> implements Comparable<NewSa
}
@BeanProperty(label = SPACE, optional = true)
- public void setDefaultSpaceIdentifier(String spaceIdentifier)
+ public void setDefaultSpaceIdentifier(String defaultSpaceIdentifier)
{
- this.defaultSpaceIdentifier = spaceIdentifier;
+ if (StringUtils.isBlank(defaultSpaceIdentifier) || defaultSpaceIdentifier.contains("/"))
+ {
+ this.defaultSpaceIdentifier = defaultSpaceIdentifier;
+ } else
+ {
+ this.defaultSpaceIdentifier = "/" + defaultSpaceIdentifier;
+ }
}
public final IEntityProperty[] getProperties()
--
GitLab