merge-update from trunk

diff --combined eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
index f4ce443e403aec550768ea748cf13248902ab0e0,77402df6a1a8f7cd0277cf3ec93bb8f51f651e96..94900067a4b7a2f02bc001e9848e6f03dc63147d
--- 1/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
--- 2/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
@@@ -27,10 -27,10 +27,11 @@@ import org.hibernate.search.spatial.imp
  
  import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
  import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException;
+ import eu.etaxonomy.cdm.api.service.DeleteResult;
  import eu.etaxonomy.cdm.api.service.IOccurrenceService;
  import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
  import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
 +import eu.etaxonomy.cdm.api.service.dto.DerivateHierarchyDTO;
  import eu.etaxonomy.cdm.api.service.pager.Pager;
  import eu.etaxonomy.cdm.api.service.search.SearchResult;
  import eu.etaxonomy.cdm.api.service.util.TaxonRelationshipEdge;
@@@ -277,7 -277,7 +278,7 @@@ public class TransientOccurenceService 
       * @see eu.etaxonomy.cdm.api.service.IService#delete(eu.etaxonomy.cdm.model.common.ICdmBase)
       */
      @Override
-     public String delete(SpecimenOrObservationBase persistentObject) {
+     public DeleteResult delete(SpecimenOrObservationBase persistentObject) {
          return defaultService.delete(persistentObject);
      }
  
@@@ -914,24 -914,4 +915,24 @@@
                return defaultService.findWithoutFlush(uuid);
        }
  
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#listFieldUnitsByAssociatedTaxon(java.util.Set, eu.etaxonomy.cdm.model.taxon.Taxon, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
 +     */
 +    @Override
 +    public Collection<FieldUnit> listFieldUnitsByAssociatedTaxon(Set<TaxonRelationshipEdge> includeRelationships,
 +            Taxon associatedTaxon, Integer maxDepth, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints,
 +            List<String> propertyPaths) {
 +        return defaultService.listFieldUnitsByAssociatedTaxon(includeRelationships, associatedTaxon, maxDepth, pageSize, pageNumber, orderHints, propertyPaths);
 +    }
 +
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#listDerivateHierarchyDTOsByAssociatedTaxon(java.util.Set, eu.etaxonomy.cdm.model.taxon.Taxon, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
 +     */
 +    @Override
 +    public Collection<DerivateHierarchyDTO> listDerivateHierarchyDTOsByAssociatedTaxon(
 +            Set<TaxonRelationshipEdge> includeRelationships, Taxon associatedTaxon, Integer maxDepth, Integer pageSize,
 +            Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
 +        return defaultService.listDerivateHierarchyDTOsByAssociatedTaxon(includeRelationships, associatedTaxon, maxDepth, pageSize, pageNumber, orderHints, propertyPaths);
 +    }
 +
  }