Project

General

Profile

« Previous | Next » 

Revision 69e82edd

Added by Katja Luther over 5 years ago

local preferences database specific

View differences:

eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java
12 12
import org.springframework.remoting.RemoteConnectFailureException;
13 13

  
14 14
import eu.etaxonomy.taxeditor.model.MessagingUtils;
15
import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
16 15
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
17 16

  
18 17

  
......
50 49
	 */
51 50
	@Override
52 51
    public String getInitialWindowPerspectiveId() {
53
	    if (PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_CHECKLIST_PERSPECTIVE)){
54
	        return "eu.etaxonomy.taxeditor.perspective.checklistperspective";
55
	    }
52
//	    if (PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_CHECKLIST_PERSPECTIVE)){
53
//	        return "eu.etaxonomy.taxeditor.perspective.checklistperspective";
54
//	    }
56 55

  
57 56
		return "eu.etaxonomy.taxeditor.application.perspective.taxonomic";
58 57
	}
eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchWindowAdvisor.java
67 67
	        }
68 68

  
69 69
        }
70
		PreferencesUtil.checkNomenclaturalCode();
70

  
71 71

  
72 72
		if(PreferencesUtil.shouldConnectAtStartUp()) {
73 73
            CdmStore.connect();
eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/LifeCycleManager.java
133 133
     */
134 134
    @Override
135 135
    public void contextStart(IMemento memento, IProgressMonitor monitor) {
136
        PreferencesUtil.setDefaults();
136 137
        PreferencesUtil.updateDBPreferences();
138

  
137 139
        hideParts();
138
        if (PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_CHECKLIST_PERSPECTIVE)){
140
        if (PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_CHECKLIST_PERSPECTIVE)){
139 141
            IWorkbench workbench = PlatformUI.getWorkbench();
140 142
            IWorkbenchWindow window = workbench
141 143
                    .getActiveWorkbenchWindow();
......
144 146
            IWorkbenchPage page = window.getActivePage();
145 147
            page.setPerspective(registry.findPerspectiveWithId("eu.etaxonomy.taxeditor.perspective.checklistperspective"));
146 148
        }
149
        PreferencesUtil.checkNomenclaturalCode();
147 150
    }
148 151

  
149 152
    /**
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/preference/BulkEditorGeneralPreferencePage.java
12 12
import org.eclipse.jface.preference.BooleanFieldEditor;
13 13

  
14 14
import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
15
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
15 16
import eu.etaxonomy.taxeditor.preference.menu.FieldEditorPreferencePageE4;
16 17

  
17 18
/**
......
23 24

  
24 25
    @Override
25 26
    protected void createFieldEditors() {
26
        addField(new BooleanFieldEditor(IPreferenceKeys.BULK_EDITOR_OCCURRENCE_SHOW_FIELD_UNITS,
27
        addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.BULK_EDITOR_OCCURRENCE_SHOW_FIELD_UNITS),
27 28
                "Show Field Units in Specimen Editor (list).",
28 29
                getFieldEditorParent()));
29 30
    }
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/preference/BulkEditorMarkerPreferencePage.java
13 13

  
14 14
import eu.etaxonomy.cdm.model.common.MarkerType;
15 15
import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
16
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
16 17
import eu.etaxonomy.taxeditor.preference.menu.FieldEditorPreferencePageE4;
17 18
import eu.etaxonomy.taxeditor.store.CdmStore;
18 19
import eu.etaxonomy.taxeditor.store.TermStore;
......
29 30
    protected void createFieldEditors() {
30 31
        if(CdmStore.isActive()){
31 32
            for (final MarkerType markerType : TermStore.getTerms(MarkerType.class)) {
32
                addField(new BooleanFieldEditor(IPreferenceKeys.EDIT_MARKER_TYPE_PREFIX
33
                addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.EDIT_MARKER_TYPE_PREFIX)
33 34
                        + markerType.getClass().getName() + markerType.getLabel(), String.format("Edit '%s' markers",
34 35
                        markerType.getLabel()), getFieldEditorParent()));
35 36
            }
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistLabelProvider.java
20 20
import java.util.UUID;
21 21

  
22 22
import org.apache.commons.lang.StringUtils;
23
import org.eclipse.jface.preference.IPreferenceStore;
24 23
import org.eclipse.jface.viewers.ITableLabelProvider;
25 24
import org.eclipse.jface.viewers.LabelProvider;
26 25
import org.eclipse.swt.graphics.Image;
......
148 147

  
149 148

  
150 149
    private SortedSet<DefinedTermBase> loadNamedAreas() {
151
        IPreferenceStore preferenceStore = PreferencesUtil.getPreferenceStore();
150
        //IPreferenceStore preferenceStore = PreferencesUtil.getPreferenceStore();
152 151

  
153
        String valuesAreas = preferenceStore.getString(PreferencesUtil.DISTRIBUTION_AREA_OCCURENCE_STATUS);
154
        String values = preferenceStore.getString(PreferencesUtil.DISTRIBUTION_VOCABULARIES);
152
        String valuesAreas = PreferencesUtil.getStringValue(PreferencesUtil.DISTRIBUTION_AREA_OCCURENCE_STATUS);
153
        String values = PreferencesUtil.getStringValue(PreferencesUtil.DISTRIBUTION_VOCABULARIES);
155 154
        if (values != null && values != "") { //$NON-NLS-1$
156 155
            String[] split = values.split(";"); //$NON-NLS-1$
157 156
            List<String> listValue = Arrays.asList(split);
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/ChecklistDropdownSelectionListenerE4.java
52 52

  
53 53
           menuItem.setText(term.getTitleCache());
54 54

  
55
        if (PreferencesUtil.getPreferenceStore().getBoolean(term.getUuid().toString())) {
55
        if (PreferencesUtil.getBooleanValue(term.getUuid().toString())) {
56 56
            menuItem.setSelection(true);
57 57
        } else {
58 58
            menuItem.setSelection(false);
......
75 75
                if (column != null && column.getWidth() == 0) {
76 76
                    // save column status if shown or not
77 77
                    if (term != null) {
78
                        PreferencesUtil.getPreferenceStore().setValue(term.getUuid().toString(), true);
78
                        PreferencesUtil.setBooleanValue(term.getUuid().toString(), true);
79 79
                    }
80 80
                    column.setWidth(50);
81 81
                } else if (column != null) {
82 82
                    if (term != null) {
83
                        PreferencesUtil.getPreferenceStore().setValue(term.getUuid().toString(), false);
83
                        PreferencesUtil.setBooleanValue(term.getUuid().toString(), false);
84 84
                    }
85 85
                    column.setWidth(0);
86 86
                }
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/handler/OpenChecklistEditorHandlerE4.java
41 41

  
42 42
	@Override
43 43
	protected void open(ITaxonTreeNode entity, Shell shell, EPartService partService) {
44
		if (PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.DISTRIBUTION_AREA_PREFRENCES_ACTIVE)) {
45
			if (StringUtils.isBlank(PreferencesUtil.getPreferenceStore().getString(IPreferenceKeys.DISTRIBUTION_VOCABULARIES) )){
44

  
45
		if (PreferencesUtil.getBooleanValue(IPreferenceKeys.DISTRIBUTION_AREA_PREFRENCES_ACTIVE)) {
46
			if (StringUtils.isBlank(PreferencesUtil.getStringValue(IPreferenceKeys.DISTRIBUTION_VOCABULARIES) )){
47

  
46 48
				MessagingUtils.informationDialog(Messages.OpenChecklistEditorHandler_NO_AREAS, Messages.OpenChecklistEditorHandler_CHOOSE_AREA
47 49
						+ Messages.OpenChecklistEditorHandler_GOTO_PREFERENCES);
48 50
				return;
......
87 89
     */
88 90
    @Override
89 91
    protected boolean canExecute(ITaxonTreeNode entity) {
90
        return entity!=null && PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.DISTRIBUTION_AREA_PREFRENCES_ACTIVE);
92
        return entity!=null && PreferencesUtil.getBooleanValue(IPreferenceKeys.DISTRIBUTION_AREA_PREFRENCES_ACTIVE);
91 93
    }
92 94

  
93 95
    @Override
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/OpenDerivativeEditorForTaxonNode.java
50 50
     */
51 51
    @Override
52 52
    protected boolean canExecute(TaxonNode entity) {
53
        return (entity.getTaxon()!=null && PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_SPECIMEN));
53
        return (entity.getTaxon()!=null && PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_SPECIMEN));
54 54
    }
55 55

  
56 56
    @Override
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/e4/MediaViewPartE4.java
23 23
import org.eclipse.swt.widgets.Tree;
24 24

  
25 25
import eu.etaxonomy.cdm.model.description.IDescribable;
26
import eu.etaxonomy.cdm.model.name.TaxonName;
26 27
import eu.etaxonomy.taxeditor.editor.l10n.Messages;
27 28
import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4;
28 29
import eu.etaxonomy.taxeditor.editor.view.concept.e4.ConceptViewPartE4;
......
108 109
	            return;
109 110
	        }
110 111
	        else if(firstElement!=null
111
	                && firstElement instanceof IDescribable<?>){
112
	                && firstElement instanceof IDescribable<?> && !(firstElement instanceof TaxonName)){
112 113
	            showViewer(structuredSelection, activePart, viewer);
113 114
	            return;
114 115
	        }
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/TaxonNavigatorE4.java
279 279
		if (CdmStore.isActive()) {
280 280
		    cdmEntitySession = CdmStore.getCurrentSessionManager().newSession(this, true);
281 281
		    CdmApplicationState.getCurrentDataChangeService().register(this);
282
		    viewer.setInput(getInitialInput());
282 283
		}
283 284
		CdmStore.getLoginManager().addObserver(this);
284
        viewer.setInput(getInitialInput());
285

  
285 286
	}
286 287

  
287 288
	//Link with taxon selection
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/CloneClassificationHandlerE4.java
73 73
        canExecute = selection.size()==1
74 74
                && selection.getFirstElement() instanceof TaxonNode
75 75
                && ((TaxonNode) selection.getFirstElement()).getTaxon()==null
76
                && PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_EXPERIMENTAL_FEATURES)
77
                && !PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.DISABLE_MULTI_CLASSIFICATION);
76
                && PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_EXPERIMENTAL_FEATURES)
77
                && !PreferencesUtil.getBooleanValue(IPreferenceKeys.DISABLE_MULTI_CLASSIFICATION);
78 78
        menuItem.setVisible(canExecute);
79 79
        return canExecute;
80 80
    }
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/CreateClassificationHierarchyHandlerE4.java
56 56
        canExecute = selection.size()==1
57 57
                && selection.getFirstElement() instanceof TaxonNode
58 58
                && ((TaxonNode) selection.getFirstElement()).getTaxon()==null
59
                && PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_EXPERIMENTAL_FEATURES)
60
                && !PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.DISABLE_MULTI_CLASSIFICATION);
59
                && PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_EXPERIMENTAL_FEATURES)
60
                && !PreferencesUtil.getBooleanValue(IPreferenceKeys.DISABLE_MULTI_CLASSIFICATION);
61 61
        menuItem.setVisible(canExecute);
62 62
        return canExecute;
63 63
    }
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/NewClassificationHandlerE4.java
47 47
    private boolean canExecute(MHandledMenuItem menuItem){
48 48
        boolean canExecute = false;
49 49

  
50
        canExecute = TaxonNodePropertyTester.noClassifiactionExists() || !PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.DISABLE_MULTI_CLASSIFICATION);
50
        canExecute = TaxonNodePropertyTester.noClassifiactionExists() || !PreferencesUtil.getBooleanValue(IPreferenceKeys.DISABLE_MULTI_CLASSIFICATION);
51 51
        menuItem.setVisible(canExecute);
52 52
        return canExecute;
53 53
    }
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java
233 233
	 * @param searchResult
234 234
	 */
235 235
	private void openSearchResultsView(IFindTaxaAndNamesConfigurator configurator) {
236
		boolean openResultInSeparateWindows = PreferencesUtil.getPreferenceStore().getBoolean((IPreferenceKeys.SEARCH_OPEN_RESULTS_IN_SEPARATE_WINDOWS));
236
		boolean openResultInSeparateWindows = PreferencesUtil.getBooleanValue((IPreferenceKeys.SEARCH_OPEN_RESULTS_IN_SEPARATE_WINDOWS));
237 237
		String partId = AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_NAVIGATION_SEARCH_E4_SEARCHRESULTVIEWE4;
238 238

  
239 239
		MPart part = null;
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/ChecklistEditorGeneralPreference.java
282 282
        pref.setAllowOverride(true);
283 283
        service.set(pref);
284 284

  
285
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.DISTRIBUTION_AREA_PREFRENCES_ACTIVE, isEditorActivated);
285
        PreferencesUtil.setBooleanValue(IPreferenceKeys.DISTRIBUTION_AREA_PREFRENCES_ACTIVE, isEditorActivated);
286 286
        PreferencesUtil.setSortNamedAreasByOrderInVocabulary(isSortByVocabularyOrder);
287 287
        PreferencesUtil.setShowRankInChecklistEditor(isShowRank);
288 288
        PreferencesUtil.setShowSymbolInChecklistEditor(isShowSymbol);
......
297 297
            displayString = IPreferenceKeys.CHECKLIST_AREA_DISPLAY_TITLE;
298 298
        }
299 299
        PreferencesUtil.setShowIdInVocabularyInChecklistEditor(displayString);
300
        PreferencesUtil.updateDBPreferences();
300 301

  
301 302
        return true;
302 303
    }
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/GeneralAdminPreferencePage.java
32 32
    boolean isShowCheckListPerspective = false;
33 33
    boolean isShowTaxonNodeWizard = true;
34 34
    ICdmRepository controller = null;
35
    CdmPreference isShowSpecimenPref = null;
35 36
    /**
36 37
     * {@inheritDoc}
37 38
     */
......
39 40
    protected Control createContents(Composite parent) {
40 41
        final Composite composite = new Composite(parent, SWT.NULL);
41 42

  
43

  
42 44
//        GridLayout gridLayout = new GridLayout();
43 45
//        composite.setLayout(gridLayout);
44 46
//        controller = CdmStore.getCurrentApplicationConfiguration();
......
119 121
//              }
120 122
//         });
121 123

  
124

  
122 125
        return composite;
123 126
    }
124 127

  
......
130 133

  
131 134
    @Override
132 135
    public boolean performOk() {
136

  
133 137
       //ICdmRepository controller = CdmStore.getCurrentApplicationConfiguration();
134 138
       if (controller != null){
135 139
           IPreferenceService service = controller.getPreferenceService();
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NameDetailsViewConfiguration.java
17 17
import eu.etaxonomy.cdm.model.metadata.CdmPreference;
18 18
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
19 19
import eu.etaxonomy.taxeditor.l10n.Messages;
20
import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
21 20
import eu.etaxonomy.taxeditor.preference.NameDetailsConfigurator;
22 21
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
23 22
import eu.etaxonomy.taxeditor.preference.menu.CdmPreferencePage;
......
372 371
        CdmPreference pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.NameDetailsView, value);
373 372
        pref.setAllowOverride(isAllowOverride);
374 373
        service.set(pref);
375
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_SIMPLE_NAME_DETAILS_TAXON, isShowTaxon);
376
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_SEC_DETAILS, isSecDetailsActivated);
377
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.DISABLE_SEC, isSecEnabled);
378
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_LSID, isShowLSID);
379
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_CODE, isShowNomenclaturalCode);
380
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NAMECACHE, isShowNameCache);
381
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_APPENDED_PHRASE, isShowAppendedPhrase);
382
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_RANK, isShowRank);
383
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_ATOMISED_EPITHETS, isShowEpithets);
384
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_AUTHORSHIP, isShowAuthorship);
385
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_AUTHORSHIP_CACHE, isShowAuthorCache);
386
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_REFERENCE, isShowNomenclaturalRef);
387
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_STATUS, isShowNomenclaturalStatus);
388
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_PROTOLOGUE, isShowProtologue);
389
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_TYPE_DESIGNATION, isShowTypeDesignation);
390
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NAME_RELATIONSHIP, isShowNameRelationship);
391
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_HYBRID, isShowHybrid);
392
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ALLOW_OVERRIDE_NAME_DETAILS, isAllowOverride);
393
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_SIMPLE_NAME_DETAILS_SECTION, isSimpleDetailsViewActivated);
374
        PreferencesUtil.saveConfigToPrefernceStore(config);
375
//        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_SIMPLE_NAME_DETAILS_TAXON, isShowTaxon);
376
//        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_SEC_DETAILS, isSecDetailsActivated);
377
//        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.DISABLE_SEC, isSecEnabled);
378
//        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_LSID, isShowLSID);
379
//        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_CODE, isShowNomenclaturalCode);
380
//        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NAMECACHE, isShowNameCache);
381
//        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_APPENDED_PHRASE, isShowAppendedPhrase);
382
//        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_RANK, isShowRank);
383
//        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_ATOMISED_EPITHETS, isShowEpithets);
384
//        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_AUTHORSHIP, isShowAuthorship);
385
//        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_AUTHORSHIP_CACHE, isShowAuthorCache);
386
//        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_REFERENCE, isShowNomenclaturalRef);
387
//        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_STATUS, isShowNomenclaturalStatus);
388
//        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_PROTOLOGUE, isShowProtologue);
389
//        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_TYPE_DESIGNATION, isShowTypeDesignation);
390
//        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NAME_RELATIONSHIP, isShowNameRelationship);
391
//        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_HYBRID, isShowHybrid);
392
//        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ALLOW_OVERRIDE_NAME_DETAILS, isAllowOverride);
393
//        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_SIMPLE_NAME_DETAILS_SECTION, isSimpleDetailsViewActivated);
394 394
        return true;
395 395
    }
396 396

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/SpecimenAdminPreferences.java
142 142
             @Override
143 143
             public void widgetSelected(SelectionEvent e) {
144 144
                 isUseLocalPreference = useLocalPreference.getSelection();
145
                 PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_SPECIMEN_ALLOW_OVERRIDE, isUseLocalPreference);
145
                 PreferencesUtil.setBooleanValue(IPreferenceKeys.SHOW_SPECIMEN_ALLOW_OVERRIDE, isUseLocalPreference);
146 146
              }
147 147
         });
148 148
        return composite;
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/defaultHandler/e4/DefaultOpenTaxonNodeWizardHandlerE4.java
49 49

  
50 50
    @Override
51 51
    public boolean canExecute(TaxonNode entity) {
52
        return entity.getTaxon()!=null && PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_TAXONNODE_WIZARD);
52
        return entity.getTaxon()!=null && PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_TAXONNODE_WIZARD);
53 53
    }
54 54

  
55 55
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/abcd/AbcdImportConfiguratorWizardPageE4.java
11 11

  
12 12
import javax.inject.Inject;
13 13

  
14
import org.eclipse.jface.preference.IPreferenceStore;
15 14
import org.eclipse.jface.wizard.WizardPage;
16 15
import org.eclipse.swt.SWT;
17 16
import org.eclipse.swt.events.SelectionAdapter;
......
225 224

  
226 225
	 public void saveConfigToPrefernceStore() {
227 226

  
228
	        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_ADD_INDIVIDUALS_ASSOCIATIONS_SUCH_AS_SPECIMEN_AND_OBSERVATIONS,
227
	       PreferencesUtil.setBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_ADD_INDIVIDUALS_ASSOCIATIONS_SUCH_AS_SPECIMEN_AND_OBSERVATIONS,
229 228
	                configurator.isAddIndividualsAssociationsSuchAsSpecimenAndObservations());
230
	        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_ADD_MEDIA_AS_MEDIASPECIMEN,
229
	       PreferencesUtil.setBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_ADD_MEDIA_AS_MEDIASPECIMEN,
231 230
                    configurator.isAddMediaAsMediaSpecimen());
