From ce21d50554e622f0c183ea61ba835d27a6d4879e Mon Sep 17 00:00:00 2001
From: kaloyane <kaloyane>
Date: Tue, 15 Feb 2011 09:21:51 +0000
Subject: [PATCH] [LMS-2033] removed get/set Code methods. There is not easy
 way to support them for NewSample/NewExperiment objects in the background.

SVN: 19949
---
 .../registrator/api/v1/impl/Experiment.java   |  5 -----
 .../api/v1/impl/ExperimentImmutable.java      |  5 -----
 .../registrator/api/v1/impl/Sample.java       | 21 +++++++++++--------
 .../api/v1/impl/SampleImmutable.java          |  5 -----
 4 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Experiment.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Experiment.java
index 15f720caef3..b6f31f5c6be 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Experiment.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Experiment.java
@@ -47,11 +47,6 @@ class Experiment extends ExperimentImmutable implements IExperiment
     {
         return false;
     }
-    
-    public void setCode(String code)
-    {
-        getExperiment().setCode(code);
-    }
 
     public void setPropertyValue(String propertyCode, String propertyValue)
     {
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ExperimentImmutable.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ExperimentImmutable.java
index b49cd4ceeea..9a101208e37 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ExperimentImmutable.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ExperimentImmutable.java
@@ -64,11 +64,6 @@ class ExperimentImmutable implements IExperimentImmutable
         return EntityHelper.tryFindPropertyValue(experiment, propertyCode);
     }
 
-    public String getCode()
-    {
-        return experiment.getCode();
-    }
-
     public String getType()
     {
         if (experiment.getExperimentType() != null)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Sample.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Sample.java
index 4c7206be08c..2f035ce2602 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Sample.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Sample.java
@@ -16,8 +16,12 @@
 
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import ch.systemsx.cisd.etlserver.registrator.api.v1.IExperimentImmutable;
 import ch.systemsx.cisd.etlserver.registrator.api.v1.ISample;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IEntityProperty;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SampleType;
 import ch.systemsx.cisd.openbis.generic.shared.util.EntityHelper;
 
@@ -27,29 +31,28 @@ import ch.systemsx.cisd.openbis.generic.shared.util.EntityHelper;
 public class Sample extends SampleImmutable implements ISample
 {
 
+    public Sample(ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample sample)
+    {
+        super(sample);
+    }
+
     public Sample(String sampleIdentifier, String permId)
     {
         super(new ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample());
         getSample().setIdentifier(sampleIdentifier);
         getSample().setPermId(permId);
-    }
 
-    public Sample(ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample sample)
-    {
-        super(sample);
+        List<IEntityProperty> properties = new ArrayList<IEntityProperty>();
+        getSample().setProperties(properties);
     }
 
+
     public void setExperiment(IExperimentImmutable experiment)
     {
         ExperimentImmutable exp = (ExperimentImmutable) experiment;
         getSample().setExperiment(exp.getExperiment());
     }
 
-    public void setCode(String code)
-    {
-        getSample().setCode(code);
-    }
-
     public void setPropertyValue(String propertyCode, String propertyValue)
     {
         EntityHelper.createOrUpdateProperty(getSample(), propertyCode, propertyValue);
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/SampleImmutable.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/SampleImmutable.java
index efdb2918242..b69116947b5 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/SampleImmutable.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/SampleImmutable.java
@@ -45,11 +45,6 @@ public class SampleImmutable implements ISampleImmutable
         return sample.getIdentifier();
     }
 
-    public String getCode()
-    {
-        return sample.getCode();
-    }
-
     public ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample getSample()
     {
         return sample;
-- 
GitLab