Fix initialization problems for preferences and editor input

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenDerivateViewHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenDerivateViewHandler.java
index aff2935620f5a99c002d8eaa4637624e0df2fd02..9094200090805c610265ff7987a10c49498462d7 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenDerivateViewHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenDerivateViewHandler.java
@@ -24,8 +24,13 @@ public class OpenDerivateViewHandler extends AbstractHandler {
     @Override
     public Object execute(ExecutionEvent event) throws ExecutionException {
         Set<UUID> selectedElementUUIDs = new HashSet<UUID>();
     @Override
     public Object execute(ExecutionEvent event) throws ExecutionException {
         Set<UUID> selectedElementUUIDs = new HashSet<UUID>();

+        Object parameter;

         //check if parameter is set
         //check if parameter is set

-        Object parameter = event.getObjectParameterForExecution("eu.etaxonomy.taxeditor.specimenUuidParameter");
+        try {
+            parameter = event.getObjectParameterForExecution("eu.etaxonomy.taxeditor.specimenUuidParameter");
+        } catch (ExecutionException e) {
+            parameter = null;
+        }

         if(parameter instanceof UUID){
             selectedElementUUIDs.add((UUID) parameter);
         }
         if(parameter instanceof UUID){
             selectedElementUUIDs.add((UUID) parameter);
         }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java
index 41de8fd8e27a1ae0b635a955b06847f80c02e21b..ee6ef1021a8651f5d1387e1cab6a2e02eccada5c 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java
@@ -125,7 +125,8 @@ public class NewDerivedUnitBaseWizard extends AbstractNewEntityWizard<SpecimenOr
      */
     @Override
     public boolean performFinish() {
      */
     @Override
     public boolean performFinish() {

-         int returnCode = IDialogConstants.NO_ID;
+        boolean performFinish = super.performFinish();
+        int returnCode = IDialogConstants.NO_ID;

         if (!PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.PROMPT_FOR_OPEN_SPECIMEN_IN_EDITOR)){
             MessageDialogWithToggle messageDialog = MessageDialogWithToggle.openYesNoQuestion(getShell(),
                     "Choose opening option", "Do you want to open the specimen in the specimen editor?",
         if (!PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.PROMPT_FOR_OPEN_SPECIMEN_IN_EDITOR)){
             MessageDialogWithToggle messageDialog = MessageDialogWithToggle.openYesNoQuestion(getShell(),
                     "Choose opening option", "Do you want to open the specimen in the specimen editor?",


@@ -134,10 +135,10 @@ public class NewDerivedUnitBaseWizard extends AbstractNewEntityWizard<SpecimenOr
             returnCode = messageDialog.getReturnCode();
             PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.PROMPT_FOR_OPEN_SPECIMEN_IN_EDITOR, messageDialog.getToggleState());
             if (returnCode != IDialogConstants.YES_ID) {
             returnCode = messageDialog.getReturnCode();
             PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.PROMPT_FOR_OPEN_SPECIMEN_IN_EDITOR, messageDialog.getToggleState());
             if (returnCode != IDialogConstants.YES_ID) {

-                return super.performFinish();
+                return performFinish;

             }
         }
             }
         }

-        if (returnCode==IDialogConstants.YES_ID || 
+        if (returnCode==IDialogConstants.YES_ID ||

                 PreferencesUtil.getPreferenceStore().getString(IPreferenceKeys.ALWAYS_OPEN_SPECIMEN_IN_EDITOR)
                 .equals(MessageDialogWithToggle.ALWAYS)) {
             IHandlerService handlerService = (IHandlerService) AbstractUtility.getService(IHandlerService.class);
                 PreferencesUtil.getPreferenceStore().getString(IPreferenceKeys.ALWAYS_OPEN_SPECIMEN_IN_EDITOR)
                 .equals(MessageDialogWithToggle.ALWAYS)) {
             IHandlerService handlerService = (IHandlerService) AbstractUtility.getService(IHandlerService.class);


@@ -163,7 +164,7 @@ public class NewDerivedUnitBaseWizard extends AbstractNewEntityWizard<SpecimenOr
                 MessagingUtils.error(DerivateSearchCompositeController.class, e);
             }
         }
                 MessagingUtils.error(DerivateSearchCompositeController.class, e);
             }
         }

-        return super.performFinish();
+        return performFinish;

     }
 
 
     }