Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into
authorPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 30 Nov 2015 09:27:54 +0000 (10:27 +0100)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 30 Nov 2015 09:27:54 +0000 (10:27 +0100)
develop

1  2 
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java

@@@ -1069,22 -1069,12 +1069,30 @@@ public class TransientOccurenceService 
          return defaultService.listDeterminationEvents(arg0, arg1, arg2, arg3, arg4);
      }
  
 -    /**
++<<<<<<< HEAD
 +    @Override
 +    public Collection<TaxonBase<?>> listDeterminedTaxa(SpecimenOrObservationBase<?> arg0, Integer arg1, Integer arg2,
 +            List<OrderHint> arg3, List<String> arg4) {
 +        return defaultService.listDeterminedTaxa(arg0, arg1, arg2, arg3, arg4);
 +    }
 +
 +    @Override
 +    public Collection<TaxonBase<?>> listIndividualsAssociationTaxa(SpecimenOrObservationBase<?> arg0, Integer arg1,
 +            Integer arg2, List<OrderHint> arg3, List<String> arg4) {
 +        return defaultService.listIndividualsAssociationTaxa(arg0, arg1, arg2, arg3, arg4);
 +    }
 +
 +    @Override
 +    public Collection<TaxonBase<?>> listTypeDesignationTaxa(SpecimenOrObservationBase<?> arg0, Integer arg1,
 +            Integer arg2, List<OrderHint> arg3, List<String> arg4) {
 +        return defaultService.listTypeDesignationTaxa(arg0, arg1, arg2, arg3, arg4);
++
++     /**
+      * {@inheritDoc}
+      */
+     @Override
+     public List<SpecimenOrObservationBase> load(List<UUID> arg0, List<String> arg1) {
+         return defaultService.load(arg0, arg1);
      }
  
  }