Merge branch 'develop' into remoting-4.0

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / main / java / eu / etaxonomy / taxeditor / editor / key / polytomous / PolytomousKeyListEditor.java

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyListEditor.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyListEditor.java
index dc81964bcb980a3f797810c654c7f6c6b073264f..7b8fb00a58da47b6e36d9cbf548dbbd7fa5ba0f5 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyListEditor.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyListEditor.java
@@ -250,7 +250,7 @@ public class PolytomousKeyListEditor extends EditorPart implements
 
                setPartName(key.getTitleCache());
 
-               viewer.setInput(key);
+               viewer.setInput(getEditorInput());
        }
 
        public int getTableItemCount() {
@@ -262,7 +262,7 @@ public class PolytomousKeyListEditor extends EditorPart implements
        }
 
        public PolytomousKey getViewerInputKey() {
-           return (PolytomousKey) viewer.getInput();
+           return ((PolytomousKeyEditorInput) viewer.getInput()).getKey();
        }
        private void createMenu() {
                // register context menu
@@ -320,11 +320,14 @@ public class PolytomousKeyListEditor extends EditorPart implements
                if (element instanceof PolytomousKeyNode) {
                        List<PolytomousKeyNode> children = ((PolytomousKeyNode) element)
                                        .getParent().getChildren();
+                       viewer.update(((PolytomousKeyNode) element)
+                    .getParent(), null);
                        for (PolytomousKeyNode child : children) {
                                viewer.update(child, null);
                        }
-               }
 
+               }
+               viewer.refresh();
        }
 
     /* (non-Javadoc)