From: U-BGBM\k.luther <k.luther@BGBM11732.bgbm.fu-berlin.de>
Date: Tue, 6 Oct 2015 08:58:00 +0000 (+0200)
Subject: merge
X-Git-Tag: 3.12.0^2~121^2
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/c860d200ef52f74bac80408bdaee665a55d25ad9

merge
---

c860d200ef52f74bac80408bdaee665a55d25ad9
diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
index ebcd3128c,b7d278bc0..f5da0dac0
--- 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
@@@ -1179,4 -1180,36 +1180,45 @@@ public class TransientDescriptionServic
          return defaultService.merge(arg0);
      }
  
+     /* (non-Javadoc)
+      * @see eu.etaxonomy.cdm.api.service.IDescriptionService#moveDescriptionElementsToDescription(java.util.Set, java.util.UUID, boolean)
+      */
+     @Override
+     public UpdateResult moveDescriptionElementsToDescription(Set<UUID> arg0, UUID arg1, boolean arg2) {
+         return defaultService.moveDescriptionElementsToDescription(arg0, arg1, arg2);
+     }
+ 
+     /* (non-Javadoc)
+      * @see eu.etaxonomy.cdm.api.service.IDescriptionService#moveDescriptionElementsToDescription(java.util.Set, java.util.UUID, java.lang.String, boolean)
+      */
+     @Override
+     public UpdateResult moveDescriptionElementsToDescription(Set<UUID> arg0, UUID arg1, String arg2, boolean arg3) {
+         return defaultService.moveDescriptionElementsToDescription(arg0, arg1, arg2, arg3);
+     }
+ 
+     /* (non-Javadoc)
+      * @see eu.etaxonomy.cdm.api.service.IService#merge(eu.etaxonomy.cdm.model.common.ICdmBase, boolean)
+      */
+     @Override
+     public DescriptionBase merge(DescriptionBase arg0, boolean arg1) {
+         return defaultService.merge(arg0, arg1);
+     }
+ 
+     /* (non-Javadoc)
+      * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List, boolean)
+      */
+     @Override
+     public List<DescriptionBase> merge(List<DescriptionBase> arg0, boolean arg1) {
+         return defaultService.merge(arg0, arg1);
+     }
+ 
++    /* (non-Javadoc)
++     * @see eu.etaxonomy.cdm.api.service.IDescriptionService#moveTaxonDescription(java.util.UUID, java.util.UUID)
++     */
++    @Override
++    public UpdateResult moveTaxonDescription(UUID arg0, UUID arg1) {
++
++        return defaultService.moveTaxonDescription(arg0, arg1);
++    }
++
  }
diff --cc eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
index a3f665047,cce5f0c6e..d7901d400
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
@@@ -169,12 -169,11 +169,10 @@@ public class TaxonNodeDetailElement ext
  
  
  		} else if (eventSource == selection_reuseExistingName) {
 -			boolean enabled = selection_reuseExistingName.getEntity() == null;
 +			boolean enabled = selection_reuseExistingName.getEntity() == null ;
 +			setTaxon(selection_reuseExistingName.getEntity());
  			selection_reuseExistingTaxon.setEnabled(enabled);
  			textNewTaxonName.setEnabled(enabled);
--
- 			//setTaxon(selection_reuseExistingName.getEntity());
 -			setTaxon(selection_reuseExistingName.getEntity());
  			complete = !textNewTaxonName.getText().isEmpty();
  		} else if (eventSource == textNewTaxonName) {
  			boolean enabled = CdmUtils.isBlank(textNewTaxonName.getText());