232
	        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_ALLOW_REUSE_OTHER_CLASSIFICATIONS,
231
	       PreferencesUtil.setBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_ALLOW_REUSE_OTHER_CLASSIFICATIONS,
233 232
                    configurator.isAllowReuseOtherClassifications());
234
	        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_DEDUPLICATE_CLASSIFICATIONS,
233
	       PreferencesUtil.setBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_DEDUPLICATE_CLASSIFICATIONS,
235 234
                    configurator.isDeduplicateClassifications());
236
	        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_DEDUPLICATE_REFERENCES,
235
	       PreferencesUtil.setBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_DEDUPLICATE_REFERENCES,
237 236
                    configurator.isDeduplicateReferences());
238
	        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_DO_SIBLINGS,
237
	       PreferencesUtil.setBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_DO_SIBLINGS,
239 238
                    configurator.isGetSiblings());
240
	        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_IGNORE_AUTHORSHIP,
239
	       PreferencesUtil.setBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_IGNORE_AUTHORSHIP,
241 240
                    configurator.isIgnoreAuthorship());
242
	        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_IGNORE_IMPORT_OF_EXISTING_SPECIMEN,
241
	       PreferencesUtil.setBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_IGNORE_IMPORT_OF_EXISTING_SPECIMEN,
243 242
                    configurator.isIgnoreImportOfExistingSpecimen());
244
	        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_MAP_UNIT_ID_TO_ACCESSION_NUMBER,
243
	       PreferencesUtil.setBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_MAP_UNIT_ID_TO_ACCESSION_NUMBER,
245 244
                    configurator.isMapUnitIdToAccessionNumber());
246
	        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_MAP_UNIT_ID_TO_BARCODE,
245
	       PreferencesUtil.setBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_MAP_UNIT_ID_TO_BARCODE,
247 246
                    configurator.isMapUnitIdToBarcode());
248
	        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_MAP_UNIT_ID_TOCATALOG_NUMBER,
247
	       PreferencesUtil.setBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_MAP_UNIT_ID_TOCATALOG_NUMBER,
249 248
                    configurator.isMapUnitIdToCatalogNumber());
250
	        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_MOVE_NEW_TAXA_TO_DEFAULT_CLASSIFICATION,
249
	       PreferencesUtil.setBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_MOVE_NEW_TAXA_TO_DEFAULT_CLASSIFICATION,
251 250
                    configurator.isMoveNewTaxaToDefaultClassification());
252
	        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_OVERWRITE_EXISTING_SPECIMEN,
251
	       PreferencesUtil.setBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_OVERWRITE_EXISTING_SPECIMEN,
253 252
                    configurator.isOverwriteExistingSpecimens());
254
	        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_REUSE_EXISTING_DESCRIPTIVE_GROUPS,
253
	       PreferencesUtil.setBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_REUSE_EXISTING_DESCRIPTIVE_GROUPS,
255 254
                    configurator.isReuseExistingDescriptiveGroups());
256
	        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_REUSE_EXISTING_META_DATA,
255
	       PreferencesUtil.setBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_REUSE_EXISTING_META_DATA,
257 256
                    configurator.isReuseExistingMetaData());
258
	        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_REUSE_EXISTING_TAXA_WHEN_POSSIBLE,
257
	       PreferencesUtil.setBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_REUSE_EXISTING_TAXA_WHEN_POSSIBLE,
259 258
                    configurator.isReuseExistingTaxaWhenPossible());
260 259

  
261 260
	    }
......
269 268
        this.configurator = configurator;
270 269
    }
271 270

  
272
	 protected IPreferenceStore doGetPreferenceStore() {
273
	        return PreferencesUtil.getPreferenceStore();
274
	    }
271

  
275 272
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/cdmlight/CdmLightExportWizardE4.java
108 108
//        job.setUser(true);
109 109
//        // schedule job
110 110
//        job.schedule();
111
        PreferencesUtil.getPreferenceStore().setValue("exportFolder", page.getFolderText());
111
        PreferencesUtil.setStringValue("exportFolder", page.getFolderText());
112 112
        return true;
113 113
    }
114 114

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportConfiguratorWizardPage.java
13 13
import java.util.ArrayList;
14 14
import java.util.List;
15 15

  
16
import org.eclipse.jface.preference.IPreferenceStore;
17 16
import org.eclipse.swt.SWT;
18 17
import org.eclipse.swt.events.SelectionAdapter;
19 18
import org.eclipse.swt.events.SelectionEvent;
......
261 260
    }
262 261

  
263 262
	 public void saveConfigToPrefernceStore() {
264
	        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_ADD_INDIVIDUALS_ASSOCIATIONS_SUCH_AS_SPECIMEN_AND_OBSERVATIONS,
263
	        PreferencesUtil.setBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_ADD_INDIVIDUALS_ASSOCIATIONS_SUCH_AS_SPECIMEN_AND_OBSERVATIONS,
265 264
	                abcdImportConfigurator.isAddIndividualsAssociationsSuchAsSpecimenAndObservations());
266
	        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_ADD_MEDIA_AS_MEDIASPECIMEN,
265
	        PreferencesUtil.setBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_ADD_MEDIA_AS_MEDIASPECIMEN,
267 266
                    abcdImportConfigurator.isAddMediaAsMediaSpecimen());
268
	        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_ALLOW_REUSE_OTHER_CLASSIFICATIONS,
267
	        PreferencesUtil.setBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_ALLOW_REUSE_OTHER_CLASSIFICATIONS,
269 268
                    abcdImportConfigurator.isAllowReuseOtherClassifications());
270
	        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_DEDUPLICATE_CLASSIFICATIONS,
269
	        PreferencesUtil.setBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_DEDUPLICATE_CLASSIFICATIONS,
271 270
                    abcdImportConfigurator.isDeduplicateClassifications());
272
	        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_DEDUPLICATE_REFERENCES,
271
	        PreferencesUtil.setBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_DEDUPLICATE_REFERENCES,
273 272
                    abcdImportConfigurator.isDeduplicateReferences());
274
	        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_DO_SIBLINGS,
273
	        PreferencesUtil.setBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_DO_SIBLINGS,
275 274
                    abcdImportConfigurator.isGetSiblings());
276
	        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_IGNORE_AUTHORSHIP,
275
	        PreferencesUtil.setBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_IGNORE_AUTHORSHIP,
277 276
                    abcdImportConfigurator.isIgnoreAuthorship());
278
	        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_IGNORE_IMPORT_OF_EXISTING_SPECIMEN,
277
	        PreferencesUtil.setBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_IGNORE_IMPORT_OF_EXISTING_SPECIMEN,
279 278
                    abcdImportConfigurator.isIgnoreImportOfExistingSpecimen());
280
	        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_MAP_UNIT_ID_TO_ACCESSION_NUMBER,
279
	        PreferencesUtil.setBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_MAP_UNIT_ID_TO_ACCESSION_NUMBER,
281 280
                    abcdImportConfigurator.isMapUnitIdToAccessionNumber());
282
	        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_MAP_UNIT_ID_TO_BARCODE,
281
	        PreferencesUtil.setBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_MAP_UNIT_ID_TO_BARCODE,
283 282
                    abcdImportConfigurator.isMapUnitIdToBarcode());
284
	        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_MAP_UNIT_ID_TOCATALOG_NUMBER,
283
	        PreferencesUtil.setBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_MAP_UNIT_ID_TOCATALOG_NUMBER,
285 284
                    abcdImportConfigurator.isMapUnitIdToCatalogNumber());
286
	        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_MOVE_NEW_TAXA_TO_DEFAULT_CLASSIFICATION,
285
	        PreferencesUtil.setBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_MOVE_NEW_TAXA_TO_DEFAULT_CLASSIFICATION,
287 286
                    abcdImportConfigurator.isMoveNewTaxaToDefaultClassification());
288
	        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_OVERWRITE_EXISTING_SPECIMEN,
287
	        PreferencesUtil.setBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_OVERWRITE_EXISTING_SPECIMEN,
289 288
                    abcdImportConfigurator.isOverwriteExistingSpecimens());
290
	        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_REUSE_EXISTING_DESCRIPTIVE_GROUPS,
289
	        PreferencesUtil.setBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_REUSE_EXISTING_DESCRIPTIVE_GROUPS,
291 290
                    abcdImportConfigurator.isReuseExistingDescriptiveGroups());
292
	        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_REUSE_EXISTING_META_DATA,
291
	        PreferencesUtil.setBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_REUSE_EXISTING_META_DATA,
293 292
                    abcdImportConfigurator.isReuseExistingMetaData());
294
	        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_REUSE_EXISTING_TAXA_WHEN_POSSIBLE,
293
	        PreferencesUtil.setBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_REUSE_EXISTING_TAXA_WHEN_POSSIBLE,
295 294
                    abcdImportConfigurator.isReuseExistingTaxaWhenPossible());
296 295
	        if ( abcdImportConfigurator.getNomenclaturalCode() != null){
297
	            PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_NOMENCLATURAL_CODE, abcdImportConfigurator.getNomenclaturalCode().getKey());
296
	            PreferencesUtil.setStringValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_NOMENCLATURAL_CODE, abcdImportConfigurator.getNomenclaturalCode().getKey());
298 297
	        }
299 298

  
300 299

  
......
305 304

  
306 305
	 }
307 306

  
308
	 protected IPreferenceStore doGetPreferenceStore() {
309
	        return PreferencesUtil.getPreferenceStore();
310
	    }
307

  
311 308

  
312 309
    /* (non-Javadoc)
313 310
     * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
......
319 316
    }
320 317

  
321 318
    public void createAbcdImportConfig() {
322
        this.abcdImportConfigurator.setAddIndividualsAssociationsSuchAsSpecimenAndObservations(doGetPreferenceStore().getBoolean(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_ADD_INDIVIDUALS_ASSOCIATIONS_SUCH_AS_SPECIMEN_AND_OBSERVATIONS));
323
        this.abcdImportConfigurator.setAddMediaAsMediaSpecimen(doGetPreferenceStore().getBoolean(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_ADD_MEDIA_AS_MEDIASPECIMEN));
324
        this.abcdImportConfigurator.setAllowReuseOtherClassifications(doGetPreferenceStore().getBoolean(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_ALLOW_REUSE_OTHER_CLASSIFICATIONS));
325
        //this.abcdImportConfigurator.setClassificationUuid(doGetPreferenceStore().getBoolean(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_CLASSIFICATION_UUID));
326
        this.abcdImportConfigurator.setDeduplicateClassifications(doGetPreferenceStore().getBoolean(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_DEDUPLICATE_CLASSIFICATIONS));
327
        this.abcdImportConfigurator.setDeduplicateReferences(doGetPreferenceStore().getBoolean(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_DEDUPLICATE_REFERENCES));
328
       // this.abcdImportConfigurator.setDefaultAuthor(doGetPreferenceStore().getBoolean(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_DEFAULT_AUTHOR));
329
        this.abcdImportConfigurator.setGetSiblings(doGetPreferenceStore().getBoolean(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_DO_SIBLINGS));
330
        this.abcdImportConfigurator.setIgnoreAuthorship(doGetPreferenceStore().getBoolean(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_IGNORE_AUTHORSHIP));
331
        this.abcdImportConfigurator.setIgnoreImportOfExistingSpecimen(doGetPreferenceStore().getBoolean(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_IGNORE_IMPORT_OF_EXISTING_SPECIMEN));
332
        this.abcdImportConfigurator.setMapUnitIdToAccessionNumber(doGetPreferenceStore().getBoolean(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_MAP_UNIT_ID_TO_ACCESSION_NUMBER));
333
        this.abcdImportConfigurator.setMapUnitIdToBarcode(doGetPreferenceStore().getBoolean(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_MAP_UNIT_ID_TO_BARCODE));
334
        this.abcdImportConfigurator.setMapUnitIdToCatalogNumber(doGetPreferenceStore().getBoolean(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_MAP_UNIT_ID_TOCATALOG_NUMBER));
335
        this.abcdImportConfigurator.setMoveNewTaxaToDefaultClassification(doGetPreferenceStore().getBoolean(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_MOVE_NEW_TAXA_TO_DEFAULT_CLASSIFICATION));
336
        this.abcdImportConfigurator.setReuseExistingDescriptiveGroups(doGetPreferenceStore().getBoolean(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_REUSE_EXISTING_DESCRIPTIVE_GROUPS));
337
        this.abcdImportConfigurator.setReuseExistingTaxaWhenPossible(doGetPreferenceStore().getBoolean(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_REUSE_EXISTING_TAXA_WHEN_POSSIBLE));
319
        this.abcdImportConfigurator.setAddIndividualsAssociationsSuchAsSpecimenAndObservations(PreferencesUtil.getBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_ADD_INDIVIDUALS_ASSOCIATIONS_SUCH_AS_SPECIMEN_AND_OBSERVATIONS));
320
        this.abcdImportConfigurator.setAddMediaAsMediaSpecimen(PreferencesUtil.getBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_ADD_MEDIA_AS_MEDIASPECIMEN));
321
        this.abcdImportConfigurator.setAllowReuseOtherClassifications(PreferencesUtil.getBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_ALLOW_REUSE_OTHER_CLASSIFICATIONS));
322
        //this.abcdImportConfigurator.setClassificationUuid(PreferencesUtil.getBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_CLASSIFICATION_UUID));
323
        this.abcdImportConfigurator.setDeduplicateClassifications(PreferencesUtil.getBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_DEDUPLICATE_CLASSIFICATIONS));
324
        this.abcdImportConfigurator.setDeduplicateReferences(PreferencesUtil.getBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_DEDUPLICATE_REFERENCES));
325
       // this.abcdImportConfigurator.setDefaultAuthor(PreferencesUtil.getBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_DEFAULT_AUTHOR));
326
        this.abcdImportConfigurator.setGetSiblings(PreferencesUtil.getBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_DO_SIBLINGS));
327
        this.abcdImportConfigurator.setIgnoreAuthorship(PreferencesUtil.getBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_IGNORE_AUTHORSHIP));
328
        this.abcdImportConfigurator.setIgnoreImportOfExistingSpecimen(PreferencesUtil.getBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_IGNORE_IMPORT_OF_EXISTING_SPECIMEN));
329
        this.abcdImportConfigurator.setMapUnitIdToAccessionNumber(PreferencesUtil.getBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_MAP_UNIT_ID_TO_ACCESSION_NUMBER));
330
        this.abcdImportConfigurator.setMapUnitIdToBarcode(PreferencesUtil.getBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_MAP_UNIT_ID_TO_BARCODE));
331
        this.abcdImportConfigurator.setMapUnitIdToCatalogNumber(PreferencesUtil.getBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_MAP_UNIT_ID_TOCATALOG_NUMBER));
332
        this.abcdImportConfigurator.setMoveNewTaxaToDefaultClassification(PreferencesUtil.getBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_MOVE_NEW_TAXA_TO_DEFAULT_CLASSIFICATION));
333
        this.abcdImportConfigurator.setReuseExistingDescriptiveGroups(PreferencesUtil.getBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_REUSE_EXISTING_DESCRIPTIVE_GROUPS));
334
        this.abcdImportConfigurator.setReuseExistingTaxaWhenPossible(PreferencesUtil.getBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_REUSE_EXISTING_TAXA_WHEN_POSSIBLE));
338 335

  
339 336
    }
340 337
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/CdmLightExportWizard.java
16 16
import org.eclipse.core.runtime.jobs.Job;
17 17
import org.eclipse.jface.viewers.IStructuredSelection;
18 18
import org.eclipse.jface.viewers.TreeSelection;
19
import org.eclipse.swt.SWT;
20 19
import org.eclipse.swt.widgets.Combo;
21
import org.eclipse.swt.widgets.Listener;
22 20
import org.eclipse.ui.IWorkbench;
23 21
import org.eclipse.ui.progress.IProgressConstants;
24 22

  
......
39 37

  
40 38
        private CdmLightExportConfigurator configurator;
41 39
        private ExportToFileDestinationWizardPage page;
42
        
40

  
43 41

  
44 42

  
45 43
        private final String description = "Export the contents of the currently selected database into Comma Separated Value format.";
......
54 52
    			}else{
55 53
    				configurator.setTaxonNodeFilter(TaxonNodeFilter.NewSubtreeInstance(node.getUuid()));
56 54
    			}
57
    			
55

  
58 56
    		}
59
        	
60
            
57

  
58

  
61 59
        }
62 60

  
63 61

  
......
85 83
                    for(Classification c:listClassifications){
86 84
                        if(c.getTitleCache().equalsIgnoreCase(combo.getItem(selectionIndex))){
87 85
                            set.add(c.getUuid());
88
                            
86

  
89 87
                            if (!page.getCheckUseSelectedTaxonNode()){
90 88
                            	configurator.setTaxonNodeFilter(TaxonNodeFilter.NewClassificationInstance(c.getUuid()));
91 89
                            }
92 90
                        }
93 91
                    }
94
                    
92

  
95 93

  
96 94
                }
97 95
            }
......
103 101
            job.setUser(true);
104 102
            // schedule job
105 103
            job.schedule();
106
            PreferencesUtil.getPreferenceStore().setValue("exportFolder", page.getFolderText());
104
            PreferencesUtil.setStringValue("exportFolder", page.getFolderText());
107 105
            return true;
108 106
        }
109 107

  
......
115 113
            addPage(page);
116 114
            super.addPages();
117 115
        }
118
        
116

  
119 117

  
120 118

  
121 119
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExportToFileDestinationWizardPage.java
369 369
		folderLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL,
370 370
        true, false, 2, 1));
371 371
		folderDialog = new DirectoryDialog(parent.getShell());
372
		folderDialog.setFilterPath(PreferencesUtil.getPreferenceStore().getString(EXPORT_FOLDER));
372
		folderDialog.setFilterPath(PreferencesUtil.getStringValue(EXPORT_FOLDER));
373 373

  
374 374
		text_folder = new Text(composite, SWT.BORDER);
375 375
		text_folder.setEditable(false);
376 376
		text_folder.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true,
377 377
				false));
378
		if (PreferencesUtil.getPreferenceStore().getString(EXPORT_FOLDER) != null){
379
			text_folder.setText(PreferencesUtil.getPreferenceStore().getString(EXPORT_FOLDER));
378
		if (PreferencesUtil.getStringValue(EXPORT_FOLDER) != null){
379
			text_folder.setText(PreferencesUtil.getStringValue(EXPORT_FOLDER));
380 380
			setPageComplete(true);
381 381
		}
382 382

  
......
391 391
				String path = folderDialog.open();
392 392
				if (path != null) { // a folder was selected
393 393
					text_folder.setText(path);
394
					PreferencesUtil.getPreferenceStore().setValue(EXPORT_FOLDER, path);
394
					PreferencesUtil.setStringValue(EXPORT_FOLDER, path);
395 395
					setPageComplete(true);
396 396
				}
397 397
			}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java
60 60

  
61 61

  
62 62
            if (isAllowOverride){
63
            isEditorActivated = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.DISTRIBUTION_AREA_PREFRENCES_ACTIVE);
63
            isEditorActivated = PreferencesUtil.getBooleanValue(IPreferenceKeys.DISTRIBUTION_AREA_PREFRENCES_ACTIVE);
64 64
            final Button activateCheckButton = new Button(composite, SWT.CHECK);
65 65
            activateCheckButton.setText("Enable Distribution Editor");
66 66
            activateCheckButton.setSelection(isEditorActivated);
......
194 194
    @Override
195 195
    public boolean performOk() {
196 196
        if (isAllowOverride){
197
            PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.DISTRIBUTION_AREA_PREFRENCES_ACTIVE, isEditorActivated);
197
            PreferencesUtil.setBooleanValue(IPreferenceKeys.DISTRIBUTION_AREA_PREFRENCES_ACTIVE, isEditorActivated);
198 198
            PreferencesUtil.setSortNamedAreasByOrderInVocabulary(isSortByVocabularyOrder);
199 199
            PreferencesUtil.setShowRankInChecklistEditor(isShowRank);
200 200
            PreferencesUtil.setShowSymbolInChecklistEditor(isShowSymbol);
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DebugPreferences.java
21 21

  
22 22
    @Override
23 23
    protected void createFieldEditors() {
24
        addField(new BooleanFieldEditor(IPreferenceKeys.IS_SHOW_UP_WIDGET_IS_DISPOSED,
24
        addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.IS_SHOW_UP_WIDGET_IS_DISPOSED),
25 25
                "Show up widget is disposed error messages.",
26 26
                getFieldEditorParent()));
27
        addField(new BooleanFieldEditor(IPreferenceKeys.DISABLE_SERVICES_API_TIMESTAMP_CHECK,
27
        addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.DISABLE_SERVICES_API_TIMESTAMP_CHECK),
28 28
                "Disable services api timestamp check",
29 29
                getFieldEditorParent()));
30 30

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DescriptionPreferences.java
27 27

  
28 28
	@Override
29 29
	protected void createFieldEditors() {
30
	    addField(new BooleanFieldEditor(IPreferenceKeys.SHOW_VOCABULARY_ID_FOR_TERM_LABELS,
30
	    addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.SHOW_VOCABULARY_ID_FOR_TERM_LABELS),
31 31
	            "Show vocabulary id for term labels.",
32 32
                getFieldEditorParent()));
33 33
	}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java
10 10
package eu.etaxonomy.taxeditor.preference;
11 11

  
12 12
import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
13
import eu.etaxonomy.taxeditor.store.CdmStore;
13 14

  
14 15
/**
15 16
 * <p>IPreferenceKeys interface.</p>
......
235 236
     * Keys for the biocase providers
236 237
     */
237 238

  
238
    public static final String BIOCASE_PROVIDER_LIST = "eu.etaxonomy.taxeditor.abcd_import.biocaseProviderList";
239
    public static final String BIOCASE_PROVIDER_LIST = "eu.etaxonomy.taxeditor.abcd_import.biocaseProviderList" ;
239 240

  
240
    public static final String SHOW_ADVANCED_MEDIA_SECTION = "eu.etaxonomy.taxeditor.media.showAdvancedMedia";
241
    public static final String SHOW_MEDIA_PREVIEW = "eu.etaxonomy.taxeditor.media.showMediaPreview";
242
    public static final String SORT_TAXA_BY_RANK_AND_NAME = "eu.etaxonomy.taxeditor.selection.taxa.sortByRankAndName";
241
    public static final String SHOW_ADVANCED_MEDIA_SECTION = "eu.etaxonomy.taxeditor.media.showAdvancedMedia" + CdmStore.getActiveCdmSource().getName();
242
    public static final String SHOW_MEDIA_PREVIEW = "eu.etaxonomy.taxeditor.media.showMediaPreview"+ CdmStore.getActiveCdmSource().getName();
243
    public static final String SORT_TAXA_BY_RANK_AND_NAME = "eu.etaxonomy.taxeditor.selection.taxa.sortByRankAndName"+ CdmStore.getActiveCdmSource().getName();
243 244
    public static final String SORT_NAMED_AREA_BY_VOCABULARY_ORDER = "eu.etaxonomy.taxeditor.distribution.namedArea.sortByVocabularyOrder";
244 245

  
245 246

  
......
255 256
    public static final String SHOW_MEDIA = "eu.etaxonomy.taxeditor.view.showMedia";
256 257
    public static final String SHOW_CHECKLIST_PERSPECTIVE = "eu.etaxonomy.taxeditor.perspective.showChecklist";
257 258
    public static final String SHOW_TAXONNODE_WIZARD = "eu.etaxonomy.taxeditor.menu.showTaxonNodeWizard";
258
    public static final String IS_SEARCH_FOR_IDENTIFIER_AS_DEFAULT = "eu.etaxonomy.taxeditor.search.reference.defaultIdentifier";
259
    public static final String SEARCH_FOR_IDENTIFIER_AND_TITLECACHE = "eu.etaxonomy.taxeditor.search.reference.identifierAndTitleCache";
259
    public static final String IS_SEARCH_FOR_IDENTIFIER_AS_DEFAULT = "eu.etaxonomy.taxeditor.search.reference.defaultIdentifier"+ CdmStore.getActiveCdmSource().getName();
260
    public static final String SEARCH_FOR_IDENTIFIER_AND_TITLECACHE = "eu.etaxonomy.taxeditor.search.reference.identifierAndTitleCache" + CdmStore.getActiveCdmSource().getName();
260 261
    public static final String DISABLE_MULTI_CLASSIFICATION = "eu.etaxonomy.taxeditor.classification.multi";
261 262

  
262 263
    public static final String SHOW_ID_IN_SOURCE = "eu.etaxonomy.taxeditor.source.detail.IdInSource";
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguageEditorPreferencePage.java
100 100
     * TODO: This method is not taking advantages of the enum field yet
101 101
     */
102 102
    private void restoreSavedSelection() {
103
        String rememberedValue = PreferencesUtil.getPreferenceStore().getString(IPreferenceKeys.DEFAULT_LANGUAGE_EDITOR);
103
        String rememberedValue = PreferencesUtil.getStringValue(IPreferenceKeys.DEFAULT_LANGUAGE_EDITOR);
104 104
        if(StringUtils.isNotEmpty(rememberedValue)&& StringUtils.isNotBlank(rememberedValue)){
105 105
            if(rememberedValue.equalsIgnoreCase("en")){ //$NON-NLS-1$
106 106
                initalSelectionIndex = 1;
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/MediaPreferences.java
21 21

  
22 22
    @Override
23 23
    protected void createFieldEditors() {
24
        addField(new BooleanFieldEditor(IPreferenceKeys.SHOW_ADVANCED_MEDIA_SECTION,
24
        addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.SHOW_ADVANCED_MEDIA_SECTION),
25 25
                "Show Advanced Media Section",
26 26
                getFieldEditorParent()));
27
        addField(new BooleanFieldEditor(IPreferenceKeys.SHOW_MEDIA_PREVIEW,
27
        addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.SHOW_MEDIA_PREVIEW),
28 28
                "Show Preview in Media View",
29 29
                getFieldEditorParent()));
30 30

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/MobotOpenUrlPreferences.java
25 25
    @Override
26 26
    protected void createFieldEditors() {
27 27
        addField(new StringFieldEditor(
28
                IPreferenceKeys.OPENURL_ACCESS_POINT,
28
                PreferencesUtil.createPreferenceString(IPreferenceKeys.OPENURL_ACCESS_POINT),
29 29
                "Mobot Open Url Service Access Point:", getFieldEditorParent()));
30 30
        addField(new IntegerFieldEditor(
31
                IPreferenceKeys.OPENURL_IMAGE_MAX_WIDTH,
31
                PreferencesUtil.createPreferenceString(IPreferenceKeys.OPENURL_IMAGE_MAX_WIDTH),
32 32
                "Image Maximum Width:",
33 33
                getFieldEditorParent()));
34 34
        addField(new IntegerFieldEditor(
35
                IPreferenceKeys.OPENURL_IMAGE_MAX_HEIGHT,
35
                PreferencesUtil.createPreferenceString(IPreferenceKeys.OPENURL_IMAGE_MAX_HEIGHT),
36 36
                "Image Maximum Height:",
37 37
                getFieldEditorParent()));
38 38

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsViewConfiguration.java
59 59

  
60 60
            final Button activateLocalButton = new Button(composite, SWT.CHECK);
61 61
            activateLocalButton.setText(Messages.NameDetailsViewConfiguration_useLocalSettings);
62
            isUseLocalSettings =PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.OVERRIDE_NAME_DETAILS);
62
            isUseLocalSettings =PreferencesUtil.getBooleanValue(IPreferenceKeys.OVERRIDE_NAME_DETAILS);
63 63
            activateLocalButton.setSelection(isUseLocalSettings);
64 64
            activateLocalButton.addSelectionListener(new SelectionAdapter(){
65 65
            @Override
66 66
            public void widgetSelected(SelectionEvent e) {
67 67
                isUseLocalSettings = activateLocalButton.getSelection();
68
                PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.OVERRIDE_NAME_DETAILS, isUseLocalSettings);
68
                PreferencesUtil.setBooleanValue(IPreferenceKeys.OVERRIDE_NAME_DETAILS, isUseLocalSettings);
69 69
                if(isUseLocalSettings ){
70 70
                    child.setVisible(true);
71 71
                    child.setEnabled(true);
......
80 80
            child.setLayout(new GridLayout());
81 81
            child.setVisible(isUseLocalSettings);
82 82

  
83
            isSimpleDetailsViewActivated = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_SIMPLE_NAME_DETAILS_SECTION);
83
            isSimpleDetailsViewActivated = PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_SIMPLE_NAME_DETAILS_SECTION);
84 84

  
85 85

  
86 86

  
......
107 107

  
108 108

  
109 109
            final Button showTaxon = new Button(localSettings, SWT.CHECK);
110
            isShowTaxon = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_SIMPLE_NAME_DETAILS_TAXON);
110
            isShowTaxon = PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_SIMPLE_NAME_DETAILS_TAXON);
111 111
            showTaxon.setText(Messages.NameDetailsViewComposite_Show_Taxon);
112 112
            showTaxon.setSelection(isShowTaxon);
113 113
            showTaxon.addSelectionListener(new SelectionAdapter(){
......
119 119
             });
120 120

  
121 121
            final Button showSecDetail = new Button(localSettings, SWT.CHECK);
122
            isSecDetailsActivated = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_SEC_DETAILS);
122
            isSecDetailsActivated = PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_SEC_DETAILS);
123 123
            showSecDetail.setText(Messages.NameDetailsViewComposite_Show_SecDetail);
124 124

  
125 125
            showSecDetail.setSelection(isSecDetailsActivated);
......
133 133

  
134 134
            final Button secEnabled = new Button(localSettings, SWT.CHECK);
135 135
            secEnabled.setText(Messages.NameDetailsViewComposite_SecEnabled);
136
            isSecEnabled = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.DISABLE_SEC);
136
            isSecEnabled = PreferencesUtil.getBooleanValue(IPreferenceKeys.DISABLE_SEC);
137 137
            secEnabled.setSelection(isSecEnabled);
138 138
            secEnabled.addSelectionListener(new SelectionAdapter(){
139 139
                 @Override
......
144 144
             });
145 145

  
146 146
            final Button showLsid = new Button(localSettings, SWT.CHECK);
147
            isShowLSID = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_LSID);
147
            isShowLSID = PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_LSID);
148 148
            showLsid.setText(Messages.NameDetailsViewComposite_Show_LSID);
149 149
            showLsid.setSelection(isShowLSID);
150 150
            showLsid.addSelectionListener(new SelectionAdapter(){
......
156 156
             });
157 157

  
158 158
            final Button showNomenclaturalCode = new Button(localSettings, SWT.CHECK);
159
            isShowNomenclaturalCode = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_CODE);
159
            isShowNomenclaturalCode = PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_CODE);
160 160
            showNomenclaturalCode.setText(Messages.NameDetailsViewComposite_Show_NomenclaturalCode);
161 161
            showNomenclaturalCode.setSelection(isShowNomenclaturalCode);
162 162
            showNomenclaturalCode.addSelectionListener(new SelectionAdapter(){
......
168 168
             });
169 169

  
170 170
            final Button showNameCache = new Button(localSettings, SWT.CHECK);
171
            isShowNameCache = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NAMECACHE);
171
            isShowNameCache = PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NAMECACHE);
172 172
            showNameCache.setText(Messages.NameDetailsViewComposite_Show_NameCache);
173 173
            showNameCache.setSelection(isShowNomenclaturalCode);
174 174
            showNameCache.addSelectionListener(new SelectionAdapter(){
......
179 179
                  }
180 180
             });
181 181
            final Button showAppendedPhrase = new Button(localSettings, SWT.CHECK);
182
            isShowAppendedPhrase = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_APPENDED_PHRASE);
182
            isShowAppendedPhrase = PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_APPENDED_PHRASE);
183 183
            showAppendedPhrase.setText(Messages.NameDetailsViewComposite_Show_AppendedPhrase);
184 184
            showAppendedPhrase.setSelection(isShowAppendedPhrase);
185 185
            showAppendedPhrase.addSelectionListener(new SelectionAdapter(){
......
191 191
             });
192 192

  
193 193
            final Button showRank = new Button(localSettings, SWT.CHECK);
194
            isShowRank = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_RANK);
194
            isShowRank = PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_RANK);
195 195
            showRank.setText(Messages.NameDetailsViewComposite_Show_Rank);
196 196
            showRank.setSelection(isShowRank);
197 197
            showRank.addSelectionListener(new SelectionAdapter(){
......
202 202
                  }
203 203
             });
204 204
            final Button showEpithets = new Button(localSettings, SWT.CHECK);
205
            isShowEpithets = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_ATOMISED_EPITHETS);
205
            isShowEpithets = PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_ATOMISED_EPITHETS);
206 206
            showEpithets.setText(Messages.NameDetailsViewComposite_Show_AtomisedEpithets);
207 207
            showEpithets.setSelection(isShowEpithets);
208 208
            showEpithets.addSelectionListener(new SelectionAdapter(){
......
214 214
             });
215 215

  
216 216
            final Button showAuthorCache = new Button(localSettings, SWT.CHECK);
217
            isShowAuthorCache = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_AUTHORSHIP_CACHE);
217
            isShowAuthorCache = PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_AUTHORSHIP_CACHE);
218 218
            showAuthorCache.setText(Messages.NameDetailsViewComposite_Show_AuthorCache);
219 219
            showAuthorCache.setSelection(isShowAuthorCache);
220 220
            showAuthorCache.addSelectionListener(new SelectionAdapter(){
......
226 226
             });
227 227

  
228 228
            final Button showAuthorship = new Button(localSettings, SWT.CHECK);
229
            isShowAuthorship = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_AUTHORSHIP);
229
            isShowAuthorship = PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_AUTHORSHIP);
230 230
            showAuthorship.setText(Messages.NameDetailsViewComposite_Show_Author);
231 231
            showAuthorship.setSelection(isShowAuthorship);
232 232
            showAuthorship.addSelectionListener(new SelectionAdapter(){
......
238 238
             });
239 239

  
240 240
            final Button showNomenclaturalRef = new Button(localSettings, SWT.CHECK);
241
            isShowNomenclaturalRef = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_REFERENCE);
241
            isShowNomenclaturalRef = PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_REFERENCE);
242 242
            showNomenclaturalRef.setText(Messages.NameDetailsViewComposite_Show_NomenclaturalReference);
243 243
            showNomenclaturalRef.setSelection(isShowNomenclaturalRef);
244 244
            showNomenclaturalRef.addSelectionListener(new SelectionAdapter(){
......
250 250
             });
251 251

  
252 252
            final Button showNomenclaturalStatus = new Button(localSettings, SWT.CHECK);
253
            isShowNomenclaturalStatus = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_STATUS);
253
            isShowNomenclaturalStatus = PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_STATUS);
254 254
            showNomenclaturalStatus.setText(Messages.NameDetailsViewComposite_Show_NomenclaturalStatus);
255 255
            showNomenclaturalStatus.setSelection(isShowNomenclaturalStatus);
256 256
            showNomenclaturalStatus.addSelectionListener(new SelectionAdapter(){
......
262 262
             });
263 263

  
264 264
            final Button showProtologue = new Button(localSettings, SWT.CHECK);
265
            isShowProtologue = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_PROTOLOGUE);
265
            isShowProtologue = PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_PROTOLOGUE);
266 266
            showProtologue.setText(Messages.NameDetailsViewComposite_Show_Protologue);
267 267
            showProtologue.setSelection(isShowProtologue);
268 268
            showProtologue.addSelectionListener(new SelectionAdapter(){
......
274 274
             });
275 275

  
276 276
            final Button showTypeDesignation = new Button(localSettings, SWT.CHECK);
277
            isShowTypeDesignation = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_TYPE_DESIGNATION);
277
            isShowTypeDesignation = PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_TYPE_DESIGNATION);
278 278
            showTypeDesignation.setText(Messages.NameDetailsViewComposite_Show_TypeDesignation);
279 279
            showTypeDesignation.setSelection(isShowTypeDesignation);
280 280
            showTypeDesignation.addSelectionListener(new SelectionAdapter(){
......
287 287

  
288 288

  
289 289
            final Button showNameRelationship = new Button(localSettings, SWT.CHECK);
290
            isShowNameRelationship = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NAME_RELATIONSHIP);
290
            isShowNameRelationship = PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NAME_RELATIONSHIP);
291 291
            showNameRelationship.setText(Messages.NameDetailsViewComposite_Show_Namerelationships);
292 292
            showNameRelationship.setSelection(isShowNameRelationship);
293 293
            showNameRelationship.addSelectionListener(new SelectionAdapter(){
......
299 299
             });
300 300

  
301 301
            final Button showHybrid = new Button(localSettings, SWT.CHECK);
302
            isShowHybrid = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_HYBRID);
302
            isShowHybrid = PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_HYBRID);
303 303
            showHybrid.setText(Messages.NameDetailsViewComposite_Show_Hybrid);
304 304
            showHybrid.setSelection(isShowHybrid);
305 305
            showHybrid.addSelectionListener(new SelectionAdapter(){
......
310 310
                  }
311 311
             });
312 312
            final Button showNameApprobiation = new Button(localSettings, SWT.CHECK);
313
            isShowNameApprobiation = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NAME_APPROBATION);
313
            isShowNameApprobiation = PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NAME_APPROBATION);
314 314
            showNameApprobiation.setText(Messages.NameDetailsViewComposite_Show_NameApprobiation);
315 315
            showNameApprobiation.setSelection(isShowNameApprobiation);
316 316
            showNameApprobiation.addSelectionListener(new SelectionAdapter(){
......
336 336

  
337 337
    @Override
338 338
    public boolean performOk() {
339
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_SIMPLE_NAME_DETAILS_TAXON, isShowTaxon);
340
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_SEC_DETAILS, isSecDetailsActivated);
341
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.DISABLE_SEC, isSecEnabled);
342
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_SIMPLE_NAME_DETAILS_SECTION, isSimpleDetailsViewActivated);
343
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NAME_APPROBATION, isShowNameApprobiation);
344
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_HYBRID, isShowHybrid);
345
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NAME_RELATIONSHIP, isShowNameRelationship);
346
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_TYPE_DESIGNATION, isShowTypeDesignation);
347
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_PROTOLOGUE, isShowProtologue);
348
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_STATUS, isShowNomenclaturalStatus);
349
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_REFERENCE, isShowNomenclaturalRef);
350
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_AUTHORSHIP, isShowAuthorship);
351
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_AUTHORSHIP_CACHE, isShowAuthorCache);
352
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_ATOMISED_EPITHETS, isShowEpithets);
353
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_RANK, isShowRank);
354
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_APPENDED_PHRASE, isShowAppendedPhrase);
355
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NAMECACHE, isShowNameCache);
356
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_CODE, isShowNomenclaturalCode);
357
        PreferencesUtil.getPreferenceStore().setValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_LSID, isShowLSID);
339
        PreferencesUtil.setBooleanValue(IPreferenceKeys.SHOW_SIMPLE_NAME_DETAILS_TAXON, isShowTaxon);
340
        PreferencesUtil.setBooleanValue(IPreferenceKeys.SHOW_SEC_DETAILS, isSecDetailsActivated);
341
        PreferencesUtil.setBooleanValue(IPreferenceKeys.DISABLE_SEC, isSecEnabled);
342
        PreferencesUtil.setBooleanValue(IPreferenceKeys.SHOW_SIMPLE_NAME_DETAILS_SECTION, isSimpleDetailsViewActivated);
