From: Katja Luther <k.luther@bgbm.org>
Date: Tue, 6 Oct 2015 09:15:05 +0000 (+0200)
Subject: merge branches
X-Git-Tag: 3.12.0^2~121
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/5395d49ac396894e59033867499b07692d77d218

merge branches
---

5395d49ac396894e59033867499b07692d77d218
diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
index eed62fa60,f5da0dac0..f0dd1d0ee
--- 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
@@@ -1214,14 -1213,12 +1214,15 @@@ public class TransientDescriptionServic
      }
  
      /* (non-Javadoc)
 -     * @see eu.etaxonomy.cdm.api.service.IDescriptionService#moveTaxonDescription(java.util.UUID, java.util.UUID)
 +     * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List, boolean)
       */
      @Override
 -    public UpdateResult moveTaxonDescription(UUID arg0, UUID arg1) {
 +    public List<DescriptionBase> merge(List<DescriptionBase> arg0, boolean arg1) {
  
 -        return defaultService.moveTaxonDescription(arg0, arg1);
 +        return defaultService.merge(arg0, arg1);
      }
  
 +
 +
++
  }
diff --cc eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
index b9d7b8a0b,d7901d400..869801d2a
--- 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,13 -169,10 +169,13 @@@ public class TaxonNodeDetailElement ext
  
  
  		} else if (eventSource == selection_reuseExistingName) {
- 
- 			boolean enabled = selection_reuseExistingName.getEntity() == null;
 -			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());
++
  			complete = !textNewTaxonName.getText().isEmpty();
  		} else if (eventSource == textNewTaxonName) {
  			boolean enabled = CdmUtils.isBlank(textNewTaxonName.getText());