merge
authorU-BGBM\k.luther <k.luther@BGBM11732.bgbm.fu-berlin.de>
Tue, 6 Oct 2015 08:58:00 +0000 (10:58 +0200)
committerU-BGBM\k.luther <k.luther@BGBM11732.bgbm.fu-berlin.de>
Tue, 6 Oct 2015 08:58:00 +0000 (10:58 +0200)
1  2 
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.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);
++    }
++
  }
@@@ -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());