Skip to content
Snippets Groups Projects
Commit 47b0bfcd authored by buczekp's avatar buczekp
Browse files

[LMS-1676] removed stale code

SVN: 17387
parent c6eaa1c9
No related branches found
No related tags found
No related merge requests found
...@@ -57,10 +57,9 @@ public class SampleUpdates extends BasicSampleUpdates ...@@ -57,10 +57,9 @@ public class SampleUpdates extends BasicSampleUpdates
public SampleUpdates(String sessionKey, TechId sampleId, List<IEntityProperty> properties, public SampleUpdates(String sessionKey, TechId sampleId, List<IEntityProperty> properties,
List<NewAttachment> attachments, ExperimentIdentifier experimentIdentifierOrNull, List<NewAttachment> attachments, ExperimentIdentifier experimentIdentifierOrNull,
Date version, String sampleIdentifier, String containerIdentifierOrNull, Date version, String sampleIdentifier, String containerIdentifierOrNull,
String parentIdentifierOrNull, String[] parents) String[] parents)
{ {
super(sampleId, properties, version, containerIdentifierOrNull, parentIdentifierOrNull, super(sampleId, properties, version, containerIdentifierOrNull, null, parents);
parents);
this.sessionKey = sessionKey; this.sessionKey = sessionKey;
this.attachments = attachments; this.attachments = attachments;
this.experimentIdentifierOrNull = experimentIdentifierOrNull; this.experimentIdentifierOrNull = experimentIdentifierOrNull;
......
...@@ -238,7 +238,6 @@ public final class SampleBO extends AbstractSampleBusinessObject implements ISam ...@@ -238,7 +238,6 @@ public final class SampleBO extends AbstractSampleBusinessObject implements ISam
updateProperties(updates.getProperties()); updateProperties(updates.getProperties());
updateGroup(sample, updates.getSampleIdentifier(), null); updateGroup(sample, updates.getSampleIdentifier(), null);
updateExperiment(sample, updates.getExperimentIdentifierOrNull(), null); updateExperiment(sample, updates.getExperimentIdentifierOrNull(), null);
// TODO 2010-08-06, Piotr Buczek: get rid of this
setGeneratedFrom(updates.getSampleIdentifier(), sample, updates.getParentIdentifierOrNull()); setGeneratedFrom(updates.getSampleIdentifier(), sample, updates.getParentIdentifierOrNull());
setContainer(updates.getSampleIdentifier(), sample, updates.getContainerIdentifierOrNull()); setContainer(updates.getSampleIdentifier(), sample, updates.getContainerIdentifierOrNull());
for (NewAttachment attachment : updates.getAttachments()) for (NewAttachment attachment : updates.getAttachments())
......
...@@ -39,7 +39,7 @@ public class BasicSampleUpdates implements IsSerializable, Serializable ...@@ -39,7 +39,7 @@ public class BasicSampleUpdates implements IsSerializable, Serializable
private Date version; private Date version;
// TODO 2010-08-06, Piotr Buczek: get rid of this // TODO 2010-08-06, Piotr Buczek: get rid of this when we change batch import/update
private String parentIdentifierOrNull; private String parentIdentifierOrNull;
private String containerIdentifierOrNull; private String containerIdentifierOrNull;
......
...@@ -218,7 +218,7 @@ abstract public class AbstractGenericSampleRegisterEditForm extends ...@@ -218,7 +218,7 @@ abstract public class AbstractGenericSampleRegisterEditForm extends
.getCommonViewContext(), getId() + ID_SUFFIX_PARENT, .getCommonViewContext(), getId() + ID_SUFFIX_PARENT,
SampleTypeDisplayID.SAMPLE_REGISTRATION_PARENT_CHOOSER SampleTypeDisplayID.SAMPLE_REGISTRATION_PARENT_CHOOSER
.withSuffix(getSampleTypeCode())); .withSuffix(getSampleTypeCode()));
parentsArea = new ParentSamplesArea(viewContext, simpleId); parentsArea = new ParentSamplesArea(viewContext, getId());
SampleChooserButton parentChooserButton = parentButton.getChooserButton(); SampleChooserButton parentChooserButton = parentButton.getChooserButton();
parentChooserButton.addChosenEntityListener(new IChosenEntityListener<Sample>() parentChooserButton.addChosenEntityListener(new IChosenEntityListener<Sample>()
{ {
......
...@@ -72,7 +72,7 @@ public final class GenericSampleEditForm extends AbstractGenericSampleRegisterEd ...@@ -72,7 +72,7 @@ public final class GenericSampleEditForm extends AbstractGenericSampleRegisterEd
viewContext.getService().updateSample( viewContext.getService().updateSample(
new SampleUpdates(attachmentsSessionKey, techIdOrNull, properties, attachments, new SampleUpdates(attachmentsSessionKey, techIdOrNull, properties, attachments,
experimentIdent, originalSample.getModificationDate(), experimentIdent, originalSample.getModificationDate(),
createSampleIdentifier(), containerOrNull, null, parents), createSampleIdentifier(), containerOrNull, parents),
new UpdateSampleCallback(viewContext)); new UpdateSampleCallback(viewContext));
} }
......
...@@ -202,17 +202,17 @@ abstract public class GenericSampleViewer extends AbstractViewer<Sample> impleme ...@@ -202,17 +202,17 @@ abstract public class GenericSampleViewer extends AbstractViewer<Sample> impleme
containerSamplesSection = new ContainerSamplesSection(viewContext, generator); containerSamplesSection = new ContainerSamplesSection(viewContext, generator);
containerSamplesSection.setDisplayID(DisplayTypeIDGenerator.CONTAINER_SAMPLES_SECTION, containerSamplesSection.setDisplayID(DisplayTypeIDGenerator.CONTAINER_SAMPLES_SECTION,
displayIdSuffix); displayIdSuffix);
container.addPanel(containerSamplesSection, false); container.addPanel(containerSamplesSection);
// Derived samples // Derived samples
derivedSamplesSection = new DerivedSamplesSection(viewContext, generator); derivedSamplesSection = new DerivedSamplesSection(viewContext, generator);
derivedSamplesSection.setDisplayID(DisplayTypeIDGenerator.DERIVED_SAMPLES_SECTION, derivedSamplesSection.setDisplayID(DisplayTypeIDGenerator.DERIVED_SAMPLES_SECTION,
displayIdSuffix); displayIdSuffix);
container.addPanel(derivedSamplesSection, false); container.addPanel(derivedSamplesSection);
// Parent samples // Parent samples
parentSamplesSection = new ParentSamplesSection(viewContext, generator); parentSamplesSection = new ParentSamplesSection(viewContext, generator);
parentSamplesSection.setDisplayID(DisplayTypeIDGenerator.PARENT_SAMPLES_SECTION, parentSamplesSection.setDisplayID(DisplayTypeIDGenerator.PARENT_SAMPLES_SECTION,
displayIdSuffix); displayIdSuffix);
container.addPanel(parentSamplesSection, false); container.addPanel(parentSamplesSection);
// Data Sets // Data Sets
CheckBox showOnlyDirectlyConnectedCheckBox = createShowOnlyDirectlyConnectedCheckBox(); CheckBox showOnlyDirectlyConnectedCheckBox = createShowOnlyDirectlyConnectedCheckBox();
dataSetBrowser = dataSetBrowser =
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment