Project

General

Profile

« Previous | Next » 

Revision 9f96b16e

Added by Patrick Plitzner about 8 years ago

Fix initialization problems for preferences and editor input

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenDerivateViewHandler.java
24 24
    @Override
25 25
    public Object execute(ExecutionEvent event) throws ExecutionException {
26 26
        Set<UUID> selectedElementUUIDs = new HashSet<UUID>();
27
        Object parameter;
27 28
        //check if parameter is set
28
        Object parameter = event.getObjectParameterForExecution("eu.etaxonomy.taxeditor.specimenUuidParameter");
29
        try {
30
            parameter = event.getObjectParameterForExecution("eu.etaxonomy.taxeditor.specimenUuidParameter");
31
        } catch (ExecutionException e) {
32
            parameter = null;
33
        }
29 34
        if(parameter instanceof UUID){
30 35
            selectedElementUUIDs.add((UUID) parameter);
31 36
        }
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java
125 125
     */
126 126
    @Override
127 127
    public boolean performFinish() {
128
         int returnCode = IDialogConstants.NO_ID;
128
        boolean performFinish = super.performFinish();
129
        int returnCode = IDialogConstants.NO_ID;
129 130
        if (!PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.PROMPT_FOR_OPEN_SPECIMEN_IN_EDITOR)){
130 131
            MessageDialogWithToggle messageDialog = MessageDialogWithToggle.openYesNoQuestion(getShell(),
131 132
                    "Choose opening option", "Do you want to open the specimen in the specimen editor?",
......
134 135
            returnCode = messageDialog.getReturnCode();
135 136
            PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.PROMPT_FOR_OPEN_SPECIMEN_IN_EDITOR, messageDialog.getToggleState());
136 137
            if (returnCode != IDialogConstants.YES_ID) {
137
                return super.performFinish();
138
                return performFinish;
138 139
            }
139 140
        }
140
        if (returnCode==IDialogConstants.YES_ID || 
141
        if (returnCode==IDialogConstants.YES_ID ||
141 142
                PreferencesUtil.getPreferenceStore().getString(IPreferenceKeys.ALWAYS_OPEN_SPECIMEN_IN_EDITOR)
142 143
                .equals(MessageDialogWithToggle.ALWAYS)) {
143 144
            IHandlerService handlerService = (IHandlerService) AbstractUtility.getService(IHandlerService.class);
......
163 164
                MessagingUtils.error(DerivateSearchCompositeController.class, e);
164 165
            }
165 166
        }
166
        return super.performFinish();
167
        return performFinish;
167 168
    }
168 169

  
169 170

  

Also available in: Unified diff