#5247 Fix duplicate entity issue for new entities by using the new merge service...

[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 4ecb1498349d730772c315404ba17210eeacc432..56bd34ca6e2ce21118b42e42b59ea666f0689bd7 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
@@ -10,6 +10,8 @@
 
 package eu.etaxonomy.taxeditor.editor.key.polytomous;
 
+import java.util.List;
+
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.action.GroupMarker;
 import org.eclipse.jface.action.MenuManager;
@@ -171,7 +173,6 @@ public class PolytomousKeyListEditor extends EditorPart implements
         */
        @Override
        public void doSave(IProgressMonitor monitor) {
-
        }
 
        /*
@@ -311,19 +312,18 @@ public class PolytomousKeyListEditor extends EditorPart implements
         */
        @Override
        public void changed(Object element) {
-           if(element != null) {
-               viewer.update(element, null);
-           }
-
-               if (element instanceof PolytomousKeyNode) {
-                       PolytomousKeyNode node = (PolytomousKeyNode) element;
-                       viewer.update(node, null);
-                       for (PolytomousKeyNode child : node.getChildren()) {
-                               viewer.update(child, null);
-                       }
+        if(element != null) {
+            viewer.update(element, null);
+        }
 
-               }
-               viewer.refresh();
+        if (element instanceof PolytomousKeyNode) {
+            List<PolytomousKeyNode> children = ((PolytomousKeyNode) element)
+                    .getParent().getChildren();
+            for (PolytomousKeyNode child : children) {
+                viewer.update(child, null);
+            }
+        }
+        viewer.refresh();
        }
 
     /* (non-Javadoc)