Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

Conflicts:
	eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java

diff --combined eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
index 0a0c9ee283d90fe14e0eaa3bb622681b15ebd1d0,f0d19008105c9d231898f38a8e8830933847ab34..e60f85b87a682d0f53769669be6df783d3586597
--- 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
@@@ -57,6 -57,7 +57,7 @@@ import eu.etaxonomy.cdm.model.media.Med
  import eu.etaxonomy.cdm.model.media.Rights;
  import eu.etaxonomy.cdm.model.molecular.DnaSample;
  import eu.etaxonomy.cdm.model.molecular.Sequence;
+ import eu.etaxonomy.cdm.model.molecular.SingleRead;
  import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
  import eu.etaxonomy.cdm.model.occurrence.DerivationEvent;
  import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
@@@ -836,51 -837,25 +837,25 @@@ public class TransientOccurenceService 
          return defaultService.list(example, includeProperties, limit, start, orderHints, propertyPaths);
      }
  
-     /**
-      * @param clazz
-      * @param matchStrategy
-      * @param mergeStrategy
-      * @return
-      * @see eu.etaxonomy.cdm.api.service.IIdentifiableEntityService#deduplicate(java.lang.Class, eu.etaxonomy.cdm.strategy.match.IMatchStrategy, eu.etaxonomy.cdm.strategy.merge.IMergeStrategy)
-      */
      @Override
      public int deduplicate(Class<? extends SpecimenOrObservationBase> clazz, IMatchStrategy matchStrategy, IMergeStrategy mergeStrategy) {
          return defaultService.deduplicate(clazz, matchStrategy, mergeStrategy);
      }
  
-     /**
-      * @param clazz
-      * @param queryString
-      * @param pageSize
-      * @param pageNumber
-      * @param orderHints
-      * @param matchMode
-      * @return
-      * @see eu.etaxonomy.cdm.api.service.IIdentifiableEntityService#findTitleCache(java.lang.Class, java.lang.String, java.lang.Integer, java.lang.Integer, java.util.List, eu.etaxonomy.cdm.persistence.query.MatchMode)
-      */
      @Override
      public Pager<SpecimenOrObservationBase> findTitleCache(Class<? extends SpecimenOrObservationBase> clazz, String queryString, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, MatchMode matchMode) {
          return defaultService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode);
      }
  
-     /**
-      * @return
-      */
      public Collection<SpecimenOrObservationBase<?>> getUnits() {
          return units;
      }
  
-     /* (non-Javadoc)
-      * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#getFieldUnits(java.util.UUID)
-      */
      @Override
      public Collection<FieldUnit> getFieldUnits(UUID derivedUnitUuid) {
          return defaultService.getFieldUnits(derivedUnitUuid);
      }
  
