Skip to content
Snippets Groups Projects
Commit 95f4a293 authored by felmer's avatar felmer
Browse files

SP-367, BIS-242: remove special handling of samples in experiment edit form. 

SVN: 27608
parent 63a4313c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 16 additions and 42 deletions
openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/CodesArea.java
+ 2
− 9
View file @ 95f4a293
......@@ -31,8 +31,6 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Code;
*/
abstract public class CodesArea<T extends ICodeHolder> extends MultilineItemsField
{
private List<String> originalCodes;
public CodesArea(String emptyTextMsg)
{
super("", false);
......@@ -41,13 +39,8 @@ abstract public class CodesArea<T extends ICodeHolder> extends MultilineItemsFie
public final void setCodeProviders(Collection<T> codeProviders)
{
originalCodes = Code.extractCodes(codeProviders);
setItems(originalCodes);
}
public String[] getOriginalCodes()
{
return originalCodes.toArray(new String[0]);
List<String> codes = Code.extractCodes(codeProviders);
setItems(codes);
}
}
openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentBO.java
+ 2
− 1
View file @ 95f4a293
......@@ -40,6 +40,7 @@ import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.id.experiment.Experime
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.id.experiment.ExperimentTechIdId;
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.id.experiment.IExperimentId;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Code;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IEntityProperty;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewAttachment;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewExperiment;
......@@ -493,7 +494,7 @@ public final class ExperimentBO extends AbstractBusinessObject implements IExper
attachSamples(sampleCodes);
} else
{
String[] originalSampleCodes = updates.getOriginalSampleCodes();
String[] originalSampleCodes = Code.extractCodesToArray(experiment.getSamples());
updateSamples(originalSampleCodes, sampleCodes);
}
}
......
openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicExperimentUpdates.java
+ 0
− 12
View file @ 95f4a293
......@@ -43,8 +43,6 @@ public class BasicExperimentUpdates implements Serializable
// if it does not have data sets attached yet. Otherwise an exception will be thrown.
private String[] sampleCodesOrNull;
private String[] originalSampleCodes;
// if true sampleCodesOrNull changes semantic - sample codes are the same as in newSamples and
// all of them will be attached to the experiment.
private boolean registerSamples;
......@@ -84,16 +82,6 @@ public class BasicExperimentUpdates implements Serializable
this.sampleCodesOrNull = sampleCodes;
}
public String[] getOriginalSampleCodes()
{
return originalSampleCodes;
}
public void setOriginalSampleCodes(String[] originalSampleCodes)
{
this.originalSampleCodes = originalSampleCodes;
}
public void setNewSamples(List<NewSamplesWithTypes> list)
{
this.newSamples = list;
......
openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/AbstractGenericExperimentRegisterEditForm.java
+ 0
− 5
View file @ 95f4a293
......@@ -275,11 +275,6 @@ abstract public class AbstractGenericExperimentRegisterEditForm extends
return null;
}
protected String[] getOriginalSamples()
{
return samplesArea != null ? samplesArea.getOriginalCodes() : new String[0];
}
protected SampleType getSampleType()
{
if (existingSamplesRadio.getValue() == false)
......
openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentEditForm.java
+ 0
− 1
View file @ 95f4a293
......@@ -96,7 +96,6 @@ public final class GenericExperimentEditForm extends AbstractGenericExperimentRe
updates.setProjectIdentifier(extractProjectIdentifier());
updates.setAttachmentSessionKey(attachmentsSessionKey);
updates.setAttachments(attachmentsManager.extractAttachments());
updates.setOriginalSampleCodes(getOriginalSamples());
updates.setSampleCodes(getSamples());
updates.setSampleType(getSampleType());
updates.setGenerateCodes(autoGenerateCodes.getValue().booleanValue());
......
openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java
+ 0
− 1
View file @ 95f4a293
......@@ -607,7 +607,6 @@ public class GenericClientService extends AbstractClientService implements IGene
updatesDTO.setProjectIdentifier(project);
updatesDTO.setAttachments(attachments);
updatesDTO.setProperties(updates.getProperties());
updatesDTO.setOriginalSampleCodes(updates.getOriginalSampleCodes());
updatesDTO.setSampleCodes(updates.getSampleCodes());
updatesDTO.setVersion(updates.getVersion());
updatesDTO.setRegisterSamples(updates.isRegisterSamples());
......
openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentBOTest.java
+ 11
− 11
View file @ 95f4a293
......@@ -723,11 +723,10 @@ public final class ExperimentBOTest extends AbstractBOTest
{
ExperimentIdentifier identifier = CommonTestUtils.createExperimentIdentifier();
ExperimentPE experiment = CommonTestUtils.createExperiment(identifier);
experiment.addSample(createSampleWithCode("S1"));
experiment.setProperties(Collections.<EntityPropertyPE> emptySet());
prepareLoadingExperiment(identifier, experiment);
ExperimentUpdatesDTO update = createDefaultUpdateObject(experiment);
update.setOriginalSampleCodes(new String[]
{ "S1" });
update.setSampleCodes(new String[]
{ "S1", "S2" });
prepareAddSamplesToExperiment(experiment, false, "S2");
......@@ -743,11 +742,10 @@ public final class ExperimentBOTest extends AbstractBOTest
{
ExperimentIdentifier identifier = CommonTestUtils.createExperimentIdentifier();
ExperimentPE experiment = CommonTestUtils.createExperiment(identifier);
experiment.addSample(createSampleWithCode("S1"));
experiment.setProperties(Collections.<EntityPropertyPE> emptySet());
prepareLoadingExperiment(identifier, experiment);
ExperimentUpdatesDTO update = createDefaultUpdateObject(experiment);
update.setOriginalSampleCodes(new String[]
{ "S1" });
update.setSampleCodes(new String[]
{ "S1", "S2" });
prepareAddSamplesToExperiment(experiment, true, "S2");
......@@ -764,11 +762,10 @@ public final class ExperimentBOTest extends AbstractBOTest
{
ExperimentIdentifier identifier = CommonTestUtils.createExperimentIdentifier();
final ExperimentPE experiment = CommonTestUtils.createExperiment(identifier);
experiment.addSample(createSampleWithCode("S1"));
experiment.setProperties(Collections.<EntityPropertyPE> emptySet());
prepareLoadingExperiment(identifier, experiment);
ExperimentUpdatesDTO update = createDefaultUpdateObject(experiment);
update.setOriginalSampleCodes(new String[]
{ "S1" });
update.setSampleCodes(new String[]
{ "S1", "S2" });
context.checking(new Expectations()
......@@ -790,11 +787,11 @@ public final class ExperimentBOTest extends AbstractBOTest
{
ExperimentIdentifier identifier = CommonTestUtils.createExperimentIdentifier();
ExperimentPE experiment = CommonTestUtils.createExperiment(identifier);
experiment.addSample(createSampleWithCode("S1"));
experiment.addSample(createSampleWithCode("S2"));
experiment.setProperties(Collections.<EntityPropertyPE> emptySet());
prepareLoadingExperiment(identifier, experiment);
ExperimentUpdatesDTO update = createDefaultUpdateObject(experiment);
update.setOriginalSampleCodes(new String[]
{ "S1", "S2" });
update.setSampleCodes(new String[]
{ "S3", "S2" });
prepareRemoveSamplesFromExperiment(experiment, false, "S1");
......@@ -811,11 +808,11 @@ public final class ExperimentBOTest extends AbstractBOTest
{
ExperimentIdentifier identifier = CommonTestUtils.createExperimentIdentifier();
ExperimentPE experiment = CommonTestUtils.createExperiment(identifier);
experiment.addSample(createSampleWithCode("S1"));
experiment.addSample(createSampleWithCode("S2"));
experiment.setProperties(Collections.<EntityPropertyPE> emptySet());
prepareLoadingExperiment(identifier, experiment);
ExperimentUpdatesDTO update = createDefaultUpdateObject(experiment);
update.setOriginalSampleCodes(new String[]
{ "S1", "S2" });
update.setSampleCodes(new String[]
{ "S2" });
prepareRemoveSamplesFromExperiment(experiment, true, "S1");
......@@ -867,7 +864,10 @@ public final class ExperimentBOTest extends AbstractBOTest
SamplePE sample = createSampleWithCode(sampleCode);
if (alreadyAssignedToAnExperiment)
{
sample.setExperiment(experiment);
ExperimentPE anotherExperiment = new ExperimentPE();
anotherExperiment.setCode(EXP_CODE + "1");
anotherExperiment.setProject(experiment.getProject());
sample.setExperiment(anotherExperiment);
}
will(returnValue(sample));
if (alreadyAssignedToAnExperiment)
......
openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractDAOWithoutContextTest.java
+ 1
− 0
View file @ 95f4a293
......@@ -324,6 +324,7 @@ public abstract class AbstractDAOWithoutContextTest extends
result.setProject(findProject(db, group, project));
result.setRegistrator(getTestPerson());
result.setRegistrationDate(new Date());
result.setModificationDate(new Date());
return result;
}
......
openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/ExperimentOptimisticLockingTest.java
+ 0
− 2
View file @ 95f4a293
......@@ -275,8 +275,6 @@ public class ExperimentOptimisticLockingTest extends OptimisticLockingTestCase
ExperimentUpdatesDTO update = new ExperimentUpdatesDTO();
update.setVersion(toolBox.loadExperiment(experiment).getVersion());
update.setExperimentId(new TechId(experiment));
update.setOriginalSampleCodes(new String[]
{ sample1.getCode(), sample2.getCode() });
update.setSampleCodes(new String[]
{ sample2.getCode(), sample3.getCode() });
update.setProperties(ToolBox.NO_PROPERTIES);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment