Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
authorCherian Mathew <c.mathew@bgbm.org>
Mon, 22 Jun 2015 10:51:55 +0000 (12:51 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Mon, 22 Jun 2015 10:51:55 +0000 (12:51 +0200)
Conflicts:
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/DeleteTaxonOperation.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/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/TransientTaxonService.java

1  2 
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/DeleteTaxonOperation.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/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

@@@ -134,12 -143,11 +134,11 @@@ public class ReferencingObjectsView ext
                                        @Override
                                        public void run() {
                                                if (entityUUID != null){
 -                                                      
 +
                                                        List<CdmBase> referencingObjects = getReferencingObjects(entityUUID, objectClass);
 -                                                      
 +
                                                        updateView(referencingObjects);
 -                                                      
 +
                                                }
                                        }
                                });
         */
        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();
 -                      
++
                }
        }
  
@@@ -71,9 -63,9 +71,9 @@@ public class DeleteTaxonOperation exten
                                controller = CdmStore.getCurrentApplicationConfiguration();\r
  \r
                                ITaxonService service = controller.getTaxonService();\r
--\r
--\r
 -                              DeleteResult result =   service.deleteTaxon(element.getUuid(), configurator, classification);\r
++
 +                              DeleteResult result =   service.deleteTaxon(element.getUuid(), configurator, classification.getUuid());\r
++
                                if (result.isError()){\r
                                        MessageDialog.openError(null, "Delete failed", result.toString());\r
                                } else if (!result.getUpdatedObjects().isEmpty()){\r
@@@ -711,4 -711,10 +711,5 @@@ public class TransientCollectionServic
        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);
 -      }
  }
@@@ -1174,14 -1166,23 +1174,14 @@@ public class TransientNameService imple
        }
  
  
-     /* (non-Javadoc)
-      * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
+     /**
+      * {@inheritDoc}
       */
      @Override
-     public DeleteResult delete(UUID uuid) {
-         return defaultService.delete(uuid);
+     public DeleteResult delete(UUID arg0) {
+         return defaultService.delete(arg0);
      }
  
 -    /**
 -     * {@inheritDoc}
 -     */
 -    @Override
 -    public UpdateResult setAsGroupsBasionym(UUID arg0) {
 -        return defaultService.setAsGroupsBasionym(arg0);
 -    }
 -
 -
  
  
  
@@@ -1056,15 -1056,13 +1056,13 @@@ public class TransientOccurenceService 
            return defaultService.getAllHierarchyDerivatives(specimen);
        }
  
 -    /**
 -     * {@inheritDoc}
 +
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
       */
      @Override
 -    public DeleteResult delete(UUID arg0) {
 -        return defaultService.delete(arg0);
 +    public DeleteResult delete(UUID uuid) {
 +        return defaultService.delete(uuid);
      }
  
--
  }
@@@ -710,12 -710,13 +710,13 @@@ public class TransientReferenceService 
                return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
        }
  
 -    /**
 -     * {@inheritDoc}
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
       */
      @Override
 -    public DeleteResult delete(UUID arg0) {
 -        return defaultService.delete(arg0);
 +    public DeleteResult delete(UUID uuid) {
 +        return defaultService.delete(uuid);
      }
  
  }
@@@ -506,11 -506,11 +506,12 @@@ public class TransientTaxonService impl
      /**
       * @param synonym
       * @param acceptedTaxon
++     * @return
       * @see eu.etaxonomy.cdm.api.service.ITaxonService#swapSynonymAndAcceptedTaxon(eu.etaxonomy.cdm.model.taxon.Synonym, eu.etaxonomy.cdm.model.taxon.Taxon)
       */
      @Override
--    public void swapSynonymAndAcceptedTaxon(Synonym synonym, Taxon acceptedTaxon) {
--        defaultService.swapSynonymAndAcceptedTaxon(synonym, acceptedTaxon);
++    public UpdateResult swapSynonymAndAcceptedTaxon(Synonym synonym, Taxon acceptedTaxon) {
++        return defaultService.swapSynonymAndAcceptedTaxon(synonym, acceptedTaxon);
      }
  
      /**
      }
  
      @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);
--    }
--
--    @Override
      public List<List<Synonym>> getSynonymsByHomotypicGroup(Taxon taxon, List<String> propertyPaths) {
          return defaultService.getSynonymsByHomotypicGroup(taxon, propertyPaths);
      }
  
  
  
 -      @Override
 -      public SynonymRelationship moveSynonymToAnotherTaxon(
 -                      SynonymRelationship oldSynonymRelation, UUID newTaxonUUID,
 -                      boolean moveHomotypicGroup,
 -                      SynonymRelationshipType newSynonymRelationshipType,
 -                      Reference reference, String referenceDetail, boolean keepReference)
 -                      throws HomotypicalGroupChangeException {
 -
 -              return defaultService.moveSynonymToAnotherTaxon(oldSynonymRelation, newTaxonUUID, moveHomotypicGroup, newSynonymRelationshipType, reference, referenceDetail, keepReference);
 -      }
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.cdm.api.service.ITaxonService#deleteSynonym(java.util.UUID, java.util.UUID, eu.etaxonomy.cdm.api.service.config.SynonymDeletionConfigurator)
 +     */
 +    @Override
 +    public DeleteResult deleteSynonym(UUID synonymUuid, UUID taxonUuid, SynonymDeletionConfigurator config) {
 +        return defaultService.deleteSynonym(synonymUuid, taxonUuid, config);
 +    }
  
  
-     /* (non-Javadoc)
-      * @see eu.etaxonomy.cdm.api.service.ITaxonService#swapSynonymAndAcceptedTaxon(java.util.UUID, java.util.UUID)
+     /**
+      * {@inheritDoc}
 +
       */
      @Override
 -    public DeleteResult delete(UUID arg0) {
 -        return defaultService.delete(arg0);
 +    public UpdateResult swapSynonymAndAcceptedTaxon(UUID synonymUUid, UUID acceptedTaxonUuid) {
 +        return defaultService.swapSynonymAndAcceptedTaxon(synonymUUid, acceptedTaxonUuid);
      }
  
 -    /**
 -     * {@inheritDoc}
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.cdm.api.service.ITaxonService#deleteTaxon(java.util.UUID, eu.etaxonomy.cdm.api.service.config.TaxonDeletionConfigurator, java.util.UUID)
       */
      @Override
 -    public DeleteResult deleteSynonym(UUID arg0, UUID arg1, SynonymDeletionConfigurator arg2) {
 -        return defaultService.deleteSynonym(arg0, arg1, arg2);
 +    public DeleteResult deleteTaxon(UUID taxonUuid, TaxonDeletionConfigurator config, UUID classificationUuid) {
 +        return defaultService.deleteTaxon(taxonUuid, config, classificationUuid);
      }
  
+       @Override
+       public UpdateResult moveFactualDateToAnotherTaxon(UUID arg0, UUID arg1) {
+               return defaultService.moveFactualDateToAnotherTaxon(arg0, arg1);
+       }
+     /**
+      * {@inheritDoc}
+      */
      @Override
 -    public DeleteResult deleteTaxon(UUID arg0, TaxonDeletionConfigurator arg1, UUID arg2) {
 -        return defaultService.deleteTaxon(arg0, arg1, arg2);
 +    public SynonymRelationship moveSynonymToAnotherTaxon(
 +            SynonymRelationship oldSynonymRelation, UUID newTaxonUUID,
 +            boolean moveHomotypicGroup,
 +            SynonymRelationshipType newSynonymRelationshipType,
 +            Reference reference, String referenceDetail, boolean keepReference)
 +                    throws HomotypicalGroupChangeException {
 +
 +        return defaultService.moveSynonymToAnotherTaxon(oldSynonymRelation, newTaxonUUID, moveHomotypicGroup, newSynonymRelationshipType, reference, referenceDetail, keepReference);
      }
  
 -    /**
 -     * {@inheritDoc}
 +
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
       */
      @Override
 -    public UpdateResult swapSynonymAndAcceptedTaxon(UUID arg0, UUID arg1) {
 -        return defaultService.swapSynonymAndAcceptedTaxon(arg0, arg1);
 +    public DeleteResult delete(UUID uuid) {
 +        return defaultService.delete(uuid);
 +
      }
  
  }
@@@ -861,23 -861,24 +861,24 @@@ public class TransientTermService imple
          return defaultService.listByTermType(termType, limit, start, orderHints, propertyPaths);
      }
  
 -      @Override
 -      public DefinedTermBase findWithoutFlush(UUID uuid) {
 -              return defaultService.findWithoutFlush(uuid);
 -      }
 +    @Override
 +    public DefinedTermBase findWithoutFlush(UUID uuid) {
 +        return defaultService.findWithoutFlush(uuid);
 +    }
  
  
 -      @Override
 -      public <S extends DefinedTermBase>  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 <S extends DefinedTermBase>  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);
 +    }
  
 -    /**
 -     * {@inheritDoc}
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
       */
      @Override
 -    public DeleteResult delete(UUID arg0) {
 -        return defaultService.delete(arg0);
 +    public DeleteResult delete(UUID uuid) {
 +        return defaultService.delete(uuid);
      }
  
  }