Merge branch 'release/3.12.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / classification / TaxonNodeDetailElement.java

diff --git 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
index 937f8b502fd46f661359df5a7ffbb4672cdac0bd..037e7c75b273fab57cb75a446d55be2c28fe7008 100644 (file)
--- 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
@@ -276,17 +276,19 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<ITaxonTreeN
                if (getParentTreeNode() != null) {
                        if (this.secReference != null){
                                secundum = this.secReference;
-                       } else if (getParentTreeNode() instanceof Classification) {
+                       } /*else if (getParentTreeNode() instanceof Classification) {
                                secundum = ((Classification) getParentTreeNode())
                                                .getReference();
                        } else if (getParentTreeNode() instanceof TaxonNode) {
                                secundum = ((TaxonNode) getParentTreeNode()).getTaxon()
                                                .getSec();
-                       }
+                       }*/
                }
                if (taxonName != null){
                    taxon = Taxon.NewInstance(taxonName, secundum);
-                   textNewTaxonName.setText(taxonName.getTitleCache());
+                   if (!taxonName.getTitleCache().trim().equals(textNewTaxonName.getText().trim())){
+                       textNewTaxonName.setText(taxonName.getTitleCache());
+                   }
                } else {
                    textNewTaxonName.setText(null);
                }