-     /* (non-Javadoc)
-      * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#pageByAssociatedTaxon(java.lang.Class, java.util.Set, java.lang.String, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
-      */
      @Override
      public <T extends SpecimenOrObservationBase> Pager<T> pageByAssociatedTaxon(Class<T> type,
              Set<TaxonRelationshipEdge> includeRelationships, String taxonUUID, Integer maxDepth, Integer pageSize,
@@@ -889,17 -864,11 +864,11 @@@
                  maxDepth, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
-     /* (non-Javadoc)
-      * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#moveDerivate(eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase, eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase, eu.etaxonomy.cdm.model.occurrence.DerivedUnit)
-      */
      @Override
      public boolean moveDerivate(SpecimenOrObservationBase<?> from, SpecimenOrObservationBase<?> to, DerivedUnit derivate) {
          return defaultService.moveDerivate(from, to, derivate);
      }
  
-     /* (non-Javadoc)
-      * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#moveSequence(eu.etaxonomy.cdm.model.molecular.DnaSample, eu.etaxonomy.cdm.model.molecular.DnaSample, eu.etaxonomy.cdm.model.molecular.Sequence)
-      */
      @Override
      public boolean moveSequence(DnaSample from, DnaSample to, Sequence sequence) {
          return defaultService.moveSequence(from, to, sequence);
@@@ -911,9 -880,6 +880,6 @@@
                return defaultService.isDeletable(object, config);
        }
  
-     /* (non-Javadoc)
-      * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#countDeterminations(eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase, eu.etaxonomy.cdm.model.taxon.TaxonBase)
-      */
      @Override
      public int countDeterminations(SpecimenOrObservationBase occurence, TaxonBase taxonbase) {
          return defaultService.countDeterminations(occurence, taxonbase);
@@@ -938,17 -904,11 +904,11 @@@
        }
  
  
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#assembleFieldUnitDTO(eu.etaxonomy.cdm.model.occurrence.FieldUnit, java.util.UUID)
-        */
        @Override
        public FieldUnitDTO assembleFieldUnitDTO(FieldUnit fieldUnit, UUID associatedTaxonUuid) {
            return defaultService.assembleFieldUnitDTO(fieldUnit, associatedTaxonUuid);
        }
  
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#assemblePreservedSpecimenDTO(eu.etaxonomy.cdm.model.occurrence.DerivedUnit)
-        */
        @Override
        public PreservedSpecimenDTO assemblePreservedSpecimenDTO(DerivedUnit derivedUnit) {
            return defaultService.assemblePreservedSpecimenDTO(derivedUnit);
@@@ -959,43 -919,28 +919,28 @@@
          return defaultService.getNonCascadedAssociatedElements(specimen);
      }
  
-     /* (non-Javadoc)
-      * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#deleteDerivateHierarchy(eu.etaxonomy.cdm.model.common.ICdmBase)
-      */
      @Override
      public DeleteResult deleteDerivateHierarchy(CdmBase from, SpecimenDeleteConfigurator config) {
          return defaultService.deleteDerivateHierarchy(from, config);
      }
  
-     /* (non-Javadoc)
-      * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#delete(eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase, eu.etaxonomy.cdm.api.service.config.SpecimenDeleteConfigurator)
-      */
      @Override
      public DeleteResult delete(SpecimenOrObservationBase<?> specimen, SpecimenDeleteConfigurator config) {
          return defaultService.delete(specimen, config);
      }
  
-     /* (non-Javadoc)
-      * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#listIndividualsAssociations(eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
-      */
      @Override
      public Collection<IndividualsAssociation> listIndividualsAssociations(SpecimenOrObservationBase<?> specimen,
              Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
          return defaultService.listIndividualsAssociations(specimen, limit, start, orderHints, propertyPaths);
      }
  
-     /* (non-Javadoc)
-      * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#listTypeDesignations(eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
-      */
      @Override
      public Collection<SpecimenTypeDesignation> listTypeDesignations(SpecimenOrObservationBase<?> specimen,
              Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
          return defaultService.listTypeDesignations(specimen, limit, start, orderHints, propertyPaths);
      }
  
-     /* (non-Javadoc)
-      * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#listDescriptionsWithDescriptionSpecimen(eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
-      */
      @Override
      public Collection<DescriptionBase<?>> listDescriptionsWithDescriptionSpecimen(
              SpecimenOrObservationBase<?> specimen, Integer limit, Integer start, List<OrderHint> orderHints,
@@@ -1008,33 -953,21 +953,21 @@@
                return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
        }
  
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#getCharacterDataForSpecimen(eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase)
-        */
        @Override
        public Collection<DescriptionElementBase> getCharacterDataForSpecimen(SpecimenOrObservationBase<?> arg0) {
            return defaultService.getCharacterDataForSpecimen(arg0);
        }
  
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#getCharacterDataForSpecimen(java.util.UUID)
-        */
        @Override
        public Collection<DescriptionElementBase> getCharacterDataForSpecimen(UUID arg0) {
            return getCharacterDataForSpecimen(arg0);
        }
  
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#getMostSignificantIdentifier(eu.etaxonomy.cdm.model.occurrence.DerivedUnit)
-        */
        @Override
        public String getMostSignificantIdentifier(DerivedUnit derivedUnit) {
            return defaultService.getMostSignificantIdentifier(derivedUnit);
        }
  
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#countOccurrences(eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator)
-        */
        @Override
        public int countOccurrences(IIdentifiableEntityServiceConfigurator<SpecimenOrObservationBase> config) {
            return defaultService.countOccurrences(config);
@@@ -1065,14 -998,16 +998,16 @@@
          return defaultService.delete(uuid);
      }
  
-     /* (non-Javadoc)
-      * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.Collection)
-      */
      @Override
      public DeleteResult delete(Collection<UUID> arg0) {
          return defaultService.delete(arg0);
      }
  
+     @Override
+     public DeleteResult deleteSingleRead(SingleRead singleRead, Sequence sequence){
+         return defaultService.deleteSingleRead(singleRead, sequence);
+     }
+ 
      /* (non-Javadoc)
       * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List)
       */
@@@ -1081,4 -1016,5 +1016,4 @@@
          return defaultService.merge(arg0);
      }
  
 -
  }