Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

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

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 4aff3590bd3c6d2bc34e864ec544e55c52bbbc70..52545c1470d6c62630175ae68733db6c8e269b58 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
@@ -1,12 +1,12 @@
 // $Id$
 /**
-* Copyright (C) 2013 EDIT
-* European Distributed Institute of Taxonomy
-* http://www.e-taxonomy.eu
-*
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
+ * Copyright (C) 2013 EDIT
+ * European Distributed Institute of Taxonomy
+ * http://www.e-taxonomy.eu
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1
+ * See LICENSE.TXT at the top of this package for the full license terms.
+ */
 package eu.etaxonomy.taxeditor.editor.view.dataimport.transientServices;
 
 import java.net.URI;
@@ -846,11 +846,11 @@ public class TransientTermService implements ITermService {
         return defaultService.findByIdInVocabulary(id, vocabularyUuid, clazz);
     }
 
-       @Override
-       public DeleteResult isDeletable(DefinedTermBase object,
-                       DeleteConfiguratorBase config) {
-               return defaultService.isDeletable(object, config);
-       }
+    @Override
+    public DeleteResult isDeletable(DefinedTermBase object,
+            DeleteConfiguratorBase config) {
+        return defaultService.isDeletable(object, config);
+    }
 
     /* (non-Javadoc)
      * @see eu.etaxonomy.cdm.api.service.ITermService#listByTermType(eu.etaxonomy.cdm.model.common.TermType, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
@@ -861,16 +861,16 @@ public class TransientTermService implements ITermService {
         return defaultService.listByTermType(termType, limit, start, orderHints, propertyPaths);
     }
 
-       @Override
-       public DefinedTermBase findWithoutFlush(UUID uuid) {
-               return defaultService.findWithoutFlush(uuid);
-       }
+    @Override
+    public DefinedTermBase findWithoutFlush(UUID uuid) {
+        return defaultService.findWithoutFlush(uuid);
+    }
 
 
-       @Override
-       public <S extends DefinedTermBase>  Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
-               return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
-       }
+    @Override
+    public <S extends DefinedTermBase>  Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
+        return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
+    }
 
     /* (non-Javadoc)
      * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)