From 9d0bce28c9d4d3e59d8692bc010da5fdd9f0ea20 Mon Sep 17 00:00:00 2001
From: Katja Luther <k.luther@bgbm.org>
Date: Fri, 1 Apr 2016 11:09:18 +0200
Subject: [PATCH] fix #4657

---
 .../taxeditor/ApplicationWorkbenchAdvisor.java         | 10 ++++++++--
 .../OSGI-INF/l10n/bundle.properties                    |  1 +
 .../OSGI-INF/l10n/bundle_de.properties                 |  1 +
 eu.etaxonomy.taxeditor.store/plugin.xml                |  7 +++++++
 .../eu/etaxonomy/taxeditor/model/MessagingUtils.java   |  1 +
 .../preference/TaxonomicEditorGeneralPreferences.java  |  4 +---
 6 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java
index 73c0052c8..420eaf0b1 100644
--- a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java
+++ b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java
@@ -135,9 +135,15 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
 		    	            true);
 
 		    	} else if (t != null && ("Widget is disposed".equals(t.getMessage()))){
-                    MessagingUtils.warn(this.getClass(), t.getMessage());
+                    MessagingUtils.warn(this.getClass(), t);
                     if (PreferencesUtil.isDebugMode()){
-                        MessagingUtils.warningDialog("Widget is disposed", null, t.getMessage());
+                        MessagingUtils.errorDialog("Widget is disposed",
+                                null,
+                                MessagingUtils.WIDGET_IS_DISPOSED_MESSAGE,
+                                statusAdapter.getStatus().getPlugin(),
+                                t,
+                                true);
+
                     }
                 }
 		    }
diff --git a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
index 8b2e195f4..a583b3c6e 100644
--- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
+++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
@@ -157,6 +157,7 @@ command.name.13 = delete
 command.name.14 = delete
 page.name.32 = Taxon Navigator
 page.name.33 = Sort of Taxonnodes
+page.name.34 = Debug Preferences
 command.name.15 = Open
 view.name.SESSIONS = Sessions
 command.label.SESSION = Sessions
diff --git a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties
index 3ba40c858..2b82b3b32 100644
--- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties
+++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties
@@ -131,6 +131,7 @@ page.name.29 = Editor Profil
 page.name.30 = Sprache
 page.name.32 = Taxon Navigator
 page.name.33 = Sortierung im TaxonNavigator
+page.name.34 = Debug Einstellungen
 command.label.clone = Klonen
 command.label.openInSpecimenEditor = \u00d6ffnen im Specimen-Editor
 page.name.31 = Taxon-Node-Reihenfolge
diff --git a/eu.etaxonomy.taxeditor.store/plugin.xml b/eu.etaxonomy.taxeditor.store/plugin.xml
index 3e23d6cc7..768db4a3e 100644
--- a/eu.etaxonomy.taxeditor.store/plugin.xml
+++ b/eu.etaxonomy.taxeditor.store/plugin.xml
@@ -39,6 +39,7 @@
             id="eu.etaxonomy.taxeditor.preferences.nomenclatural"
             name="%page.name.4">
       </page>
+     
       <!--page
             class="eu.etaxonomy.taxeditor.store.preference.CdmPreferences"
             id="eu.etaxonomy.taxeditor.preferences.cdm"
@@ -212,6 +213,12 @@
             id="eu.etaxonomy.taxeditor.preference.TaxonNavigator"
             name="%page.name.32">
       </page>
+       <page
+            category="eu.etaxonomy.taxeditor.preferences.general"
+            class="eu.etaxonomy.taxeditor.preference.DebugPreferences"
+            id="eu.etaxonomy.taxeditor.preferences.debug"
+            name="%page.name.34">
+      </page>
    </extension>
    <extension
          point="org.eclipse.ui.views">
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/MessagingUtils.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/MessagingUtils.java
index 81278277d..563b8a8a9 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/MessagingUtils.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/MessagingUtils.java
@@ -33,6 +33,7 @@ public class MessagingUtils {
     public final static String DEFAULT_MESSAGE = "Error thrown but no associated message";
     public final static String CONNECTION_FAILURE_MESSAGE = "The connection to the remote server has been broken";
     public final static String REMOTE_ACCESS_FAILURE_MESSAGE = "Problem accessing remote server";
+    public static final String WIDGET_IS_DISPOSED_MESSAGE = "A widget was called, which was already disposed";
 
     /**
      * Gets the Log4J logger for a given class
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicEditorGeneralPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicEditorGeneralPreferences.java
index e6535e0a8..eb0928236 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicEditorGeneralPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicEditorGeneralPreferences.java
@@ -66,9 +66,7 @@ public class TaxonomicEditorGeneralPreferences extends
 	      addField(new BooleanFieldEditor(IPreferenceKeys.RESTORE_NAVIGATOR_STATE,
 	                "Restore the last Taxon Navigator state.",
 	                getFieldEditorParent()));
-	      addField(new BooleanFieldEditor(IPreferenceKeys.IS_DEBUG_MODE,
-                  "Run Taxonomic Editor in Debug Mode.",
-                  getFieldEditorParent()));
+
 	}
 
 	/*
-- 
2.34.1