Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / main / java / eu / etaxonomy / taxeditor / editor / view / dataimport / transientServices / TransientOccurenceService.java

diff --git a/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
index 73c3b517fa7388ba391dcd246d1c7bc859e9d096..d1acdcdc10d48cca113dba3a121920ffc6ad9a67 100644 (file)
--- a/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
@@ -1069,6 +1069,7 @@ public class TransientOccurenceService implements IOccurrenceService {
         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) {
@@ -1085,6 +1086,13 @@ public class TransientOccurenceService implements IOccurrenceService {
     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);
     }
 
 }