From 94b8c8afbac2d025610ee5a1801c4a8cbadd85e1 Mon Sep 17 00:00:00 2001 From: Cherian Mathew Date: Thu, 3 Sep 2015 19:07:32 +0200 Subject: [PATCH 1/1] #5187 Use new move methods with uuids as args --- .../derivate/operation/MoveDerivateOperation.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/MoveDerivateOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/MoveDerivateOperation.java index 9931904ff..11c1af71a 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/MoveDerivateOperation.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/MoveDerivateOperation.java @@ -101,7 +101,9 @@ public class MoveDerivateOperation extends AbstractPostOperation { if(fromParentSpecimen instanceof SpecimenOrObservationBase && fromNode!=null && !fromNode.equals(targetNode)){//don't drag on direct parent node) - return occurrenceService.moveDerivate((SpecimenOrObservationBase)fromParentSpecimen, targetSpecimen, draggedSpecimen); + return occurrenceService.moveDerivate(((SpecimenOrObservationBase)fromParentSpecimen).getUuid(), + targetSpecimen.getUuid(), + draggedSpecimen.getUuid()).isOk(); } } @@ -109,7 +111,9 @@ public class MoveDerivateOperation extends AbstractPostOperation { else if(draggedNodeValue instanceof SingleRead && targetNodeValue instanceof Sequence){ SingleRead singleRead = (SingleRead) draggedNodeValue; if(fromParentSpecimen instanceof Sequence){ - return CdmStore.getService(ISequenceService.class).moveSingleRead((Sequence)fromParentSpecimen, (Sequence)targetNodeValue, singleRead); + return CdmStore.getService(ISequenceService.class).moveSingleRead(((Sequence)fromParentSpecimen).getUuid(), + ((Sequence)targetNodeValue).getUuid(), + singleRead.getUuid()).isOk(); } } @@ -117,7 +121,9 @@ public class MoveDerivateOperation extends AbstractPostOperation { else if(draggedNodeValue instanceof Sequence && targetNodeValue instanceof DnaSample && ((SpecimenOrObservationBase) targetNodeValue).getRecordBasis()==SpecimenOrObservationType.DnaSample){ Sequence sequence = (Sequence)draggedNodeValue; if(fromParentSpecimen instanceof DnaSample && ((SpecimenOrObservationBase) targetNodeValue).getRecordBasis()==SpecimenOrObservationType.DnaSample){ - return occurrenceService.moveSequence((DnaSample)fromParentSpecimen, (DnaSample)targetNodeValue, sequence); + return occurrenceService.moveSequence(((DnaSample)fromParentSpecimen).getUuid(), + ((DnaSample)targetNodeValue).getUuid(), + sequence.getUuid()).isOk(); } } return false; -- 2.34.1