From 6bde9298c2fbca9f11133029b691297253c6508b Mon Sep 17 00:00:00 2001
From: anttil <anttil>
Date: Mon, 11 Jun 2012 09:03:49 +0000
Subject: [PATCH] BIS-51 / SP-123: Improve annotations on the
IRelationshipService
SVN: 25635
---
.../cisd/openbis/generic/server/RelationshipService.java | 4 ++--
.../openbis/generic/server/business/bo/ExperimentBO.java | 9 ++++-----
.../generic/server/business/bo/ExperimentTable.java | 6 ++----
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/RelationshipService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/RelationshipService.java
index 387261109be..7db4fe39bde 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/RelationshipService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/RelationshipService.java
@@ -39,8 +39,8 @@ public class RelationshipService implements IRelationshipService
private DAOFactory daoFactory;
@Override
- public void reassignProject(IAuthSession session, ProjectIdentifier projectId,
- ExperimentIdentifier experimentId)
+ public void assignExperimentToProject(IAuthSession session, ExperimentIdentifier experimentId,
+ ProjectIdentifier projectId)
{
ProjectPE previousProject =
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentBO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentBO.java
index a9a21e73db7..d613d13646e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentBO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentBO.java
@@ -426,11 +426,10 @@ public final class ExperimentBO extends AbstractBusinessObject implements IExper
ProjectPE previousProject = experiment.getProject();
if (project.equals(previousProject) == false)
{
- relationshipService.reassignProject(session, updates.getProjectIdentifier(),
- new ExperimentIdentifier(new ProjectIdentifier(previousProject.getSpace()
- .getDatabaseInstance().getCode(), previousProject.getSpace().getCode(),
- previousProject.getCode()), experiment
- .getCode()));
+ relationshipService.assignExperimentToProject(session, new ExperimentIdentifier(
+ new ProjectIdentifier(previousProject.getSpace().getDatabaseInstance()
+ .getCode(), previousProject.getSpace().getCode(), previousProject
+ .getCode()), experiment.getCode()), updates.getProjectIdentifier());
}
for (NewAttachment attachment : updates.getAttachments())
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentTable.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentTable.java
index b609589d2db..5cbab927c93 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentTable.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentTable.java
@@ -255,10 +255,8 @@ public final class ExperimentTable extends AbstractBusinessObject implements IEx
.getCode(), previousProject.getSpace().getCode(), previousProject
.getCode());
- relationshipService
- .reassignProject(session, updates.getProjectIdentifier(),
- new ExperimentIdentifier(previousProjectId, experiment
- .getCode()));
+ relationshipService.assignExperimentToProject(session, new ExperimentIdentifier(
+ previousProjectId, experiment.getCode()), updates.getProjectIdentifier());
}
}
--
GitLab