From: Cherian Mathew <c.mathew@bgbm.org>
Date: Mon, 22 Jun 2015 09:31:26 +0000 (+0200)
Subject: fixed conflicts from last commit
X-Git-Tag: 3.7.0~1^2~61
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/1706bc52d965cc1bd54ab70c5c28d3cfc1aeab12

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 61aeda708..8f2ea5df6 100644
--- 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);
 	}
 
-<<<<<<< HEAD
-    /**
-     * {@inheritDoc}
-     */
-    @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 ddab2fa53..ff2cdc1e3 100644
--- 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);
 	}
 
-<<<<<<< HEAD
     /**
      * {@inheritDoc}
      */
@@ -1163,10 +1162,4 @@ public class TransientDescriptionService implements IDescriptionService {
     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 e01047760..14a874037 100644
--- 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();
 	}
-<<<<<<< HEAD
-=======
 
-	@Override
-	public DeleteResult delete(UUID arg0) {
-		return defaultService.delete(arg0);
-	}
-	
-	
->>>>>>> b275ef1... all delete methods need an Uuid as argument
 
     /**
      * {@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 04f1b0cf6..02a3281ff 100644
--- 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);
 	}
 
-<<<<<<< HEAD
     /**
      * {@inheritDoc}
      */
@@ -1064,11 +1063,6 @@ public class TransientOccurenceService implements IOccurrenceService {
     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 e6456b143..8be8cc886 100644
--- 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);
 	}
 
-<<<<<<< HEAD
     /**
      * {@inheritDoc}
      */
@@ -718,11 +717,6 @@ public class TransientReferenceService implements IReferenceService {
     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 09bc45975..391c91d17 100644
--- 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);
 	}
 
-<<<<<<< HEAD
+
     /**
      * {@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);
     }
-=======
-	@Override
-	public DeleteResult delete(UUID arg0) {
-		return defaultService.delete(arg0);
-	}
-
 
 
 	@Override
@@ -1465,7 +1459,6 @@ public class TransientTaxonService implements ITaxonService {
 		return defaultService.moveFactualDateToAnotherTaxon(arg0, arg1);
 	}
 
->>>>>>> b275ef1... all delete methods need an Uuid as argument
 
     /**
      * {@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 700b48e1c..412a7eeb6 100644
--- 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);
 	}
 
-<<<<<<< HEAD
     /**
      * {@inheritDoc}
      */
@@ -880,11 +879,6 @@ public class TransientTermService implements ITermService {
     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
+
 
 }