343
        PreferencesUtil.setBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NAME_APPROBATION, isShowNameApprobiation);
344
        PreferencesUtil.setBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_HYBRID, isShowHybrid);
345
        PreferencesUtil.setBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NAME_RELATIONSHIP, isShowNameRelationship);
346
        PreferencesUtil.setBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_TYPE_DESIGNATION, isShowTypeDesignation);
347
        PreferencesUtil.setBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_PROTOLOGUE, isShowProtologue);
348
        PreferencesUtil.setBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_STATUS, isShowNomenclaturalStatus);
349
        PreferencesUtil.setBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_REFERENCE, isShowNomenclaturalRef);
350
        PreferencesUtil.setBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_AUTHORSHIP, isShowAuthorship);
351
        PreferencesUtil.setBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_AUTHORSHIP_CACHE, isShowAuthorCache);
352
        PreferencesUtil.setBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_ATOMISED_EPITHETS, isShowEpithets);
353
        PreferencesUtil.setBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_RANK, isShowRank);
354
        PreferencesUtil.setBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_APPENDED_PHRASE, isShowAppendedPhrase);
355
        PreferencesUtil.setBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NAMECACHE, isShowNameCache);
356
        PreferencesUtil.setBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_CODE, isShowNomenclaturalCode);
357
        PreferencesUtil.setBooleanValue(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_LSID, isShowLSID);
358 358
        return true;
359 359

  
360 360
    }
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencePropertyTester.java
49 49
	 * @return
50 50
	 */
51 51
	private boolean isShowExperimentalFeatures() {
52
		return PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_EXPERIMENTAL_FEATURES);
52
		return PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_EXPERIMENTAL_FEATURES);
53 53
	}
54 54

  
55 55
	private boolean isChecklistEditorEnabled() {
56
        return PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.DISTRIBUTION_AREA_PREFRENCES_ACTIVE);
56
        return PreferencesUtil.getBooleanValue(IPreferenceKeys.DISTRIBUTION_AREA_PREFRENCES_ACTIVE);
57 57
    }
58 58
	private boolean isShowIOMenuEnabled() {
59
        return PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_IO_MENU);
59
        return PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_IO_MENU);
60 60
    }
61 61

  
62 62
	private boolean isShowSpecimenMenuEnabled() {
63
        return PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_SPECIMEN);
63
        return PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_SPECIMEN);
64 64
    }
65 65

  
66 66
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
66 66
import eu.etaxonomy.taxeditor.model.AbstractUtility;
67 67
import eu.etaxonomy.taxeditor.model.MessagingUtils;
68 68
import eu.etaxonomy.taxeditor.model.NomenclaturalCodeHelper;
69
import eu.etaxonomy.taxeditor.remoting.source.CdmRemoteSource;
69 70
import eu.etaxonomy.taxeditor.store.CdmStore;
70 71
import eu.etaxonomy.taxeditor.store.TermStore;
71 72
import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
......
106 107
		return TaxeditorStorePlugin.getDefault().getPreferenceStore();
107 108
	}
108 109

  
110
	/**
111
     * <p>
112
     * setStringValue
113
     * </p>
114
     *
115
     *
116
     **/
117
    public static void setStringValue(String name, String value) {
118
        getPreferenceStore().setValue(name + "_"+  ((CdmRemoteSource)CdmStore.getActiveCdmSource()).toString(), value);
119
    }
120

  
121
    /**
122
     * <p>
123
     * setIntValue
124
     * </p>
125
     *
126
     *
127
     **/
128
    public static void setIntValue(String name, int value) {
129
        getPreferenceStore().setValue(name + "_"+  ((CdmRemoteSource)CdmStore.getActiveCdmSource()).toString(), value);
130
    }
131

  
132
    /**
133
     * <p>
134
     * setBooleanValue
135
     * </p>
136
     *
137
     *
138
     **/
139
    public static void setBooleanValue(String name, boolean value) {
140
        getPreferenceStore().setValue(name + "_"+  ((CdmRemoteSource)CdmStore.getActiveCdmSource()).toString(), value);
141
    }
142

  
143
    /**
144
     * <p>
145
     * setBooleanValue
146
     * </p>
147
     *
148
     *
149
     **/
150
    public static void setDoubleValue(String name, double value) {
151
        getPreferenceStore().setValue(name + "_"+  ((CdmRemoteSource)CdmStore.getActiveCdmSource()).toString(), value);
152
    }
153

  
154
    /**
155
     * <p>
156
     * setFloatValue
157
     * </p>
158
     *
159
     *
160
     **/
161
    public static void setFloatValue(String name, float value) {
162
        getPreferenceStore().setValue(name + ((CdmRemoteSource)CdmStore.getActiveCdmSource()).toString(), value);
163
    }
164

  
165
    /**
166
     * <p>
167
     * setFloatValue
168
     * </p>
169
     *
170
     *
171
     **/
172
    public static void setLongValue(String name, long value) {
173
        getPreferenceStore().setValue(name + "_"+  ((CdmRemoteSource)CdmStore.getActiveCdmSource()).toString(), value);
174
    }
175

  
176
    /**
177
     * <p>
178
     * setStringValue
179
     * </p>
180
     *
181
     *
182
     **/
183
    public static String getStringValue(String name) {
184
        return getPreferenceStore().getString(name + "_"+ ((CdmRemoteSource)CdmStore.getActiveCdmSource()).toString());
185
    }
186

  
187
    /**
188
     * <p>
189
     * setIntValue
190
     * </p>
191
     *
192
     *
193
     **/
194
    public static int getIntValue(String name) {
195
        return getPreferenceStore().getInt(name + "_"+ ((CdmRemoteSource)CdmStore.getActiveCdmSource()).toString());
196
    }
197

  
198
    /**
199
     * <p>
200
     * setBooleanValue
201
     * </p>
202
     *
203
     *
204
     **/
205
    public static boolean getBooleanValue(String name) {
206
        if (CdmStore.isActive()){
207
            String test = name + "_"+((CdmRemoteSource)CdmStore.getActiveCdmSource()).toString();
208
            return getPreferenceStore().
209
                    getBoolean(name + "_"+((CdmRemoteSource)CdmStore.getActiveCdmSource()).toString());
210
        }else{
211
            return getPreferenceStore().getBoolean(name);
212
        }
213

  
214
    }
215

  
216
    /**
217
     * <p>
218
     * setBooleanValue
219
     * </p>
220
     *
221
     *
222
     **/
223
    public static double getDoubleValue(String name) {
224
        return getPreferenceStore().getDouble(name + "_"+  ((CdmRemoteSource)CdmStore.getActiveCdmSource()).toString());
225
    }
226

  
227
    /**
228
     * <p>
229
     * setFloatValue
230
     * </p>
231
     *
232
     *
233
     **/
234
    public static float getFloatValue(String name) {
235
        return getPreferenceStore().getFloat(name + "_"+ ((CdmRemoteSource)CdmStore.getActiveCdmSource()).toString());
236
    }
237

  
238
    /**
239
     * <p>
240
     * setFloatValue
241
     * </p>
242
     *
243
     *
244
     **/
245
    public static long getLongValue(String name) {
246
        return getPreferenceStore().getLong(name + "_"+ ((CdmRemoteSource)CdmStore.getActiveCdmSource()).toString());
247
    }
