From: Cherian Mathew <c.mathew@bgbm.org>
Date: Wed, 14 Oct 2015 08:50:29 +0000 (+0200)
Subject: #5268 Use convert methods which use uuids
X-Git-Tag: 3.12.0^2~88^2
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/bc073c98fd4e9ae473e3f891307b4566267ba91f

#5268 Use convert methods which use uuids
---

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/ConvertPerson2TeamHandler.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/ConvertPerson2TeamHandler.java
index a016571e2..0798ab5e9 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/ConvertPerson2TeamHandler.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/ConvertPerson2TeamHandler.java
@@ -78,7 +78,7 @@ public class ConvertPerson2TeamHandler extends AbstractHandler {
 				if (object instanceof Person){
 					Person person = HibernateProxyHelper.deproxy(object, Person.class);
 					try {
-						team = CdmStore.getService(IAgentService.class).convertPerson2Team(person);
+						team = CdmStore.getService(IAgentService.class).convertPerson2Team(person.getUuid());
 					} catch (IllegalArgumentException e) {
 						MessagingUtils.errorDialog("Can not convert Person into a Team", null, e.getLocalizedMessage(), TaxeditorBulkeditorPlugin.PLUGIN_ID,e, true);
 					} catch (MergeException e) {
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/ConvertTeam2PersonHandler.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/ConvertTeam2PersonHandler.java
index 846ada15f..047cad68c 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/ConvertTeam2PersonHandler.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/ConvertTeam2PersonHandler.java
@@ -20,10 +20,8 @@ import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.eclipse.ui.texteditor.IDocumentProvider;
 
-import eu.etaxonomy.cdm.api.service.AgentServiceImpl;
 import eu.etaxonomy.cdm.api.service.IAgentService;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
-import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.strategy.merge.MergeException;
@@ -47,9 +45,9 @@ public class ConvertTeam2PersonHandler extends AbstractHandler {
 	@Override
 	public Person execute(ExecutionEvent event) throws ExecutionException {
 		ISelection selection = HandlerUtil.getCurrentSelection(event);
-		
+
 		IEditorPart editor = HandlerUtil.getActiveEditor(event);
-		
+
 		IEditorInput input = editor.getEditorInput();
 		if (editor.isDirty()){
 			boolean proceed = MessageDialog.openQuestion(null,
@@ -61,17 +59,17 @@ public class ConvertTeam2PersonHandler extends AbstractHandler {
 			}
 		}
 		if((input instanceof IEntityPersistenceService) && (selection instanceof IStructuredSelection)){
-			
-			
+
+
 			IDocumentProvider provider = ((BulkEditor) editor).getDocumentProvider();
-			LineAnnotationModel model = 
+			LineAnnotationModel model =
 					(LineAnnotationModel) provider.getAnnotationModel(input);
-			
-			
+
+
 			IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-			
+
 			IEntityPersistenceService persistenceService = (IEntityPersistenceService) input;
-		
+
 			Person person ;
 			for(Object object : structuredSelection.toList()){
 				LineAnnotation annotation = (LineAnnotation) model.getAnnotation(object);
@@ -79,7 +77,7 @@ public class ConvertTeam2PersonHandler extends AbstractHandler {
 				if (object instanceof Team){
 					Team team = HibernateProxyHelper.deproxy(object, Team.class);
 					try {
-						person = CdmStore.getService(IAgentService.class).convertTeam2Person(team);
+						person = CdmStore.getService(IAgentService.class).convertTeam2Person(team.getUuid());
 					} catch (IllegalArgumentException e) {
 						MessagingUtils.informationDialog("Can not convert Team to Person", e.getMessage());
 					} catch (MergeException e) {
@@ -88,7 +86,7 @@ public class ConvertTeam2PersonHandler extends AbstractHandler {
 				}else{
 					MessagingUtils.informationDialog("Can not convert Team to Person", "convertTeam2Person can only be called on a team.");
 				}
-				
+
 				if (person != null){
 					((BulkEditor) editor).removeAnnotatedLine(annotation);
 					((BulkEditor) editor).createAnnotatedLine(person);
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java
index ceedd641c..5b29bd6f3 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java
@@ -817,6 +817,19 @@ public class TransientAgentService implements IAgentService {
         return defaultService.loadWithUpdate(arg0);
     }
 
+    /* (non-Javadoc)
+     * @see eu.etaxonomy.cdm.api.service.IAgentService#convertPerson2Team(java.util.UUID)
+     */
+    @Override
+    public Team convertPerson2Team(UUID arg0) throws MergeException, IllegalArgumentException {
+        return defaultService.convertPerson2Team(arg0);
+    }
 
-
+    /* (non-Javadoc)
+     * @see eu.etaxonomy.cdm.api.service.IAgentService#convertTeam2Person(java.util.UUID)
+     */
+    @Override
+    public Person convertTeam2Person(UUID arg0) throws MergeException {
+        return defaultService.convertTeam2Person(arg0);
+    }
 }