fix #4657

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 73c0052c8ac336b59fb2e42f7a307398fa9e5787..420eaf0b189ad65fc6a3b5c1497af8be9b563f16 100644 (file)
--- 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()))){
                                    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()){
                     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 8b2e195f48b2f43d2dea560099073b2ae6f03f41..a583b3c6e92ce25acdf2abeff40e43145cf8ebba 100644 (file)
--- 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\r
 page.name.32 = Taxon Navigator\r
 page.name.33 = Sort of Taxonnodes\r
 command.name.14 = delete\r
 page.name.32 = Taxon Navigator\r
 page.name.33 = Sort of Taxonnodes\r

+page.name.34 = Debug Preferences\r

 command.name.15 = Open\r
 view.name.SESSIONS = Sessions\r
 command.label.SESSION = Sessions\r
 command.name.15 = Open\r
 view.name.SESSIONS = Sessions\r
 command.label.SESSION = Sessions\r

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 3ba40c85803faa6eb718aaec170a7651a93442d0..2b82b3b32ef99b290bd476a30849689e442fa629 100644 (file)
--- 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.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
 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 3e23d6cc7d54b7e7b1356315bc0543a76f913ac7..768db4a3e12809060043ebf65b24be7937bcba21 100644 (file)
--- 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>
             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"
       <!--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>
             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">
    </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 81278277d0b2f33e10506ee533143393bf6c8485..563b8a8a923cb0aa00f5a04e57c2657ead140708 100644 (file)
--- 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 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
 
     /**
      * 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 e6535e0a88070e062a79ac3649d9ba14cbc24269..eb0928236a306e60d796a0872ae69a842b70501f 100644 (file)
--- 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.RESTORE_NAVIGATOR_STATE,
                        "Restore the last Taxon Navigator state.",
                        getFieldEditorParent()));

-             addField(new BooleanFieldEditor(IPreferenceKeys.IS_DEBUG_MODE,
-                  "Run Taxonomic Editor in Debug Mode.",
-                  getFieldEditorParent()));
+

        }
 
        /*
        }
 
        /*