From 1484dd1ceccdc69cb6f81a89dbc3485752813e78 Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Tue, 9 Feb 2010 10:26:35 +0000
Subject: [PATCH] minor refactoring
SVN: 14646
---
.../openbis/plugin/demo/server/DemoServer.java | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoServer.java
index dfed27a364a..129b99b8546 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoServer.java
@@ -35,6 +35,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewAttachment;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewSample;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SampleParentWithDerived;
import ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE;
+import ch.systemsx.cisd.openbis.generic.shared.dto.SampleParentWithDerivedDTO;
import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.translator.SampleTranslator;
@@ -89,18 +90,25 @@ public final class DemoServer extends AbstractServer<IDemoServer> implements IDe
final ISampleBO sampleBO = businessObjectFactory.createSampleBO(session);
sampleBO.loadBySampleIdentifier(identifier);
final SamplePE sample = sampleBO.getSample();
- return SampleTranslator.translate(getSampleTypeSlaveServerPlugin(sample.getSampleType())
- .getSampleInfo(session, sample), session.getBaseIndexURL());
+ return getSampleInfo(session, sample);
}
- public final SampleParentWithDerived getSampleInfo(final String sessionToken, final TechId sampleId)
+ public final SampleParentWithDerived getSampleInfo(final String sessionToken,
+ final TechId sampleId)
{
final Session session = getSession(sessionToken);
final ISampleBO sampleBO = businessObjectFactory.createSampleBO(session);
sampleBO.loadDataByTechId(sampleId);
final SamplePE sample = sampleBO.getSample();
- return SampleTranslator.translate(getSampleTypeSlaveServerPlugin(sample.getSampleType())
- .getSampleInfo(session, sample), session.getBaseIndexURL());
+ return getSampleInfo(session, sample);
+ }
+
+ private SampleParentWithDerived getSampleInfo(final Session session, final SamplePE sample)
+ {
+ ISampleTypeSlaveServerPlugin plugin =
+ getSampleTypeSlaveServerPlugin(sample.getSampleType());
+ SampleParentWithDerivedDTO sampleInfo = plugin.getSampleInfo(session, sample);
+ return SampleTranslator.translate(sampleInfo, session.getBaseIndexURL());
}
public final void registerSample(final String sessionToken, final NewSample newSample,
--
GitLab