From: Katja Luther Date: Thu, 18 Jun 2015 13:28:35 +0000 (+0200) Subject: all delete methods need an Uuid as argument X-Git-Tag: 3.7.0~1^2~62 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/562118a0faa1060108742d419ac9fd744716c18d all delete methods need an Uuid as argument Conflicts: eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java --- 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 2191fa9b5..cb3a610ed 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 @@ -79,9 +79,9 @@ public class ConvertPerson2TeamHandler extends AbstractHandler { try { team = CdmStore.getService(IAgentService.class).convertPerson2Team(person); } catch (IllegalArgumentException e) { - MessagingUtils.informationDialog("Can not convert Team to Person", e.getMessage()); + MessagingUtils.errorDialog("Can not convert Team to Person", null, e.getMessage(), null,e, true); } catch (MergeException e) { - MessagingUtils.informationDialog("Can not convert Team to Person", e.getMessage()); + MessagingUtils.errorDialog("Can not convert Team to Person", null, e.getMessage(), null,e, true); } }else{ MessagingUtils.informationDialog("Can not convert Team to Person", "convertTeam2Person can only be called on a team."); diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java index a9f3c11b8..1b4438a96 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java @@ -148,7 +148,6 @@ public class ReferencingObjectsView extends AbstractCdmViewPart{ updateView(referencingObjects); - } } }); @@ -227,13 +226,18 @@ public class ReferencingObjectsView extends AbstractCdmViewPart{ */ private void updateView(List referencingObjects) { if (viewer != null && !viewer.getControl().isDisposed()){ - viewer.setInput(referencingObjects); - if (referencedObjectTitleCache != null){ - setContentDescription("'" + referencedObjectTitleCache + "' is referenced by:"); - } else { - setContentDescription(""); + try{ + viewer.setInput(referencingObjects); + if (referencedObjectTitleCache != null){ + setContentDescription("'" + referencedObjectTitleCache + "' is referenced by:"); + } else { + setContentDescription(""); + } + showViewer(); + }catch(Exception e){ + setContentDescription("Some Problems occured."); } - showViewer(); + } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteMisapplicationOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteMisapplicationOperation.java index e73e355a8..d32db52ea 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteMisapplicationOperation.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteMisapplicationOperation.java @@ -88,7 +88,7 @@ public class DeleteMisapplicationOperation extends AbstractPostTaxonOperation { NameDeletionConfigurator nameConfig = new NameDeletionConfigurator(); nameConfig.setRemoveAllNameRelationships(true); config.setNameDeletionConfig(nameConfig); - service.deleteTaxon(misapplication, config, null); + service.deleteTaxon(misapplication.getUuid(), config, null); monitor.worked(40); return postExecute(null); diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteTaxonOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteTaxonOperation.java index 136dcf7f4..8fc759d88 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteTaxonOperation.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteTaxonOperation.java @@ -65,7 +65,7 @@ public class DeleteTaxonOperation extends DeleteTaxonBaseOperation{ ITaxonService service = controller.getTaxonService(); - DeleteResult result = service.deleteTaxon(element, configurator, classification); + DeleteResult result = service.deleteTaxon(element.getUuid(), configurator, classification); if (result.isError()){ MessageDialog.openError(null, "Delete failed", result.toString()); } else if (!result.getUpdatedObjects().isEmpty()){ 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 6f93cf255..61aeda708 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 @@ -770,6 +770,7 @@ public class TransientAgentService implements IAgentService { return defaultService.convertTeam2Person(arg0); } +<<<<<<< HEAD /** * {@inheritDoc} */ @@ -777,5 +778,11 @@ public class TransientAgentService implements IAgentService { public DeleteResult delete(UUID arg0) { return defaultService.delete(arg0); } +======= + @Override + public DeleteResult delete(UUID arg0) { + return defaultService.delete(arg0); + } +>>>>>>> b275ef1... all delete methods need an Uuid as argument } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java index 7cee4d85b..69bbe5936 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java @@ -950,5 +950,10 @@ public class TransientClassificationService implements IClassificationService { return defaultService.createHierarchyInClassification(arg1, arg2); } + @Override + public DeleteResult delete(UUID arg0) { + return defaultService.delete(arg0); + } + } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java index 7d22b8e0c..cf2ff58f6 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java @@ -711,4 +711,10 @@ public class TransientCollectionService implements ICollectionService { public Pager> findByIdentifier(Class clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List propertyPaths){ return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths); } + + @Override + public DeleteResult delete(UUID arg0) { + + return defaultService.delete(arg0); + } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java index ff2cdc1e3..ddab2fa53 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java @@ -1115,6 +1115,7 @@ public class TransientDescriptionService implements IDescriptionService { return defaultService.pageNamedAreasInUse(includeAllParents, pageSize, pageNumber); } +<<<<<<< HEAD /** * {@inheritDoc} */ @@ -1162,4 +1163,10 @@ public class TransientDescriptionService implements IDescriptionService { public UpdateResult moveTaxonDescriptions(UUID arg0, UUID arg1) { return defaultService.moveTaxonDescriptions(arg0, arg1); } +======= + @Override + public DeleteResult delete(UUID arg0) { + return defaultService.delete(arg0); + } +>>>>>>> b275ef1... all delete methods need an Uuid as argument } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java index 267831d4a..e01047760 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java @@ -221,8 +221,8 @@ public class TransientNameService implements INameService { * @see eu.etaxonomy.cdm.api.service.INameService#delete(eu.etaxonomy.cdm.model.name.TaxonNameBase, eu.etaxonomy.cdm.api.service.config.NameDeletionConfigurator) */ @Override - public DeleteResult delete(TaxonNameBase name, NameDeletionConfigurator config) { - return defaultService.delete(name, config); + public DeleteResult delete(UUID nameUuid, NameDeletionConfigurator config) { + return defaultService.delete(nameUuid, config); } /** @@ -1164,6 +1164,16 @@ public class TransientNameService implements INameService { return defaultService.getNameRecords(); } +<<<<<<< HEAD +======= + + @Override + public DeleteResult delete(UUID arg0) { + return defaultService.delete(arg0); + } + + +>>>>>>> b275ef1... all delete methods need an Uuid as argument /** * {@inheritDoc} diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java index f12b34a94..04f1b0cf6 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java @@ -1056,6 +1056,7 @@ public class TransientOccurenceService implements IOccurrenceService { return defaultService.getAllHierarchyDerivatives(specimen); } +<<<<<<< HEAD /** * {@inheritDoc} */ @@ -1063,5 +1064,11 @@ public class TransientOccurenceService implements IOccurrenceService { public DeleteResult delete(UUID arg0) { return defaultService.delete(arg0); } +======= + @Override + public DeleteResult delete(UUID arg0) { + return defaultService.delete(arg0); + } +>>>>>>> b275ef1... all delete methods need an Uuid as argument } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java index c4181efa0..e6456b143 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java @@ -710,6 +710,7 @@ public class TransientReferenceService implements IReferenceService { return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths); } +<<<<<<< HEAD /** * {@inheritDoc} */ @@ -717,5 +718,11 @@ public class TransientReferenceService implements IReferenceService { public DeleteResult delete(UUID arg0) { return defaultService.delete(arg0); } +======= + @Override + public DeleteResult delete(UUID arg0) { + return defaultService.delete(arg0); + } +>>>>>>> b275ef1... all delete methods need an Uuid as argument } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java index bced71d45..09bc45975 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java @@ -1341,7 +1341,7 @@ public class TransientTaxonService implements ITaxonService { } @Override - public DeleteResult deleteTaxon(Taxon arg0, TaxonDeletionConfigurator arg1, Classification arg2) { + public DeleteResult deleteTaxon(UUID arg0, TaxonDeletionConfigurator arg1, Classification arg2) { return defaultService.deleteTaxon(arg0, arg1, arg2); } @@ -1436,6 +1436,7 @@ public class TransientTaxonService implements ITaxonService { return defaultService.moveSynonymToAnotherTaxon(oldSynonymRelation, newTaxonUUID, moveHomotypicGroup, newSynonymRelationshipType, reference, referenceDetail, keepReference); } +<<<<<<< HEAD /** * {@inheritDoc} */ @@ -1451,6 +1452,20 @@ public class TransientTaxonService implements ITaxonService { public DeleteResult deleteSynonym(UUID arg0, UUID arg1, SynonymDeletionConfigurator arg2) { return defaultService.deleteSynonym(arg0, arg1, arg2); } +======= + @Override + public DeleteResult delete(UUID arg0) { + return defaultService.delete(arg0); + } + + + + @Override + public UpdateResult moveFactualDateToAnotherTaxon(UUID arg0, UUID arg1) { + return defaultService.moveFactualDateToAnotherTaxon(arg0, arg1); + } + +>>>>>>> b275ef1... all delete methods need an Uuid as argument /** * {@inheritDoc} diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java index 552d205fe..700b48e1c 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java @@ -872,6 +872,7 @@ public class TransientTermService implements ITermService { return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths); } +<<<<<<< HEAD /** * {@inheritDoc} */ @@ -879,5 +880,11 @@ public class TransientTermService implements ITermService { public DeleteResult delete(UUID arg0) { return defaultService.delete(arg0); } +======= + @Override + public DeleteResult delete(UUID arg0) { + return defaultService.delete(arg0); + } +>>>>>>> b275ef1... all delete methods need an Uuid as argument }