ref #9533: fix NPE in taxonnode detail element

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 91a114d6007edec864b7906c2df06b40b07cb8e2..464923ff6c523cc0c786eeaad46cb3e428e4c313 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
@@ -138,7 +138,7 @@ public class TaxonNodeDetailElement extends AbstractSingleSourceElement<TaxonNod
                     .createSelectionElement(Taxon.class,//getConversationHolder(),
                             formElement,
                             REUSE_EXISTING_TAXON, null,
-                            EntitySelectionElement.DELETABLE, style);
+                            EntitySelectionElement.SELECTABLE, style);
                selection_reuseExistingTaxon.setIndent(10);
             selection_reuseExistingName = formFactory
                     .createSelectionElement(TaxonName.class,//getConversationHolder(),
@@ -183,7 +183,7 @@ public class TaxonNodeDetailElement extends AbstractSingleSourceElement<TaxonNod
                selection_reuseExistingTaxon = formFactory
                   .createSelectionElement(Taxon.class, formElement,
                           Messages.TaxonNodeWizardPage_TAXON, taxon,
-                          EntitySelectionElement.DELETABLE, SWT.NULL);
+                          EntitySelectionElement.SELECTABLE, SWT.NULL);
 
                selection_reuseExistingTaxon.setIndent(10);
                textTaxonSec = formFactory.createTextWithLabelElement(formElement,SECUNDUM_REFERENCE, "", SWT.NULL);
@@ -344,7 +344,11 @@ public class TaxonNodeDetailElement extends AbstractSingleSourceElement<TaxonNod
                            checkbox_publish.setSelected(getTaxon().isPublish());
                        }
             }else{
-                selection_SecRef.setEntity(null);
+                if (isCreateNew()){
+                    selection_SecRef.setEntity(null);
+                }else{
+                    textTaxonSec.setText(null);
+                }
                 setDefaultPublish();
             }
                    boolean enabled = selection_reuseExistingTaxon.getEntity() == null;
@@ -506,6 +510,7 @@ public class TaxonNodeDetailElement extends AbstractSingleSourceElement<TaxonNod
                                secundum = this.selection_SecRef.getEntity();
                        }
                }
+               textNewTaxonName.setText(taxonName.getTitleCache());
 
        }