Finalizing PolytomousKeyListEditor

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / key / PolytomousKeyNodeDetailElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailElement.java
index b17833e5e51a910bed3de0889b853073dacd6259..2b004eaa0d2dffb656d205c7806404ae5410715f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailElement.java
@@ -55,17 +55,17 @@ public class PolytomousKeyNodeDetailElement extends
 
                        element_question = formFactory.createKeyStatementElement(
                                        formElement, "Question", parent.getQuestion(), 50, style);
+
+                       selection_feature = (FeatureSelectionElement) formFactory
+                                       .createSelectionElement(SelectionType.FEATURE,
+                                                       getConversationHolder(), formElement, "Feature",
+                                                       parent.getFeature(),
+                                                       FeatureSelectionElement.DEFAULT, style);
                }
 
                element_statement = formFactory.createKeyStatementElement(formElement,
                                "Statement", entity.getStatement(), 50, style);
 
-               selection_feature = (FeatureSelectionElement) formFactory
-                               .createSelectionElement(SelectionType.FEATURE,
-                                               getConversationHolder(), formElement, "Feature",
-                                               entity.getFeature(), FeatureSelectionElement.DEFAULT,
-                                               style);
-
                if (entity.isLeaf()) {
                        selection_taxon = (TaxonSelectionElement) formFactory
                                        .createSelectionElement(SelectionType.TAXON,
@@ -106,7 +106,7 @@ public class PolytomousKeyNodeDetailElement extends
                } else if (eventSource == element_statement) {
                        getEntity().setStatement(element_statement.getKeyStatement());
                } else if (eventSource == selection_feature) {
-                       getEntity().setFeature(selection_feature.getEntity());
+                       getEntity().getParent().setFeature(selection_feature.getEntity());
                } else if (eventSource == selection_taxon) {
                        getEntity().setTaxon(selection_taxon.getEntity());
                } else if (eventSource == selection_subkey) {