all delete methods need an Uuid as argument
authorKatja Luther <k.luther@bgbm.org>
Thu, 18 Jun 2015 13:28:35 +0000 (15:28 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Mon, 22 Jun 2015 09:30:45 +0000 (11:30 +0200)
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

13 files changed:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/ConvertPerson2TeamHandler.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteMisapplicationOperation.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteTaxonOperation.java
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/TransientClassificationService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.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

index 2191fa9b5cd94a918920d0b4e0fd88e443e821f2..cb3a610edd667d001572a5b70e125f53384a4e97 100644 (file)
@@ -79,9 +79,9 @@ public class ConvertPerson2TeamHandler extends AbstractHandler {
                                        try {\r
                                                team = CdmStore.getService(IAgentService.class).convertPerson2Team(person);\r
                                        } catch (IllegalArgumentException e) {\r
-                                               MessagingUtils.informationDialog("Can not convert Team to Person", e.getMessage());\r
+                                               MessagingUtils.errorDialog("Can not convert Team to Person", null, e.getMessage(), null,e, true);\r
                                        } catch (MergeException e) {\r
-                                               MessagingUtils.informationDialog("Can not convert Team to Person", e.getMessage());\r
+                                               MessagingUtils.errorDialog("Can not convert Team to Person", null, e.getMessage(), null,e, true);\r
                                        }\r
                                }else{\r
                                        MessagingUtils.informationDialog("Can not convert Team to Person", "convertTeam2Person can only be called on a team.");\r
index a9f3c11b85715ee97d1d86b4e2aff6810b7cc2f2..1b4438a96460f72cc218c1e10b5392c142d79a7b 100644 (file)
@@ -148,7 +148,6 @@ public class ReferencingObjectsView extends AbstractCdmViewPart{
                                                        
                                                        updateView(referencingObjects);
                                                        
-                                                       
                                                }
                                        }
                                });
@@ -227,13 +226,18 @@ public class ReferencingObjectsView extends AbstractCdmViewPart{
         */
        private void updateView(List<CdmBase> 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();
+                       
                }
        }
 
index e73e355a8fccf4f0e72de98a3ab8a8798b1c31ab..d32db52ea2a316343727fc4326136a255ed69064 100644 (file)
@@ -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);
index 136dcf7f4ff1ead991087e748173666a02d0fe02..8fc759d88cdb2ac4485414ac0721a15f514f4a37 100644 (file)
@@ -65,7 +65,7 @@ public class DeleteTaxonOperation extends DeleteTaxonBaseOperation{
                                ITaxonService service = controller.getTaxonService();\r
 \r
 \r
-                               DeleteResult result =   service.deleteTaxon(element, configurator, classification);\r
+                               DeleteResult result =   service.deleteTaxon(element.getUuid(), configurator, classification);\r
                                if (result.isError()){\r
                                        MessageDialog.openError(null, "Delete failed", result.toString());\r
                                } else if (!result.getUpdatedObjects().isEmpty()){\r
index 6f93cf255fd71b94b5e5a030e135b1f5e879f671..61aeda7085a9a3424211f2b29bf1d2d195950c10 100644 (file)
@@ -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
 
 }
index 7cee4d85b6b7dbe529d91a016a783014c4a75929..69bbe5936b847647031eb7a1cb0377ce77a02652 100644 (file)
@@ -950,5 +950,10 @@ public class TransientClassificationService implements IClassificationService {
        return defaultService.createHierarchyInClassification(arg1, arg2);
     }
 
+       @Override
+       public DeleteResult delete(UUID arg0) {
+               return defaultService.delete(arg0);
+       }
+
 
 }
index 7d22b8e0c3541253b2c11d969485734ba343a7b8..cf2ff58f6e82bc2d30b392d61578ea697096c1b4 100644 (file)
@@ -711,4 +711,10 @@ public class TransientCollectionService implements ICollectionService {
        public <S extends Collection>  Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
                return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
        }
+
+       @Override
+       public DeleteResult delete(UUID arg0) {
+               
+               return defaultService.delete(arg0);
+       }
 }
index ff2cdc1e3546e29c0cf355cf3e6754a300849089..ddab2fa532b33e473e5228edc72177bba056fb73 100644 (file)
@@ -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
 }
index 267831d4ad07b0e46d815c3a8ae552688b39c242..e01047760b9802924db6460065a8a34b0459b100 100644 (file)
@@ -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}
index f12b34a94b1c166384922dadf6a1f30b39486eb2..04f1b0cf652504a2f8e96aef8603bbd150afc402 100644 (file)
@@ -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
 
 }
index c4181efa0e3afda920fa3fd6ee164b065afaa73d..e6456b1431a37d5fe006f1d113faa6e3c8bfd842 100644 (file)
@@ -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
 
 }
index bced71d45ac9f85221d7d7e92dd4da88ee7f6de9..09bc45975ba7d6383e2b9ad9abd04650ba54768b 100644 (file)
@@ -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}
index 552d205fe31df869cb6e810c121ef70704550f68..700b48e1cc9da3b920bab870a461cce11511ea5b 100644 (file)
@@ -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
 
 }