248

  
249

  
109 250
	/**
110 251
	 * <p>
111 252
	 * setPreferredNomenclaturalCode
......
118 259
	public static CdmPreference setPreferredNomenclaturalCode(
119 260
			String preferenceKey, boolean local) {
120 261
	    if (local){
121
	        getPreferenceStore().setValue(PREFERRED_NOMENCLATURAL_CODE_KEY,
262
	        setStringValue(PREFERRED_NOMENCLATURAL_CODE_KEY,
122 263
	                preferenceKey);
123 264
	    }
124 265
	    else{
......
140 281
    			if (preference == null){
141 282
    				return null;
142 283
    			} else{
143
    				getPreferenceStore().setValue(PREFERRED_NOMENCLATURAL_CODE_KEY,
144
    				        preferenceKey);
145
    				getPreferenceStore().setValue(ALLOW_OVERRIDE_NOMENCLATURAL_CODE_KEY,preference.isAllowOverride());
284
    			    setStringValue(PREFERRED_NOMENCLATURAL_CODE_KEY,
285
    				        preference.getValue());
286
    			    setBooleanValue(ALLOW_OVERRIDE_NOMENCLATURAL_CODE_KEY,preference.isAllowOverride());
146 287
    				return preference;
147 288
    			}
148 289
    		} else{
......
158 299
	}
159 300

  
160 301
	public static NomenclaturalCode getPreferredNomenclaturalCode(){
161
	    if (getPreferenceStore().getBoolean(OVERRIDE_NOMENCLATURAL_CODE_KEY)) {
302
	    if (getBooleanValue(OVERRIDE_NOMENCLATURAL_CODE_KEY)) {
162 303
            return getPreferredNomenclaturalCode(true);
163 304
        } else{
164 305
            return getPreferredNomenclaturalCode(false);
......
181 322

  
182 323
	    String preferredCode;
183 324
	    if(pref == null){
184
	    	preferredCode = getPreferenceStore().getString(
325
	    	preferredCode = getStringValue(
185 326
					PREFERRED_NOMENCLATURAL_CODE_KEY);
186 327

  
187 328
	    }else{
......
210 351
    }
211 352

  
212 353
	public static boolean isShowTaxonAssociations(){
213
        if (getPreferenceStore().getBoolean(SHOW_TAXON_ASSOCIATIONS_OVERRIDE) && getPreferenceStore().getBoolean(SHOW_TAXON_ASSOCIATIONS_ALLOW_OVERRIDE)) {
214
            return getPreferenceStore().getBoolean(SHOW_TAXON_ASSOCIATIONS);
354
        if (getBooleanValue(SHOW_TAXON_ASSOCIATIONS_OVERRIDE) && getBooleanValue(SHOW_TAXON_ASSOCIATIONS_ALLOW_OVERRIDE)) {
355
            return getBooleanValue(SHOW_TAXON_ASSOCIATIONS);
215 356
        } else{
216 357
            CdmPreference pref = getPreferenceFromDB(PreferencePredicate.ShowTaxonAssociations);
217 358

  
......
220 361
    }
221 362

  
222 363
	public static boolean isShowLifeForm(){
223
        if (getPreferenceStore().getBoolean(SHOW_LIFE_FORM_OVERRIDE) && getPreferenceStore().getBoolean(SHOW_LIFE_FORM_ALLOW_OVERRIDE)) {
224
            return getPreferenceStore().getBoolean(SHOW_LIFE_FORM);
364
        if (getBooleanValue(SHOW_LIFE_FORM_OVERRIDE) && getBooleanValue(SHOW_LIFE_FORM_ALLOW_OVERRIDE)) {
365
            return getBooleanValue(SHOW_LIFE_FORM);
225 366
        } else{
226 367
            CdmPreference pref = getPreferenceFromDB(PreferencePredicate.ShowLifeForm);
227 368

  
......
230 371
    }
231 372

  
232 373
	public static boolean isDeterminationOnlyForFieldUnits(){
233
        if (getPreferenceStore().getBoolean(DETERMINATION_ONLY_FOR_FIELD_UNITS_OVERRIDE) && getPreferenceStore().getBoolean(DETERMINATIONS_ONLY_FOR_FIELDUNITS_ALLOW_OVERRIDE)) {
234
            return getPreferenceStore().getBoolean(DETERMINATION_ONLY_FOR_FIELD_UNITS);
374
        if (getBooleanValue(DETERMINATION_ONLY_FOR_FIELD_UNITS_OVERRIDE) && getBooleanValue(DETERMINATIONS_ONLY_FOR_FIELDUNITS_ALLOW_OVERRIDE)) {
375
            return getBooleanValue(DETERMINATION_ONLY_FOR_FIELD_UNITS);
235 376
        } else{
236 377
            CdmPreference pref = getPreferenceFromDB(PreferencePredicate.DeterminationOnlyForFieldUnits);
237 378

  
......
240 381
    }
241 382

  
242 383
	public static boolean isCollectingAreaInGeneralSection(){
243
        if (getPreferenceStore().getBoolean(SHOW_COLLECTING_AREAS_IN_GENERAL_SECTION_OVERRIDE) && getPreferenceStore().getBoolean(SHOW_COLLECTING_AREAS_IN_GENERAL_SECTION_ALLOW_OVERRIDE)) {
244
            return getPreferenceStore().getBoolean(SHOW_COLLECTING_AREAS_IN_GENERAL_SECTION);
384
        if (getBooleanValue(SHOW_COLLECTING_AREAS_IN_GENERAL_SECTION_OVERRIDE) && getBooleanValue(SHOW_COLLECTING_AREAS_IN_GENERAL_SECTION_ALLOW_OVERRIDE)) {
385
            return getBooleanValue(SHOW_COLLECTING_AREAS_IN_GENERAL_SECTION);
245 386
        } else{
246 387
            CdmPreference pref = getPreferenceFromDB(PreferencePredicate.ShowCollectingAreasInGeneralSection);
247 388

  
......
250 391
    }
251 392

  
252 393
	public static boolean isShowSimpleDetailsView(){
253
        if (getPreferenceStore().getBoolean(OVERRIDE_NAME_DETAILS) && getPreferenceStore().getBoolean(ALLOW_OVERRIDE_NAME_DETAILS)) {
254
            return getPreferenceStore().getBoolean(SHOW_SIMPLE_NAME_DETAILS_SECTION);
394
        if (getBooleanValue(OVERRIDE_NAME_DETAILS) && getBooleanValue(ALLOW_OVERRIDE_NAME_DETAILS)) {
395
            return getBooleanValue(SHOW_SIMPLE_NAME_DETAILS_SECTION);
255 396
        } else{
256 397
            CdmPreference pref = getPreferenceFromDB(PreferencePredicate.NameDetailsView);
257 398

  
......
295 436

  
296 437

  
297 438
	public static String getPreferredDefaultLangugae(){
298
	    String preferredLanguage = getPreferenceStore().getString(DEFAULT_LANGUAGE_EDITOR);
439
	    String preferredLanguage = getStringValue(DEFAULT_LANGUAGE_EDITOR);
299 440
	    if(StringUtils.isNotEmpty(preferredLanguage) && StringUtils.isNotBlank(preferredLanguage)){
300 441
	        return preferredLanguage;
301 442
	    }
......
303 444
	}
304 445

  
305 446
	public static boolean isShowMediaPreview(){
306
        boolean isShowMediaPreview = getPreferenceStore().getBoolean(SHOW_MEDIA_PREVIEW);
447
        boolean isShowMediaPreview = getBooleanValue(SHOW_MEDIA_PREVIEW);
307 448
        return isShowMediaPreview;
308 449
    }
309 450

  
......
317 458
	 */
318 459
	public static IMatchStrategy getMatchStrategy(Class clazz) {
319 460
		String className = clazz.getName();
320
		if (getPreferenceStore().getBoolean(MATCH_STRATEGY_PREFIX + className)) {
461
		if (getBooleanValue(MATCH_STRATEGY_PREFIX + className)) {
321 462
			IMatchStrategy matchStrategy = getDefaultMatchStrategy(clazz);
322 463

  
323 464
			for (String fieldName : matchStrategy.getMatchFieldPropertyNames()) {
324
				String matchModeName = getPreferenceStore().getString(
465
				String matchModeName = getStringValue(
325 466
						getMatchStrategyFieldName(className, fieldName));
326 467
				MatchMode matchMode = MatchMode.valueOf(matchModeName);
327 468
				try {
......
346 487
	 */
347 488
	public static void setMatchStrategy(IMatchStrategy matchStrategy) {
348 489
		String className = matchStrategy.getMatchClass().getName();
349
		getPreferenceStore().setValue(MATCH_STRATEGY_PREFIX + className, true);
490
		setBooleanValue(MATCH_STRATEGY_PREFIX + className, true);
350 491

  
351 492
		Set<String> matchFields = matchStrategy.getMatchFieldPropertyNames();
352 493

  
353 494
		for (String fieldName : matchFields) {
354
			getPreferenceStore().setValue(
495
			setStringValue(
355 496
					getMatchStrategyFieldName(className, fieldName),
356 497
					matchStrategy.getMatchMode(fieldName).name());
357 498
		}
......
483 624
				TAXON_SERVICE_CONFIGURATOR_NAMES));
484 625
		configurator.setDoTaxaByCommonNames(getPreferenceStore().getBoolean(
485 626
				TAXON_SERVICE_CONFIGURATOR_COMMON_NAMES));
486
		//configurator.setMatchMode(eu.etaxonomy.cdm.persistence.query.MatchMode.valueOf(getPreferenceStore().getString(TAXON_SERVICE_CONFIGURATOR_MATCH_MODE)));
627
		//configurator.setMatchMode(eu.etaxonomy.cdm.persistence.query.MatchMode.valueOf(getStringValue(TAXON_SERVICE_CONFIGURATOR_MATCH_MODE)));
487 628

  
488 629
		return configurator;
489 630
	}
......
555 696
				null, clazz);
556 697
	}
557 698

  
699
	public static String createPreferenceString(String property){
700
	   return property +"_"+((CdmRemoteSource)CdmStore.getActiveCdmSource()).toString();
701

  
702
	}
703

  
558 704
	/**
559 705
	 * Set default values for preferences
560 706
	 */
561 707
	public static void setDefaults() {
562
		getPreferenceStore().setDefault(TAXON_SERVICE_CONFIGURATOR_TAXA, true);
563
		getPreferenceStore().setDefault(TAXON_SERVICE_CONFIGURATOR_SYNONYMS,
708
		getPreferenceStore().setDefault(createPreferenceString(TAXON_SERVICE_CONFIGURATOR_TAXA), true);
709
		getPreferenceStore().setDefault(createPreferenceString(TAXON_SERVICE_CONFIGURATOR_SYNONYMS),
564 710
				true);
565
		getPreferenceStore().setDefault(EDIT_MAP_SERVICE_ACCES_POINT,
711
		getPreferenceStore().setDefault(createPreferenceString(EDIT_MAP_SERVICE_ACCES_POINT),
566 712
				"http://edit.africamuseum.be/edit_wp5/v1.2/rest_gen.php");
567 713
		//FIXME : changed default for SHOULD_CONNECT_AT_STARTUP to false (ticket 3828) until resolution
568
		getPreferenceStore().setDefault(SHOULD_CONNECT_AT_STARTUP, false);
569
		getPreferenceStore().setDefault(OPENURL_ACCESS_POINT,
714
		getPreferenceStore().setDefault(createPreferenceString(SHOULD_CONNECT_AT_STARTUP), false);
715
		getPreferenceStore().setDefault(createPreferenceString(OPENURL_ACCESS_POINT),
570 716
				"http://www.biodiversitylibrary.org/openurl");
571
		getPreferenceStore().setDefault(OPENURL_IMAGE_MAX_WIDTH, "1000");
572
		getPreferenceStore().setDefault(OPENURL_IMAGE_MAX_HEIGHT, "1000");
717
		getPreferenceStore().setDefault(createPreferenceString(OPENURL_IMAGE_MAX_WIDTH), "1000");
718
		getPreferenceStore().setDefault(createPreferenceString(OPENURL_IMAGE_MAX_HEIGHT), "1000");
573 719
		//Distribution Editor:
574
		getPreferenceStore().setDefault(DISTRIBUTION_AREA_PREFRENCES_ACTIVE, true);
575
		getPreferenceStore().setDefault(CHECKLIST_AREA_DISPLAY, CHECKLIST_AREA_DISPLAY_TITLE);
576
		getPreferenceStore().setDefault(CHECKLIST_SYMBOL, false);
720
		getPreferenceStore().setDefault(createPreferenceString(DISTRIBUTION_AREA_PREFRENCES_ACTIVE), true);
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff