From da1d3851d9a8b4a4e902c04cbc09a3290bc105e0 Mon Sep 17 00:00:00 2001
From: Cherian Mathew <c.mathew@bgbm.org>
Date: Thu, 27 Aug 2015 18:11:02 +0200
Subject: [PATCH] #5009 Fix post polytomous key delete operation event handling

---
 .../navigation/key/polytomous/PolytomousKeyViewPart.java      | 4 ++--
 .../operation/RemotingDeletePolytomousKeyOperation.java       | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyViewPart.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyViewPart.java
index 643d3aa8e..e6757a31b 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyViewPart.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyViewPart.java
@@ -318,8 +318,8 @@ public class PolytomousKeyViewPart extends ViewPart implements
      */
     @Override
     public void onChange(CdmChangeEvent event) {
-        if(event.getSourceType().equals(PolytomousKeyViewPart.class) && event.getAction() == Action.Delete) {
-            viewer.refresh();
+        if(event.getAction() == Action.Delete && PolytomousKey.class.equals(event.getEntityType())) {
+            refresh();
         }
 
     }
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/operation/RemotingDeletePolytomousKeyOperation.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/operation/RemotingDeletePolytomousKeyOperation.java
index d001dc69f..6551fe3b2 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/operation/RemotingDeletePolytomousKeyOperation.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/operation/RemotingDeletePolytomousKeyOperation.java
@@ -18,6 +18,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import eu.etaxonomy.cdm.api.application.CdmChangeEvent.Action;
 import eu.etaxonomy.cdm.api.service.IPolytomousKeyService;
 import eu.etaxonomy.cdm.api.service.UpdateResult;
+import eu.etaxonomy.cdm.model.description.PolytomousKey;
 import eu.etaxonomy.taxeditor.operation.RemotingCdmUpdateOperation;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
@@ -49,6 +50,7 @@ public class RemotingDeletePolytomousKeyOperation extends RemotingCdmUpdateOpera
      */
     @Override
     protected UpdateResult doUpdateExecute(IProgressMonitor monitor, IAdaptable info) throws Exception {
+        entityType = PolytomousKey.class;
         return CdmStore.getService(IPolytomousKeyService.class).delete(keysToDelete);
     }
 
-- 
2.34.1