From ea8a5aa23f73340312c1d094997e7f87c3b82fc6 Mon Sep 17 00:00:00 2001 From: Cherian Mathew Date: Tue, 23 Jun 2015 13:01:02 +0200 Subject: [PATCH] Fix issues with merge conflicts --- .../transientServices/TransientClassificationService.java | 8 ++++++++ .../transientServices/TransientCollectionService.java | 5 +---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java index 5e33668e5..3279e09ff 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java @@ -942,5 +942,13 @@ public class TransientClassificationService implements IClassificationService { return defaultService.createHierarchyInClassification(arg1, arg2); } + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID) + */ + @Override + public DeleteResult delete(UUID arg0) { + return defaultService.delete(arg0); + } + } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java index bfd484b5e..fccff4b0e 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java @@ -704,12 +704,9 @@ public class TransientCollectionService implements ICollectionService { return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths); } -<<<<<<< Updated upstream @Override public DeleteResult delete(UUID arg0) { - return defaultService.delete(arg0); } -======= ->>>>>>> Stashed changes + } -- 2.34.1