(no commit message)

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 63d3eb8ebe0351c6033cde568d27cc8263edb848..ef62280fd66ebcf494a876366187cd56be29214c 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
@@ -11,6 +11,7 @@ package eu.etaxonomy.taxeditor.editor.view.dataimport.transientServices;
 
 import java.io.IOException;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -1149,10 +1150,22 @@ public class TransientNameService implements INameService {
                return defaultService.findWithoutFlush(uuid);
        }
        
+       
+
        @Override
        public <S extends TaxonNameBase>  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 List<HashMap<String, String>> getNameRecords() {
+               
+               return defaultService.getNameRecords();
+       }
+       
+
+
 
 }

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 a507e21147cccd1d773e2ad1142aa78206742ba8..bd3bd711494a32dbd0cc3c05386b4381407c3736 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
@@ -1418,6 +1418,23 @@ public class TransientTaxonService implements ITaxonService {
            return defaultService.findByIdentifier(clazz, identifier, identifierType, subtreeFilter, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
        }
 
+       
+
+       
+
+
+
+       @Override
+       public SynonymRelationship moveSynonymToAnotherTaxon(
+                       SynonymRelationship oldSynonymRelation, UUID newTaxonUUID,
+                       boolean moveHomotypicGroup,
+                       SynonymRelationshipType newSynonymRelationshipType,
+                       Reference reference, String referenceDetail, boolean keepReference)
+                       throws HomotypicalGroupChangeException {
+               
+               return defaultService.moveSynonymToAnotherTaxon(oldSynonymRelation, newTaxonUUID, moveHomotypicGroup, newSynonymRelationshipType, reference, referenceDetail, keepReference);
+       }
+
 
 
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailElement.java
index 4c82b614038b65cecc6446b93a5b177bc3d616ac..b5d8ec62682e3981c11712ea6db8b2835def3df9 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailElement.java
@@ -9,6 +9,8 @@
 */\r
 package eu.etaxonomy.taxeditor.ui.section.vocabulary;\r
 \r
+import org.apache.commons.lang.StringUtils;\r
+\r
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;\r
@@ -46,7 +48,7 @@ public class DefinedTermDetailElement<T extends DefinedTermBase> extends Abstrac
        public void handleEvent(Object eventSource) {\r
                handleRepresentation(eventSource);\r
                if(eventSource==textIdInVocabulary){\r
-                       if (textIdInVocabulary.getText().equals("")){\r
+                       if (StringUtils.isBlank(textIdInVocabulary.getText())){\r
                                getEntity().setIdInVocabulary(null);\r
                        }else{\r
                                getEntity().setIdInVocabulary(textIdInVocabulary.getText());\r