fixed conflicts from last commit

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java
index 61aeda7085a9a3424211f2b29bf1d2d195950c10..8f2ea5df6ae6d9c50327b8529a9c9247980c455a 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java
@@ -770,19 +770,10 @@ public class TransientAgentService implements IAgentService {
                return defaultService.convertTeam2Person(arg0);
        }
 
                return defaultService.convertTeam2Person(arg0);
        }
 

-<<<<<<< HEAD
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public DeleteResult delete(UUID arg0) {
-        return defaultService.delete(arg0);
-    }
-=======
+

        @Override
        public DeleteResult delete(UUID arg0) {
                return defaultService.delete(arg0);
        }
        @Override
        public DeleteResult delete(UUID arg0) {
                return defaultService.delete(arg0);
        }

->>>>>>> b275ef1... all delete methods need an Uuid as argument

 
 }
 
 }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
index ddab2fa532b33e473e5228edc72177bba056fb73..ff2cdc1e3546e29c0cf355cf3e6754a300849089 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
@@ -1115,7 +1115,6 @@ public class TransientDescriptionService implements IDescriptionService {
            return defaultService.pageNamedAreasInUse(includeAllParents, pageSize, pageNumber);
        }
 
            return defaultService.pageNamedAreasInUse(includeAllParents, pageSize, pageNumber);
        }
 

-<<<<<<< HEAD

     /**
      * {@inheritDoc}
      */
     /**
      * {@inheritDoc}
      */


@@ -1163,10 +1162,4 @@ public class TransientDescriptionService implements IDescriptionService {
     public UpdateResult moveTaxonDescriptions(UUID arg0, UUID arg1) {
         return defaultService.moveTaxonDescriptions(arg0, arg1);
     }
     public UpdateResult moveTaxonDescriptions(UUID arg0, UUID arg1) {
         return defaultService.moveTaxonDescriptions(arg0, arg1);
     }

-=======
-       @Override
-       public DeleteResult delete(UUID arg0) {
-               return defaultService.delete(arg0);
-       }
->>>>>>> b275ef1... all delete methods need an Uuid as argument

 }
 }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
index e01047760b9802924db6460065a8a34b0459b100..14a874037b200fafda1147195dcb9663588e3f83 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
@@ -1164,16 +1164,7 @@ public class TransientNameService implements INameService {
 
                return defaultService.getNameRecords();
        }
 
                return defaultService.getNameRecords();
        }

-<<<<<<< HEAD
-=======

 
 

-       @Override
-       public DeleteResult delete(UUID arg0) {
-               return defaultService.delete(arg0);
-       }
-       
-       
->>>>>>> b275ef1... all delete methods need an Uuid as argument

 
     /**
      * {@inheritDoc}
 
     /**
      * {@inheritDoc}

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 04f1b0cf652504a2f8e96aef8603bbd150afc402..02a3281ffc5532c6ec9f30b11f71489107869612 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
@@ -1056,7 +1056,6 @@ public class TransientOccurenceService implements IOccurrenceService {
            return defaultService.getAllHierarchyDerivatives(specimen);
        }
 
            return defaultService.getAllHierarchyDerivatives(specimen);
        }
 

-<<<<<<< HEAD

     /**
      * {@inheritDoc}
      */
     /**
      * {@inheritDoc}
      */


@@ -1064,11 +1063,6 @@ public class TransientOccurenceService implements IOccurrenceService {
     public DeleteResult delete(UUID arg0) {
         return defaultService.delete(arg0);
     }
     public DeleteResult delete(UUID arg0) {
         return defaultService.delete(arg0);
     }

-=======
-       @Override
-       public DeleteResult delete(UUID arg0) {
-               return defaultService.delete(arg0);
-       }
->>>>>>> b275ef1... all delete methods need an Uuid as argument
+

 
 }
 
 }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java
index e6456b1431a37d5fe006f1d113faa6e3c8bfd842..8be8cc8869e0070edbebe80cbdf95c52ce116579 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java
@@ -710,7 +710,6 @@ public class TransientReferenceService implements IReferenceService {
                return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
        }
 
                return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
        }
 

-<<<<<<< HEAD

     /**
      * {@inheritDoc}
      */
     /**
      * {@inheritDoc}
      */


@@ -718,11 +717,6 @@ public class TransientReferenceService implements IReferenceService {
     public DeleteResult delete(UUID arg0) {
         return defaultService.delete(arg0);
     }
     public DeleteResult delete(UUID arg0) {
         return defaultService.delete(arg0);
     }

-=======
-       @Override
-       public DeleteResult delete(UUID arg0) {
-               return defaultService.delete(arg0);
-       }
->>>>>>> b275ef1... all delete methods need an Uuid as argument
+

 
 }
 
 }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
index 09bc45975ba7d6383e2b9ad9abd04650ba54768b..391c91d176423fae5529237f790ec97a9efcb5f2 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
@@ -1436,7 +1436,7 @@ public class TransientTaxonService implements ITaxonService {
                return defaultService.moveSynonymToAnotherTaxon(oldSynonymRelation, newTaxonUUID, moveHomotypicGroup, newSynonymRelationshipType, reference, referenceDetail, keepReference);
        }
 
                return defaultService.moveSynonymToAnotherTaxon(oldSynonymRelation, newTaxonUUID, moveHomotypicGroup, newSynonymRelationshipType, reference, referenceDetail, keepReference);
        }
 

-<<<<<<< HEAD
+

     /**
      * {@inheritDoc}
      */
     /**
      * {@inheritDoc}
      */


@@ -1452,12 +1452,6 @@ public class TransientTaxonService implements ITaxonService {
     public DeleteResult deleteSynonym(UUID arg0, UUID arg1, SynonymDeletionConfigurator arg2) {
         return defaultService.deleteSynonym(arg0, arg1, arg2);
     }
     public DeleteResult deleteSynonym(UUID arg0, UUID arg1, SynonymDeletionConfigurator arg2) {
         return defaultService.deleteSynonym(arg0, arg1, arg2);
     }

-=======
-       @Override
-       public DeleteResult delete(UUID arg0) {
-               return defaultService.delete(arg0);
-       }
-

 
 
        @Override
 
 
        @Override


@@ -1465,7 +1459,6 @@ public class TransientTaxonService implements ITaxonService {
                return defaultService.moveFactualDateToAnotherTaxon(arg0, arg1);
        }
 
                return defaultService.moveFactualDateToAnotherTaxon(arg0, arg1);
        }
 

->>>>>>> b275ef1... all delete methods need an Uuid as argument

 
     /**
      * {@inheritDoc}
 
     /**
      * {@inheritDoc}

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
index 700b48e1cc9da3b920bab870a461cce11511ea5b..412a7eeb62af94ada431909935d288aab3a0677a 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
@@ -872,7 +872,6 @@ public class TransientTermService implements ITermService {
                return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
        }
 
                return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
        }
 

-<<<<<<< HEAD

     /**
      * {@inheritDoc}
      */
     /**
      * {@inheritDoc}
      */


@@ -880,11 +879,6 @@ public class TransientTermService implements ITermService {
     public DeleteResult delete(UUID arg0) {
         return defaultService.delete(arg0);
     }
     public DeleteResult delete(UUID arg0) {
         return defaultService.delete(arg0);
     }

-=======
-       @Override
-       public DeleteResult delete(UUID arg0) {
-               return defaultService.delete(arg0);
-       }
->>>>>>> b275ef1... all delete methods need an Uuid as argument
+

 
 }
 
 }