From 2cb65c58c092e83aa8bf67da358a075bb5a0855d Mon Sep 17 00:00:00 2001
From: Katja Luther <k.luther@bgbm.org>
Date: Tue, 19 Apr 2016 13:15:13 +0200
Subject: [PATCH] short hotfix for wrong dirty flag after change synonym to
 misapplication

---
 .../etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java   | 7 +++++--
 .../editor/name/handler/ChangeToMisapplicationHandler.java | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java
index e58a897b2..0f94566a9 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java
@@ -304,8 +304,11 @@ IDirtyMarkable, IPartContentHasDetails, ISecuredEditor, IPartContentHasMedia {
     @Override
     public void changed(Object element) {
         // setDirty(true);
-        dirty = true;
-        super.editorDirtyStateChanged();
+        if (element != null){
+            dirty = true;
+            super.editorDirtyStateChanged();
+        }
+
         if (element instanceof TaxonBase) {
             TaxonNameEditor page = (TaxonNameEditor) getPage(Page.NAME);
             AbstractGroupedContainer container = page.getContainer((TaxonBase) element);
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeToMisapplicationHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeToMisapplicationHandler.java
index a3b53d358..46f63986f 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeToMisapplicationHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeToMisapplicationHandler.java
@@ -68,7 +68,9 @@ public class ChangeToMisapplicationHandler extends AbstractHandler implements
 						editor.getUndoContext(), editor.getTaxon(), (Synonym) selectedElement, editor);
 			}
 
+
 			EditorUtil.executeOperation(operation);
+
 		} catch (NotDefinedException e) {
 			logger.warn("Command name not set");
 		}
-- 
2.34.1