Project

General

Profile

« Previous | Next » 

Revision 9b8d1a1c

Added by Katja Luther about 5 years ago

ref #8078: move editorPreferencePredicates to cdmlib

View differences:

eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/LifeCycleManager.java
38 38
import org.eclipse.ui.PlatformUI;
39 39
import org.osgi.service.event.Event;
40 40

  
41
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
41 42
import eu.etaxonomy.taxeditor.model.IContextListener;
42
import eu.etaxonomy.taxeditor.preference.EditorPreferencePredicate;
43 43
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
44 44
import eu.etaxonomy.taxeditor.store.CdmStore;
45 45

  
......
137 137
        PreferencesUtil.updateDBPreferences();
138 138

  
139 139
        hideParts();
140
        if (PreferencesUtil.getBooleanValue(EditorPreferencePredicate.ShowChecklistPerspective.getKey())){
140
        if (PreferencesUtil.getBooleanValue(PreferencePredicate.ShowChecklistPerspective.getKey())){
141 141
            IWorkbench workbench = PlatformUI.getWorkbench();
142 142
            IWorkbenchWindow window = workbench
143 143
                    .getActiveWorkbenchWindow();
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistLabelProvider.java
44 44
import eu.etaxonomy.cdm.model.name.TaxonName;
45 45
import eu.etaxonomy.cdm.model.taxon.Taxon;
46 46
import eu.etaxonomy.taxeditor.editor.view.checklist.e4.ChecklistEditorE4;
47
import eu.etaxonomy.taxeditor.preference.EditorPreferencePredicate;
48 47
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
49 48
import eu.etaxonomy.taxeditor.preference.TermOrder;
50 49
import eu.etaxonomy.taxeditor.store.CdmStore;
......
163 162
    private SortedSet<DefinedTermBase> loadNamedAreas() {
164 163
        //IPreferenceStore preferenceStore = PreferencesUtil.getPreferenceStore();
165 164

  
166
        String valuesAreas = PreferencesUtil.getStringValue(EditorPreferencePredicate.AvailableDistributionAreaTerms.getKey());
165
        String valuesAreas = PreferencesUtil.getStringValue(PreferencePredicate.AvailableDistributionAreaTerms.getKey());
167 166
        String values = PreferencesUtil.getStringValue(PreferencePredicate.AvailableDistributionAreaVocabularies.getKey());
168 167
        if (values != null && values != "") { //$NON-NLS-1$
169 168
            String[] split = values.split(";"); //$NON-NLS-1$
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/DistributionEditingSupportE4.java
40 40
import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;
41 41
import eu.etaxonomy.cdm.model.description.TaxonDescription;
42 42
import eu.etaxonomy.cdm.model.location.NamedArea;
43
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
43 44
import eu.etaxonomy.cdm.model.metadata.TermDisplayEnum;
44 45
import eu.etaxonomy.cdm.model.taxon.Taxon;
45 46
import eu.etaxonomy.taxeditor.event.EventUtility;
46 47
import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;
47
import eu.etaxonomy.taxeditor.preference.EditorPreferencePredicate;
48 48
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
49 49
import eu.etaxonomy.taxeditor.store.CdmStore;
50 50

  
......
289 289
                    if (!added){// there are no TaxonDescription yet.
290 290
                        TaxonDescription td = TaxonDescription.NewInstance(taxon);
291 291

  
292
                        if (PreferencesUtil.getBooleanValue(EditorPreferencePredicate.OwnDescriptionForDistributionEditor.getKey())){
292
                        if (PreferencesUtil.getBooleanValue(PreferencePredicate.OwnDescriptionForDistributionEditor.getKey())){
293 293
                            td.addAnnotation(Annotation.NewDefaultLanguageInstance(DISTRIBUTION_EDITOR_DESCRIPTIONS));
294 294
                            td.setTitleCache(td.getTitleCache() + ": Distribution Editor Facts", true);
295 295
                        }
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/DistributionEditor.java
93 93
import eu.etaxonomy.taxeditor.editor.EditorUtil;
94 94
import eu.etaxonomy.taxeditor.editor.l10n.Messages;
95 95
import eu.etaxonomy.taxeditor.model.AbstractUtility;
96
import eu.etaxonomy.taxeditor.preference.EditorPreferencePredicate;
97 96
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
98 97
import eu.etaxonomy.taxeditor.preference.Resources;
99 98
import eu.etaxonomy.taxeditor.preference.TermOrder;
......
163 162
     */
164 163
    public DistributionEditor(Composite parent, DistributionEditorPart part) {
165 164
        super(parent, SWT.NULL);
166
        isShowRank = PreferencesUtil.getBooleanValue(EditorPreferencePredicate.ShowRankInDistributionEditor.getKey());
165
        isShowRank = PreferencesUtil.getBooleanValue(PreferencePredicate.ShowRankInDistributionEditor.getKey());
167 166
        this.part = part;
168 167
        this.setLayout(new GridLayout());
169 168
        GridLayoutFactory.fillDefaults().applyTo(parent);
......
620 619
    private SortedSet<DefinedTermBase> loadNamedAreas() {
621 620
        //IPreferenceStore preferenceStore = PreferencesUtil.getPreferenceStore();
622 621

  
623
        String valuesAreas = PreferencesUtil.getStringValue(EditorPreferencePredicate.AvailableDistributionAreaTerms.getKey());
622
        String valuesAreas = PreferencesUtil.getStringValue(PreferencePredicate.AvailableDistributionAreaTerms.getKey());
624 623
        String values = PreferencesUtil.getStringValue(PreferencePredicate.AvailableDistributionAreaVocabularies.getKey());
625 624
        Set<UUID> uuidList = new HashSet<UUID>();
626 625
        String[] split;
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/FilterStatusDisplayConverter.java
14 14
import eu.etaxonomy.cdm.model.common.Representation;
15 15
import eu.etaxonomy.cdm.model.description.Distribution;
16 16
import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;
17
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
17 18
import eu.etaxonomy.cdm.model.metadata.TermDisplayEnum;
18
import eu.etaxonomy.taxeditor.preference.EditorPreferencePredicate;
19 19
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
20 20
import eu.etaxonomy.taxeditor.store.CdmStore;
21 21

  
......
36 36
            if (distribution.getStatus() != null){
37 37

  
38 38
                Representation rep = distribution.getStatus().getPreferredRepresentation(CdmStore.getDefaultLanguage());
39
                String displayStatus = PreferencesUtil.getStringValue(EditorPreferencePredicate.DisplayOfStatus.getKey());
39
                String displayStatus = PreferencesUtil.getStringValue(PreferencePredicate.DisplayOfStatus.getKey());
40 40
                String label = rep.getLabel();
41 41
                if(PreferencesUtil.displayStatusInChecklistEditor().equals(TermDisplayEnum.IdInVocabulary.getKey())){
42 42
                    return (StringUtils.isNotBlank(distribution.getStatus().getIdInVocabulary()))?distribution.getStatus().getIdInVocabulary():label;
......
57 57
        }else if(canonicalValue instanceof PresenceAbsenceTerm){
58 58
            PresenceAbsenceTerm status = (PresenceAbsenceTerm)canonicalValue;
59 59
            Representation rep = status.getPreferredRepresentation(CdmStore.getDefaultLanguage());
60
            String displayStatus = PreferencesUtil.getStringValue(EditorPreferencePredicate.DisplayOfStatus.getKey());
60
            String displayStatus = PreferencesUtil.getStringValue(PreferencePredicate.DisplayOfStatus.getKey());
61 61
            String label = rep.getLabel();
62 62
            if (status.getId() == 0){
63 63
                return DEFAULT_ENTRY;
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/handler/OpenChecklistEditorHandlerE4.java
10 10

  
11 11
import eu.etaxonomy.cdm.api.service.IClassificationService;
12 12
import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
13
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
13 14
import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
14 15
import eu.etaxonomy.taxeditor.editor.AppModelId;
15 16
import eu.etaxonomy.taxeditor.editor.EditorUtil;
16 17
import eu.etaxonomy.taxeditor.editor.l10n.Messages;
17 18
import eu.etaxonomy.taxeditor.handler.defaultHandler.e4.DefaultOpenHandlerBaseE4;
18
import eu.etaxonomy.taxeditor.preference.EditorPreferencePredicate;
19 19
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
20 20
import eu.etaxonomy.taxeditor.store.CdmStore;
21 21

  
......
86 86
     */
87 87
    @Override
88 88
    protected boolean canExecute(ITaxonTreeNode entity) {
89
        return entity!=null && PreferencesUtil.getBooleanValue(EditorPreferencePredicate.DistributionEditorActivated.getKey());
89
        return entity!=null && PreferencesUtil.getBooleanValue(PreferencePredicate.DistributionEditorActivated.getKey());
90 90
    }
91 91

  
92 92
    @Override
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/CreateDescriptionHandlerE4.java
17 17
import org.eclipse.e4.ui.services.IServiceConstants;
18 18
import org.eclipse.jface.viewers.TreeNode;
19 19

  
20
import eu.etaxonomy.cdm.model.name.TaxonName;
20 21
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
21 22
import eu.etaxonomy.cdm.model.taxon.Taxon;
22 23
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
23 24
import eu.etaxonomy.taxeditor.editor.EditorUtil;
24 25
import eu.etaxonomy.taxeditor.editor.view.descriptive.e4.FactualDataPartE4;
26
import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.CreateNamedescriptionOperation;
25 27
import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.CreateSpecimenDescriptionOperation;
26 28
import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.CreateTaxonDescriptionOperation;
27 29
import eu.etaxonomy.taxeditor.model.AbstractUtility;
......
57 59
                AbstractUtility.executeOperation(operation, sync);
58 60
            }
59 61
        }
62
        if(viewerInput instanceof TaxonName){
63
            operation = new CreateNamedescriptionOperation(menuItem.getLocalizedLabel(), EditorUtil.getUndoContext(), (TaxonName) viewerInput, factualDataPart);
64
            if(operation!=null){
65
                AbstractUtility.executeOperation(operation, sync);
66
            }
67
        }
60 68
	}
61 69

  
62 70
    protected CreateTaxonDescriptionOperation createTaxonOperation(String eventLabel, Taxon taxon, IPostOperationEnabled postOperationEnabled) {
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/CloneClassificationHandlerE4.java
14 14
import org.eclipse.jface.wizard.WizardDialog;
15 15
import org.eclipse.swt.widgets.Shell;
16 16

  
17
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
17 18
import eu.etaxonomy.cdm.model.reference.Reference;
18 19
import eu.etaxonomy.cdm.model.taxon.Classification;
19 20
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
......
22 23
import eu.etaxonomy.taxeditor.navigation.l10n.Messages;
23 24
import eu.etaxonomy.taxeditor.navigation.navigator.e4.TaxonNavigatorE4;
24 25
import eu.etaxonomy.taxeditor.navigation.operation.CloneClassificationOperation;
25
import eu.etaxonomy.taxeditor.preference.EditorPreferencePredicate;
26 26
import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
27 27
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
28 28
import eu.etaxonomy.taxeditor.store.StoreUtil;
......
75 75
                && selection.getFirstElement() instanceof TaxonNode
76 76
                && ((TaxonNode) selection.getFirstElement()).getTaxon()==null
77 77
                && PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_EXPERIMENTAL_FEATURES)
78
                && !PreferencesUtil.getBooleanValue(EditorPreferencePredicate.DisableMultiClassification.getKey());
78
                && !PreferencesUtil.getBooleanValue(PreferencePredicate.DisableMultiClassification.getKey());
79 79
        menuItem.setVisible(canExecute);
80 80
        return canExecute;
81 81
    }
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/CreateClassificationHierarchyHandlerE4.java
10 10
import org.eclipse.e4.ui.services.IServiceConstants;
11 11
import org.eclipse.jface.viewers.TreeSelection;
12 12

  
13
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
13 14
import eu.etaxonomy.cdm.model.taxon.Classification;
14 15
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
15 16
import eu.etaxonomy.taxeditor.model.AbstractUtility;
......
17 18
import eu.etaxonomy.taxeditor.navigation.l10n.Messages;
18 19
import eu.etaxonomy.taxeditor.navigation.navigator.e4.TaxonNavigatorE4;
19 20
import eu.etaxonomy.taxeditor.navigation.operation.CreateNewTaxonHierarchyOperation;
20
import eu.etaxonomy.taxeditor.preference.EditorPreferencePredicate;
21 21
import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
22 22
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
23 23
import eu.etaxonomy.taxeditor.store.StoreUtil;
......
58 58
                && selection.getFirstElement() instanceof TaxonNode
59 59
                && ((TaxonNode) selection.getFirstElement()).getTaxon()==null
60 60
                && PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_EXPERIMENTAL_FEATURES)
61
                && !PreferencesUtil.getBooleanValue(EditorPreferencePredicate.DisableMultiClassification.getKey());
61
                && !PreferencesUtil.getBooleanValue(PreferencePredicate.DisableMultiClassification.getKey());
62 62
        menuItem.setVisible(canExecute);
63 63
        return canExecute;
64 64
    }
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/NewClassificationHandlerE4.java
20 20
import org.eclipse.jface.wizard.WizardDialog;
21 21
import org.eclipse.swt.widgets.Shell;
22 22

  
23
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
23 24
import eu.etaxonomy.taxeditor.navigation.navigator.TaxonNodePropertyTester;
24 25
import eu.etaxonomy.taxeditor.newWizard.NewClassificationWizard;
25
import eu.etaxonomy.taxeditor.preference.EditorPreferencePredicate;
26 26
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
27 27

  
28 28
/**
......
47 47
    private boolean canExecute(MHandledMenuItem menuItem){
48 48
        boolean canExecute = false;
49 49

  
50
        canExecute = TaxonNodePropertyTester.noClassifiactionExists() || !PreferencesUtil.getBooleanValue(EditorPreferencePredicate.DisableMultiClassification.getKey());
50
        canExecute = TaxonNodePropertyTester.noClassifiactionExists() || !PreferencesUtil.getBooleanValue(PreferencePredicate.DisableMultiClassification.getKey());
51 51
        menuItem.setVisible(canExecute);
52 52
        return canExecute;
53 53
    }
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/AbcdImportPreference.java
25 25
import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator;
26 26
import eu.etaxonomy.cdm.model.metadata.CdmPreference;
27 27
import eu.etaxonomy.cdm.model.metadata.CdmPreference.PrefKey;
28
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
28 29
import eu.etaxonomy.cdm.model.metadata.PreferenceSubject;
29 30
import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
30 31
import eu.etaxonomy.taxeditor.l10n.Messages;
31
import eu.etaxonomy.taxeditor.preference.EditorPreferencePredicate;
32 32
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
33 33
import eu.etaxonomy.taxeditor.preference.menu.CdmPreferencePage;
34 34
import eu.etaxonomy.taxeditor.store.CdmStore;
......
56 56
        configurator = Abcd206ImportConfigurator.NewInstance(null,null);
57 57
        ICdmRepository controller;
58 58
        controller = CdmStore.getCurrentApplicationConfiguration();
59
        PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.AbcdImportConfig);
59
        PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AbcdImportConfig);
60 60

  
61 61
        if (controller == null){
62 62
            return null;
......
66 66
        if (preference != null ){
67 67
            allowOverride = preference.isAllowOverride();
68 68
        }else{
69
            preference = CdmPreference.NewTaxEditorInstance(EditorPreferencePredicate.AbcdImportConfig, configurator.toString());
69
            preference = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AbcdImportConfig, configurator.toString());
70 70
        }
71 71

  
72 72
        if (preference != null){
......
338 338
        if (configurator != null){
339 339
            String configString = configurator.toString();
340 340

  
341
            CdmPreference pref = CdmPreference.NewTaxEditorInstance(EditorPreferencePredicate.AbcdImportConfig, configString);
341
            CdmPreference pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AbcdImportConfig, configString);
342 342
            pref.setAllowOverride(allowOverride);
343 343

  
344 344
            ICdmRepository controller = CdmStore.getCurrentApplicationConfiguration();
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/AbcdImportProvider.java
17 17
import eu.etaxonomy.cdm.api.application.ICdmRepository;
18 18
import eu.etaxonomy.cdm.api.service.IPreferenceService;
19 19
import eu.etaxonomy.cdm.model.metadata.CdmPreference;
20
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
20 21
import eu.etaxonomy.taxeditor.l10n.Messages;
21
import eu.etaxonomy.taxeditor.preference.EditorPreferencePredicate;
22 22
import eu.etaxonomy.taxeditor.preference.menu.CdmPreferencePage;
23 23
import eu.etaxonomy.taxeditor.store.CdmStore;
24 24

  
......
55 55
        if (biocaseProviderList != null){
56 56
            providerList = biocaseProviderList.createAllProviderString();
57 57

  
58
            CdmPreference pref = CdmPreference.NewTaxEditorInstance(EditorPreferencePredicate.BioCaseProvider, providerList);
58
            CdmPreference pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.BioCaseProvider, providerList);
59 59
            pref.setAllowOverride(true);
60 60

  
61 61
            ICdmRepository controller = CdmStore.getCurrentApplicationConfiguration();
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/ChecklistEditorGeneralAdminPreference.java
14 14
import eu.etaxonomy.cdm.api.application.ICdmRepository;
15 15
import eu.etaxonomy.cdm.api.service.IPreferenceService;
16 16
import eu.etaxonomy.cdm.model.metadata.CdmPreference;
17
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
17 18
import eu.etaxonomy.taxeditor.preference.ChecklistEditorGeneralPreference;
18
import eu.etaxonomy.taxeditor.preference.EditorPreferencePredicate;
19 19
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
20 20
import eu.etaxonomy.taxeditor.store.CdmStore;
21 21

  
......
44 44
        }
45 45
        IPreferenceService service = controller.getPreferenceService();
46 46

  
47
        CdmPreference pref = CdmPreference.NewTaxEditorInstance( EditorPreferencePredicate.DistributionEditorActivated, Boolean.toString(isEditorActivated));
47
        CdmPreference pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.DistributionEditorActivated, Boolean.toString(isEditorActivated));
48 48
        pref.setAllowOverride(this.allowOverrideActivated);
49 49
        service.set(pref);
50 50

  
51
        pref = CdmPreference.NewTaxEditorInstance( EditorPreferencePredicate.DisplayOfAreasInDistributionEditor, this.displayArea);
51
        pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.DisplayOfAreasInDistributionEditor, this.displayArea);
52 52
        pref.setAllowOverride(this.allowOverrideAreaDisplay);
53 53
        service.set(pref);
54 54

  
55
        pref = CdmPreference.NewTaxEditorInstance( EditorPreferencePredicate.DisplayOfStatus, this.displayStatus);
55
        pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.DisplayOfStatus, this.displayStatus);
56 56
        pref.setAllowOverride(this.allowOverrideStatusDisplay);
57 57
        service.set(pref);
58 58

  
59
        pref = CdmPreference.NewTaxEditorInstance( EditorPreferencePredicate.ShowRankInDistributionEditor, Boolean.toString(isShowRank));
59
        pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.ShowRankInDistributionEditor, Boolean.toString(isShowRank));
60 60
        pref.setAllowOverride(this.allowOverrideRank);
61 61
        service.set(pref);
62 62

  
63
        pref = CdmPreference.NewTaxEditorInstance( EditorPreferencePredicate.AreasSortedInDistributionEditor, this.orderAreas);
63
        pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.AreasSortedInDistributionEditor, this.orderAreas);
64 64
        pref.setAllowOverride(this.allowOverrideOrderAreas);
65 65
        service.set(pref);
66 66

  
67
        pref = CdmPreference.NewTaxEditorInstance( EditorPreferencePredicate.OwnDescriptionForDistributionEditor, Boolean.toString(ownDescriptionForDistributionEditor));
67
        pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.OwnDescriptionForDistributionEditor, Boolean.toString(ownDescriptionForDistributionEditor));
68 68
        pref.setAllowOverride(this.allowOverrideOwnDescriptionForDistributionEditor);
69 69
        service.set(pref);
70 70

  
......
76 76
    @Override
77 77
    public void getValues() {
78 78

  
79
        distributionEditorPref = PreferencesUtil.getPreferenceFromDB(EditorPreferencePredicate.DistributionEditorActivated);
79
        distributionEditorPref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DistributionEditorActivated);
80 80
        if (distributionEditorPref == null){
81
            distributionEditorPref = CdmPreference.NewTaxEditorInstance(EditorPreferencePredicate.DistributionEditorActivated, EditorPreferencePredicate.DistributionEditorActivated.getDefaultValue().toString());
81
            distributionEditorPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DistributionEditorActivated, PreferencePredicate.DistributionEditorActivated.getDefaultValue().toString());
82 82
        }
83 83
        isEditorActivated = Boolean.valueOf(distributionEditorPref.getValue());
84 84
        allowOverrideActivated = distributionEditorPref.isAllowOverride();
85 85
        isAdminPreference = true;
86 86

  
87
        CdmPreference pref = PreferencesUtil.getPreferenceFromDB(EditorPreferencePredicate.DisplayOfAreasInDistributionEditor);
87
        CdmPreference pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DisplayOfAreasInDistributionEditor);
88 88
        if (pref != null){
89 89
            this.displayArea = pref.getValue();
90 90
            this.allowOverrideAreaDisplay = pref.isAllowOverride();
91 91
        }else{
92
            this.displayArea = EditorPreferencePredicate.DisplayOfAreasInDistributionEditor.getDefaultValue().toString();
92
            this.displayArea = PreferencePredicate.DisplayOfAreasInDistributionEditor.getDefaultValue().toString();
93 93
            this.allowOverrideAreaDisplay = true;
94 94
        }
95 95

  
96
        pref = PreferencesUtil.getPreferenceFromDB(EditorPreferencePredicate.DisplayOfStatus);
96
        pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DisplayOfStatus);
97 97
        if (pref != null){
98 98
            this.displayStatus = pref.getValue();
99 99
            this.allowOverrideStatusDisplay = pref.isAllowOverride();
100 100
        }else{
101
            this.displayStatus = EditorPreferencePredicate.DisplayOfStatus.getDefaultValue().toString();
101
            this.displayStatus = PreferencePredicate.DisplayOfStatus.getDefaultValue().toString();
102 102
            this.allowOverrideStatusDisplay = true;
103 103
        }
104 104

  
105
        pref = PreferencesUtil.getPreferenceFromDB(EditorPreferencePredicate.AreasSortedInDistributionEditor);
105
        pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.AreasSortedInDistributionEditor);
106 106
        if (pref != null){
107 107
            if (pref.getValue() != null){
108 108
                this.orderAreas = pref.getValue().toString();
109 109
            }else{
110
                this.orderAreas = EditorPreferencePredicate.AreasSortedInDistributionEditor.getDefaultValue().toString();
110
                this.orderAreas = PreferencePredicate.AreasSortedInDistributionEditor.getDefaultValue().toString();
111 111
            }
112 112
            this.allowOverrideOrderAreas = pref.isAllowOverride();
113 113
        }else{
114
            this.orderAreas = EditorPreferencePredicate.AreasSortedInDistributionEditor.getDefaultValue().toString();
114
            this.orderAreas = PreferencePredicate.AreasSortedInDistributionEditor.getDefaultValue().toString();
115 115
            this.allowOverrideOrderAreas = true;
116 116
        }
117 117

  
118
        pref = PreferencesUtil.getPreferenceFromDB(EditorPreferencePredicate.ShowRankInDistributionEditor);
118
        pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.ShowRankInDistributionEditor);
119 119
        if (pref != null){
120 120
            this.isShowRank = Boolean.valueOf(pref.getValue().toString());
121 121
            this.allowOverrideRank = pref.isAllowOverride();
122 122
        }else{
123
            this.isShowRank = Boolean.valueOf(EditorPreferencePredicate.ShowRankInDistributionEditor.getDefaultValue().toString());
123
            this.isShowRank = Boolean.valueOf(PreferencePredicate.ShowRankInDistributionEditor.getDefaultValue().toString());
124 124
            this.allowOverrideRank = true;
125 125
        }
126 126

  
127
        pref = PreferencesUtil.getPreferenceFromDB(EditorPreferencePredicate.OwnDescriptionForDistributionEditor);
127
        pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.OwnDescriptionForDistributionEditor);
128 128
        if (pref != null){
129 129
            this.ownDescriptionForDistributionEditor = Boolean.valueOf(pref.getValue().toString());
130 130
            this.allowOverrideOwnDescriptionForDistributionEditor= pref.isAllowOverride();
131 131
        }else{
132
            this.ownDescriptionForDistributionEditor = Boolean.valueOf(EditorPreferencePredicate.OwnDescriptionForDistributionEditor.getDefaultValue().toString());
132
            this.ownDescriptionForDistributionEditor = Boolean.valueOf(PreferencePredicate.OwnDescriptionForDistributionEditor.getDefaultValue().toString());
133 133
            this.allowOverrideOwnDescriptionForDistributionEditor = true;
134 134
        }
135 135

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/GeneralAdminPreferencePage.java
12 12
import eu.etaxonomy.cdm.api.service.IPreferenceService;
13 13
import eu.etaxonomy.cdm.model.metadata.CdmPreference;
14 14
import eu.etaxonomy.cdm.model.metadata.CdmPreference.PrefKey;
15
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
15 16
import eu.etaxonomy.cdm.model.metadata.PreferenceSubject;
16
import eu.etaxonomy.taxeditor.preference.EditorPreferencePredicate;
17 17
import eu.etaxonomy.taxeditor.preference.GeneralPreferencePage;
18 18
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
19 19
import eu.etaxonomy.taxeditor.store.CdmStore;
......
39 39
       if (controller != null){
40 40
           IPreferenceService service = controller.getPreferenceService();
41 41

  
42
           CdmPreference pref = CdmPreference.NewTaxEditorInstance(EditorPreferencePredicate.ShowImportExportMenu, Boolean.toString(this.isShowIOMenu));
42
           CdmPreference pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowImportExportMenu, Boolean.toString(this.isShowIOMenu));
43 43
           pref.setAllowOverride(isAllowOverrideShowIOMenu);
44 44
           service.set(pref);
45 45
//           pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowMediaView, Boolean.toString(this.isShowMediaView));
46 46
//           pref.setAllowOverride(isAllowOverrideShowMediaView);
47 47
//           service.set(pref);
48
           pref = CdmPreference.NewTaxEditorInstance(EditorPreferencePredicate.ShowChecklistPerspective, Boolean.toString(this.isShowCheckListPerspective));
48
           pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowChecklistPerspective, Boolean.toString(this.isShowCheckListPerspective));
49 49
           pref.setAllowOverride(isAllowOverrideShowCheckListPerspective);
50 50
           service.set(pref);
51
           pref = CdmPreference.NewTaxEditorInstance(EditorPreferencePredicate.ShowTaxonNodeWizard, Boolean.toString(this.isShowTaxonNodeWizard));
51
           pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowTaxonNodeWizard, Boolean.toString(this.isShowTaxonNodeWizard));
52 52
           pref.setAllowOverride(isAllowOverrideShowTaxonNodeWizard);
53 53
           service.set(pref);
54 54
           PreferencesUtil.updateDBPreferences();
......
64 64
        controller = CdmStore.getCurrentApplicationConfiguration();
65 65
        if (controller != null){
66 66
          IPreferenceService service = controller.getPreferenceService();
67
          PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.ShowImportExportMenu);
67
          PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowImportExportMenu);
68 68
          CdmPreference pref = service.find(key);
69 69
          if (pref != null){
70 70
              isShowIOMenu = Boolean.valueOf(pref.getValue());
71 71
              isAllowOverrideShowIOMenu = pref.isAllowOverride();
72 72
          }else{
73
              isShowIOMenu = Boolean.valueOf(EditorPreferencePredicate.ShowImportExportMenu.getDefaultValue().toString());
73
              isShowIOMenu = Boolean.valueOf(PreferencePredicate.ShowImportExportMenu.getDefaultValue().toString());
74 74
              isAllowOverrideShowIOMenu = true;
75 75
          }
76 76

  
......
80 80
//              isShowMediaView = Boolean.valueOf(pref.getValue());
81 81
//              isAllowOverrideShowMediaView = pref.isAllowOverride();
82 82
//          }else{
83
//              isShowMediaView = Boolean.valueOf(EditorPreferencePredicate.ShowMediaView.getDefaultValue().toString());
83
//              isShowMediaView = Boolean.valueOf(PreferencePredicate.ShowMediaView.getDefaultValue().toString());
84 84
//              isAllowOverrideShowMediaView = true;
85 85
//          }
86 86

  
87
          key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.ShowChecklistPerspective);
87
          key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowChecklistPerspective);
88 88
          pref = service.find(key);
89 89
          if (pref != null){
90 90
              isShowCheckListPerspective = Boolean.valueOf(pref.getValue());
91 91
              isAllowOverrideShowCheckListPerspective = pref.isAllowOverride();
92 92
          }else{
93
              isShowCheckListPerspective = Boolean.valueOf(EditorPreferencePredicate.ShowChecklistPerspective.getDefaultValue().toString());
93
              isShowCheckListPerspective = Boolean.valueOf(PreferencePredicate.ShowChecklistPerspective.getDefaultValue().toString());
94 94
              isAllowOverrideShowCheckListPerspective = true;
95 95
          }
96 96

  
97
          key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.ShowTaxonNodeWizard);
97
          key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowTaxonNodeWizard);
98 98
          pref = service.find(key);
99 99
          if (pref != null){
100 100
              isShowTaxonNodeWizard = Boolean.valueOf(pref.getValue());
101 101
              isAllowOverrideShowTaxonNodeWizard = pref.isAllowOverride();
102 102
          }else{
103
              isShowTaxonNodeWizard = Boolean.valueOf(EditorPreferencePredicate.ShowTaxonNodeWizard.getDefaultValue().toString());
103
              isShowTaxonNodeWizard = Boolean.valueOf(PreferencePredicate.ShowTaxonNodeWizard.getDefaultValue().toString());
104 104
              isAllowOverrideShowTaxonNodeWizard = true;
105 105
          }
106 106
      }
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/ListComponent.java
25 25
import org.eclipse.swt.widgets.Text;
26 26

  
27 27
import eu.etaxonomy.cdm.model.metadata.CdmPreference;
28
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
28 29
import eu.etaxonomy.taxeditor.l10n.Messages;
29
import eu.etaxonomy.taxeditor.preference.EditorPreferencePredicate;
30 30
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
31 31

  
32 32

  
......
55 55
        Rectangle clientArea = parent.getShell().getClientArea ();
56 56
        list.setBounds (clientArea.x, clientArea.y, 50, 500);
57 57

  
58
        CdmPreference providerListPreference = PreferencesUtil.getPreferenceFromDB(EditorPreferencePredicate.BioCaseProvider);
58
        CdmPreference providerListPreference = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.BioCaseProvider);
59 59
        String allProviderString = ""; //$NON-NLS-1$
60 60
        if (providerListPreference != null){
61 61
            allProviderString  = providerListPreference.getValue();
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NameDetailsViewAdminConfiguration.java
5 5
import eu.etaxonomy.cdm.api.service.IPreferenceService;
6 6
import eu.etaxonomy.cdm.model.metadata.CdmPreference;
7 7
import eu.etaxonomy.cdm.model.metadata.CdmPreference.PrefKey;
8
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
8 9
import eu.etaxonomy.cdm.model.metadata.PreferenceSubject;
9 10
import eu.etaxonomy.taxeditor.preference.CdmPreferenceCache;
10
import eu.etaxonomy.taxeditor.preference.EditorPreferencePredicate;
11 11
import eu.etaxonomy.taxeditor.preference.NameDetailsConfigurator;
12 12
import eu.etaxonomy.taxeditor.preference.NameDetailsViewConfiguration;
13 13
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
......
57 57
        String value = config.toString();
58 58

  
59 59

  
60
        CdmPreference pref = CdmPreference.NewTaxEditorInstance(EditorPreferencePredicate.NameDetailsView, value);
60
        CdmPreference pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.NameDetailsView, value);
61 61
        pref.setAllowOverride(isAllowOverride);
62 62
        service.set(pref);
63 63

  
......
72 72
        ICdmRepository controller = CdmStore.getCurrentApplicationConfiguration();
73 73
        if (controller != null){
74 74
            IPreferenceService service = controller.getPreferenceService();
75
            PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.NameDetailsView);
75
            PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.NameDetailsView);
76 76
            CdmPreference pref = service.find(key);
77 77
            if (pref != null) {
78 78
                isAllowOverride = pref.isAllowOverride();
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/PublishFlagPreference.java
12 12
import eu.etaxonomy.cdm.api.service.IPreferenceService;
13 13
import eu.etaxonomy.cdm.model.metadata.CdmPreference;
14 14
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
15
import eu.etaxonomy.taxeditor.preference.EditorPreferencePredicate;
16 15
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
17 16
import eu.etaxonomy.taxeditor.preference.PublishEnum;
18 17
import eu.etaxonomy.taxeditor.preference.PublishFlagLocalPreference;
......
47 46
                break;
48 47
            }
49 48
        }
50
        CdmPreference pref = CdmPreference.NewTaxEditorInstance(EditorPreferencePredicate.DefaultBehaviourForPublishFlag, text);
49
        CdmPreference pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DefaultBehaviourForPublishFlag, text);
51 50
        pref.setAllowOverride(allowOverride);
52 51

  
53 52
        ICdmRepository controller = CdmStore.getCurrentApplicationConfiguration();
......
68 67
        isAdminPreference = true;
69 68
        pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DefaultBehaviourForPublishFlag);
70 69
        if (pref == null){
71
            pref = CdmPreference.NewTaxEditorInstance(EditorPreferencePredicate.DefaultBehaviourForPublishFlag, EditorPreferencePredicate.DefaultBehaviourForPublishFlag.getDefaultValue().toString());
70
            pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DefaultBehaviourForPublishFlag, PreferencePredicate.DefaultBehaviourForPublishFlag.getDefaultValue().toString());
72 71
        }
73 72
        allowOverride = pref.isAllowOverride();
74 73
        publishBehaviour = PublishEnum.valueOf(pref.getValue().toString());
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/SpecimenAdminPreferences.java
14 14
import eu.etaxonomy.cdm.api.service.IPreferenceService;
15 15
import eu.etaxonomy.cdm.model.metadata.CdmPreference;
16 16
import eu.etaxonomy.cdm.model.metadata.CdmPreference.PrefKey;
17
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
17 18
import eu.etaxonomy.cdm.model.metadata.PreferenceSubject;
18
import eu.etaxonomy.taxeditor.preference.EditorPreferencePredicate;
19 19
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
20 20
import eu.etaxonomy.taxeditor.preference.SpecimenOrObservationPreferences;
21 21
import eu.etaxonomy.taxeditor.store.CdmStore;
......
47 47
        ICdmRepository controller = CdmStore.getCurrentApplicationConfiguration();
48 48
        if (controller != null){
49 49
            IPreferenceService service = controller.getPreferenceService();
50
            PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.ShowSpecimen);
50
            PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowSpecimen);
51 51
            showSpecimenPref = service.find(key);
52 52
            if (showSpecimenPref != null){
53 53
                this.isShowSpecimenRelatedIssues = Boolean.valueOf(showSpecimenPref.getValue());
54 54
                this.allowOverrideShowSpecimenRelatedIssues = showSpecimenPref.isAllowOverride();
55 55
            }else{
56
                showSpecimenPref = CdmPreference.NewTaxEditorInstance(EditorPreferencePredicate.ShowSpecimen, Boolean.toString(true));
56
                showSpecimenPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowSpecimen, Boolean.toString(true));
57 57
                this.isShowSpecimenRelatedIssues = true;
58 58
                this.allowOverrideShowSpecimenRelatedIssues = true;
59 59
            }
60 60

  
61
            key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.ShowCollectingAreasInGeneralSection);
61
            key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowCollectingAreasInGeneralSection);
62 62
            CdmPreference isShowCollectingAreaInGeneralSectionPref = service.find(key);
63 63
            if (isShowCollectingAreaInGeneralSectionPref != null){
64 64
                this.isShowCollectingAreaInGeneralSection = Boolean.valueOf(isShowCollectingAreaInGeneralSectionPref.getValue());
65 65
                this.allowOverrideShowCollectingAreaInGeneralSection = isShowCollectingAreaInGeneralSectionPref.isAllowOverride();
66 66
            }else{
67
                this.isShowCollectingAreaInGeneralSection = (Boolean) EditorPreferencePredicate.ShowCollectingAreasInGeneralSection.getDefaultValue();
67
                this.isShowCollectingAreaInGeneralSection = (Boolean) PreferencePredicate.ShowCollectingAreasInGeneralSection.getDefaultValue();
68 68
                this.allowOverrideShowCollectingAreaInGeneralSection = true;
69 69
            }
70 70

  
71
            key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.DeterminationOnlyForFieldUnits);
71
            key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.DeterminationOnlyForFieldUnits);
72 72
            CdmPreference isDeterminationOnlyForFieldUnitsPref = service.find(key);
73 73
            if (isDeterminationOnlyForFieldUnitsPref != null){
74 74
                this.isDeterminationOnlyForFieldUnits = Boolean.valueOf(isDeterminationOnlyForFieldUnitsPref.getValue());
75 75
                this.allowOverrideDeterminationOnlyForFieldUnits = isDeterminationOnlyForFieldUnitsPref.isAllowOverride();
76 76
            }else{
77
                this.isDeterminationOnlyForFieldUnits =(Boolean)EditorPreferencePredicate.DeterminationOnlyForFieldUnits.getDefaultValue();
77
                this.isDeterminationOnlyForFieldUnits =(Boolean)PreferencePredicate.DeterminationOnlyForFieldUnits.getDefaultValue();
78 78
                this.allowOverrideDeterminationOnlyForFieldUnits = true;
79 79
            }
80
            key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.ShowTaxonAssociations);
80
            key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowTaxonAssociations);
81 81
            CdmPreference isShowTaxonAssociationPref = service.find(key);
82 82
            if (isShowTaxonAssociationPref != null){
83 83
                this.isShowTaxonAssociation = Boolean.valueOf(isShowTaxonAssociationPref.getValue());
84 84
                this.allowOverrideShowTaxonAssociation = isShowTaxonAssociationPref.isAllowOverride();
85 85
            }else{
86
                this.isShowTaxonAssociation = (Boolean)EditorPreferencePredicate.ShowTaxonAssociations.getDefaultValue();
86
                this.isShowTaxonAssociation = (Boolean)PreferencePredicate.ShowTaxonAssociations.getDefaultValue();
87 87
                this.allowOverrideShowTaxonAssociation = true;
88 88
            }
89 89

  
90
            key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.ShowLifeForm);
90
            key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowLifeForm);
91 91
            CdmPreference isShowLifeFormPref = service.find(key);
92 92
            if (isShowLifeFormPref != null){
93 93
                this.isShowLifeForm = Boolean.valueOf(isShowLifeFormPref.getValue());
94 94
                this.allowOverrideShowLifeForm = isShowLifeFormPref.isAllowOverride();
95 95
            } else{
96
                this.isShowLifeForm = (Boolean)EditorPreferencePredicate.ShowLifeForm.getDefaultValue();
96
                this.isShowLifeForm = (Boolean)PreferencePredicate.ShowLifeForm.getDefaultValue();
97 97
                this.allowOverrideShowLifeForm = true;
98 98
            }
99 99

  
......
109 109
        if (controller != null){
110 110
            IPreferenceService service = controller.getPreferenceService();
111 111

  
112
            CdmPreference pref = CdmPreference.NewTaxEditorInstance(EditorPreferencePredicate.ShowCollectingAreasInGeneralSection, Boolean.toString(this.isShowCollectingAreaInGeneralSection));
112
            CdmPreference pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowCollectingAreasInGeneralSection, Boolean.toString(this.isShowCollectingAreaInGeneralSection));
113 113
            pref.setAllowOverride(allowOverrideShowCollectingAreaInGeneralSection);
114 114
            service.set(pref);
115
            pref = CdmPreference.NewTaxEditorInstance(EditorPreferencePredicate.ShowSpecimen, Boolean.toString(this.isShowSpecimenRelatedIssues));
115
            pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowSpecimen, Boolean.toString(this.isShowSpecimenRelatedIssues));
116 116
            pref.setAllowOverride(allowOverrideShowSpecimenRelatedIssues);
117 117
            service.set(pref);
118 118

  
119
            pref = CdmPreference.NewTaxEditorInstance(EditorPreferencePredicate.DeterminationOnlyForFieldUnits, Boolean.toString(this.isDeterminationOnlyForFieldUnits));
119
            pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DeterminationOnlyForFieldUnits, Boolean.toString(this.isDeterminationOnlyForFieldUnits));
120 120
            pref.setAllowOverride(allowOverrideDeterminationOnlyForFieldUnits);
121 121
            service.set(pref);
122 122

  
123
            pref = CdmPreference.NewTaxEditorInstance(EditorPreferencePredicate.ShowTaxonAssociations, Boolean.toString(this.isShowTaxonAssociation));
123
            pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowTaxonAssociations, Boolean.toString(this.isShowTaxonAssociation));
124 124
            pref.setAllowOverride(allowOverrideShowTaxonAssociation);
125 125
            service.set(pref);
126 126

  
127
            pref = CdmPreference.NewTaxEditorInstance(EditorPreferencePredicate.ShowLifeForm, Boolean.toString(this.isShowLifeForm));
127
            pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowLifeForm, Boolean.toString(this.isShowLifeForm));
128 128
            pref.setAllowOverride(allowOverrideShowLifeForm);
129 129
            service.set(pref);
130 130
            PreferencesUtil.updateDBPreferences();
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/defaultHandler/e4/DefaultOpenTaxonNodeWizardHandlerE4.java
16 16
import org.eclipse.swt.widgets.Shell;
17 17

  
18 18
import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
19
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
19 20
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
20 21
import eu.etaxonomy.taxeditor.event.EventUtility;
21 22
import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;
22
import eu.etaxonomy.taxeditor.preference.EditorPreferencePredicate;
23 23
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
24 24
import eu.etaxonomy.taxeditor.store.CdmStore;
25 25
import eu.etaxonomy.taxeditor.ui.section.classification.EditTaxonNodeWizard;
......
49 49

  
50 50
    @Override
51 51
    public boolean canExecute(TaxonNode entity) {
52
        return entity.getTaxon()!=null && PreferencesUtil.getBooleanValue(EditorPreferencePredicate.ShowTaxonNodeWizard.getKey());
52
        return entity.getTaxon()!=null && PreferencesUtil.getBooleanValue(PreferencePredicate.ShowTaxonNodeWizard.getKey());
53 53
    }
54 54

  
55 55
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
78 78

  
79 79

  
80 80
    public static String OrderPreferences_Restore;
81

  
82

  
83 81
    public static String OrderPreferences_Sorting;
84

  
82
    public static String OrderPreferencePage_NewNavigatorWindowRequired;
83
    public static String OrderPreferencePage_PleaseReopenNavigator;
85 84

  
86 85
    public static String CdmDataSourceViewPart_1;
87 86
    public static String CdmDataSourceViewPart_10;
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
25 25
OpenDistributionEditorWizardHandlerE4_DISTRIBUTION=Distribution
26 26
OrderPreferences_Restore=Restore the last Taxon Navigator state
27 27
OrderPreferences_Sorting=Sorting
28
OrderPreferencePage_NewNavigatorWindowRequired=A new taxon navigator window is required.
29
OrderPreferencePage_PleaseReopenNavigator=Please reopen the taxon navigator.
28 30
DatabaseRepairPage_chooseParameter=Please choose the trees where the sortIndex should be recalculated.
29 31
DatabaseRepairPage_updateTaxonNodes=Taxonomic Tree
30 32
DatabaseRepairPage_toolTip_taxonNode=The sort indexes of the taxonomic tree will be recalculated.
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
25 25
OpenDistributionEditorWizardHandlerE4_DISTRIBUTION=Verbreitung
26 26
OrderPreferences_Restore=Stelle den letzten Navigator Status wieder her
27 27
OrderPreferences_Sorting=Sortierung
28
OrderPreferencePage_NewNavigatorWindowRequired=?nderungen werden erst nach dem erneuten ?ffnen des Navigators sichtbar.
29
OrderPreferencePage_PleaseReopenNavigator=Um die ?nderungen zu sehen, m?ssen Sie den Navigator schlie?en und neu ?ffnen.
30

  
28 31
DatabaseRepairPage_chooseParameter=Bitte w?hlen Sie, f?r welche B?ume der SortIndex neu berechnet werden soll.
29 32
DatabaseRepairPage_updateTaxonNodes=Taxonomischer Baum
30 33
DatabaseRepairPage_toolTip_taxonNode=Die Sortier Indizes des Taxonomischen Baums werden aktualisiert.
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/CdmPreferenceCache.java
58 58
        ICdmRepository controller;
59 59
        controller = CdmStore.getCurrentApplicationConfiguration();
60 60
        //ABCD
61
        PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.AbcdImportConfig);
61
        PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AbcdImportConfig);
62 62
        loadAndPutPreference(controller, key);
63 63

  
64 64
        //ShowIOMenu
65
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.ShowImportExportMenu);
65
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowImportExportMenu);
66 66
        loadAndPutPreference(controller, key);
67 67

  
68
//        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.ShowMediaView);
68
//        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowMediaView);
69 69
//        loadAndPutPreference(controller, key);
70 70

  
71
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.ShowChecklistPerspective);
71
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowChecklistPerspective);
72 72
        loadAndPutPreference(controller, key);
73 73

  
74 74

  
75 75
        //Specimen Details
76
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.ShowSpecimen);
76
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowSpecimen);
77 77
        loadAndPutPreference(controller, key);
78 78

  
79
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.ShowTaxonAssociations);
79
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowTaxonAssociations);
80 80
        loadAndPutPreference(controller, key);
81 81

  
82 82

  
83
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.ShowCollectingAreasInGeneralSection);
83
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowCollectingAreasInGeneralSection);
84 84
        loadAndPutPreference(controller, key);
85 85

  
86 86

  
87
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.ShowLifeForm);
87
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowLifeForm);
88 88
        loadAndPutPreference(controller, key);
89 89

  
90
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.DeterminationOnlyForFieldUnits);
90
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.DeterminationOnlyForFieldUnits);
91 91
        loadAndPutPreference(controller, key);
92 92

  
93 93

  
94 94
        //Name Details
95
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.NameDetailsView);
95
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.NameDetailsView);
96 96
        loadAndPutPreference(controller, key);
97 97

  
98 98

  
......
122 122
        loadAndPutPreference(controller, key);
123 123

  
124 124

  
125
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.DistributionEditorActivated);
125
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.DistributionEditorActivated);
126 126
        loadAndPutPreference(controller, key);
127 127

  
128
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.DisplayOfAreasInDistributionEditor);
128
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.DisplayOfAreasInDistributionEditor);
129 129
        loadAndPutPreference(controller, key);
130 130

  
131
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.DisplayOfStatus);
131
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.DisplayOfStatus);
132 132
        loadAndPutPreference(controller, key);
133 133

  
134
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.ShowRankInDistributionEditor);
134
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowRankInDistributionEditor);
135 135
        loadAndPutPreference(controller, key);
136 136

  
137
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.AreasSortedInDistributionEditor);
137
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AreasSortedInDistributionEditor);
138 138
        loadAndPutPreference(controller, key);
139 139

  
140
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.OwnDescriptionForDistributionEditor);
140
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.OwnDescriptionForDistributionEditor);
141 141
        loadAndPutPreference(controller, key);
142 142

  
143 143
        //common names
......
149 149
        loadAndPutPreference(controller, key);
150 150

  
151 151
        //sources
152
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.ShowIdInSource);
152
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowIdInSource);
153 153
        loadAndPutPreference(controller, key);
154 154

  
155
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.ShowNamespaceInSource);
155
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowNamespaceInSource);
156 156
        loadAndPutPreference(controller, key);
157 157

  
158 158
        //multiple classifications / taxon navigator
159 159

  
160
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.DisableMultiClassification);
160
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.DisableMultiClassification);
161 161
        loadAndPutPreference(controller, key);
162 162

  
163 163

  
164
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), EditorPreferencePredicate.ShowTaxonNodeWizard);
164
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowTaxonNodeWizard);
165 165
        loadAndPutPreference(controller, key);
166 166

  
167 167

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java
188 188
                areaOrderSelectionCombo.add(display.getLabel());
189 189
            }
190 190
            int index = 0;
191
            if (PreferencesUtil.getStringValue(EditorPreferencePredicate.DistributionEditorActivated.getKey()) != null){
191
            if (PreferencesUtil.getStringValue(PreferencePredicate.DistributionEditorActivated.getKey()) != null){
192 192
                TermOrder areaOrder;
193 193
                try{
194 194
                    if (orderAreas != null){
......
300 300
                areaDisplaySelectionCombo.add(display.getLabel());
301 301
            }
302 302
            index = 0;
303
            if (PreferencesUtil.getStringValue(EditorPreferencePredicate.DistributionEditorActivated.getKey()) != null){
303
            if (PreferencesUtil.getStringValue(PreferencePredicate.DistributionEditorActivated.getKey()) != null){
304 304
                TermDisplayEnum areaDisplay;
305 305
                try{
306 306
                    if (displayArea != null){
......
478 478
    public boolean performOk() {
479 479
        if (isAllowOverride){
480 480

  
481
            PreferencesUtil.setBooleanValue(EditorPreferencePredicate.DistributionEditorActivated.getKey(), isEditorActivated);
482
            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.DistributionEditorActivated.getKey()), overrideActivated);
481
            PreferencesUtil.setBooleanValue(PreferencePredicate.DistributionEditorActivated.getKey(), isEditorActivated);
482
            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.DistributionEditorActivated.getKey()), overrideActivated);
483 483
            PreferencesUtil.setSortNamedAreasInDistributionEditor(orderAreas);
484
            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.AreasSortedInDistributionEditor.getKey()), overrideOrderAreas);
484
            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.AreasSortedInDistributionEditor.getKey()), overrideOrderAreas);
485 485
            PreferencesUtil.setShowRankInChecklistEditor(isShowRank);
486
            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.ShowRankInDistributionEditor.getKey()), overrideRank);
486
            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowRankInDistributionEditor.getKey()), overrideRank);
487 487
            PreferencesUtil.setDisplayStatusInChecklistEditor(displayStatus);
488
            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.DisplayOfStatus.getKey()), overrideStatusDisplay);
488
            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.DisplayOfStatus.getKey()), overrideStatusDisplay);
489 489
            PreferencesUtil.setAreaDisplayInChecklistEditor(displayArea);
490
            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.DisplayOfAreasInDistributionEditor.getKey()), overrideAreaDisplay);
490
            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.DisplayOfAreasInDistributionEditor.getKey()), overrideAreaDisplay);
491 491
            PreferencesUtil.setOwnDescriptionForChecklistEditor(ownDescriptionForDistributionEditor);
492
            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.OwnDescriptionForDistributionEditor.getKey()), overrideOwnDescriptionForDistributionEditor);
492
            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.OwnDescriptionForDistributionEditor.getKey()), overrideOwnDescriptionForDistributionEditor);
493 493

  
494 494

  
495 495

  
......
551 551
    public void getValues() {
552 552
        isAdminPreference = false;
553 553
        setPreferenceStore(PreferencesUtil.getPreferenceStore());
554
        distributionEditorPref = PreferencesUtil.getPreferenceFromDB(EditorPreferencePredicate.DistributionEditorActivated);
554
        distributionEditorPref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DistributionEditorActivated);
555 555

  
556 556

  
557 557
        if (distributionEditorPref != null){
558 558
            isAllowOverride = distributionEditorPref.isAllowOverride();
559 559

  
560
            if (isAllowOverride && PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.DistributionEditorActivated.getKey()))){
561
                isEditorActivated = PreferencesUtil.getBooleanValue(EditorPreferencePredicate.DistributionEditorActivated.getKey());
562
                overrideActivated = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.DistributionEditorActivated.getKey()));
560
            if (isAllowOverride && PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.DistributionEditorActivated.getKey()))){
561
                isEditorActivated = PreferencesUtil.getBooleanValue(PreferencePredicate.DistributionEditorActivated.getKey());
562
                overrideActivated = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.DistributionEditorActivated.getKey()));
563 563
            }else{
564 564
                isEditorActivated = Boolean.valueOf(distributionEditorPref.getValue());
565 565
            }
566 566
        }else{
567
            isEditorActivated = PreferencesUtil.getBooleanValue(EditorPreferencePredicate.DistributionEditorActivated.getKey());
567
            isEditorActivated = PreferencesUtil.getBooleanValue(PreferencePredicate.DistributionEditorActivated.getKey());
568 568
            isAllowOverride = true;
569
            overrideActivated = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.DistributionEditorActivated.getKey()));
569
            overrideActivated = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.DistributionEditorActivated.getKey()));
570 570
        }
571 571

  
572 572
        CdmPreference prefStatus = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.AvailableDistributionAreaVocabularies);
......
575 575
        prefStatus = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.AvailableDistributionStatus);
576 576
        allowOverrideStatus = prefStatus != null?prefStatus.isAllowOverride():true;
577 577

  
578
        CdmPreference pref = PreferencesUtil.getPreferenceFromDB(EditorPreferencePredicate.DisplayOfAreasInDistributionEditor);
578
        CdmPreference pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DisplayOfAreasInDistributionEditor);
579 579
        if (pref != null){
580 580
            this.allowOverrideAreaDisplay = pref.isAllowOverride();
581 581
            if (allowOverrideAreaDisplay){
582 582
                displayArea = PreferencesUtil.displayAreaInChecklistEditor();
583
                overrideAreaDisplay = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.DisplayOfAreasInDistributionEditor.getKey()));
583
                overrideAreaDisplay = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.DisplayOfAreasInDistributionEditor.getKey()));
584 584
            }else{
585 585
                displayArea = pref.getValue();
586 586
            }
587 587
        }else{
588 588
            displayArea = PreferencesUtil.displayAreaInChecklistEditor();;
589 589
            this.allowOverrideAreaDisplay = true;
590
            overrideAreaDisplay = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.DisplayOfAreasInDistributionEditor.getKey()));
590
            overrideAreaDisplay = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.DisplayOfAreasInDistributionEditor.getKey()));
591 591
        }
592 592

  
593
        pref = PreferencesUtil.getPreferenceFromDB(EditorPreferencePredicate.DisplayOfStatus);
593
        pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DisplayOfStatus);
594 594
        if (pref != null){
595 595
            this.allowOverrideStatusDisplay = pref.isAllowOverride();
596 596
            if (allowOverrideStatusDisplay){
597 597
                displayStatus = PreferencesUtil.displayStatusInChecklistEditor();
598
                overrideStatusDisplay = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.DisplayOfStatus.getKey()));
598
                overrideStatusDisplay = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.DisplayOfStatus.getKey()));
599 599
            }else{
600 600
                this.displayStatus = pref.getValue();
601 601
            }
602 602
        }else{
603 603
            displayStatus = PreferencesUtil.displayStatusInChecklistEditor();
604 604
            this.allowOverrideStatusDisplay = true;
605
            overrideStatusDisplay = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.DisplayOfStatus.getKey()));
605
            overrideStatusDisplay = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.DisplayOfStatus.getKey()));
606 606
        }
607 607

  
608
        pref = PreferencesUtil.getPreferenceFromDB(EditorPreferencePredicate.AreasSortedInDistributionEditor);
608
        pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.AreasSortedInDistributionEditor);
609 609
        if (pref != null){
610 610

  
611 611
            this.allowOverrideOrderAreas = pref.isAllowOverride();
612 612
            if (allowOverrideOrderAreas){
613 613
                orderAreas = PreferencesUtil.getSortNamedAreasInDistributionEditor();
614
                overrideOrderAreas = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.AreasSortedInDistributionEditor.getKey()));
614
                overrideOrderAreas = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.AreasSortedInDistributionEditor.getKey()));
615 615
            }else{
616 616
                if (pref.getValue() != null){
617 617
                    orderAreas = pref.getValue().toString();
618 618
                }else{
619
                    orderAreas = EditorPreferencePredicate.AreasSortedInDistributionEditor.getDefaultValue().toString();
619
                    orderAreas = PreferencePredicate.AreasSortedInDistributionEditor.getDefaultValue().toString();
620 620
                }
621 621
            }
622 622
        }else{
623 623
            orderAreas = PreferencesUtil.getSortNamedAreasInDistributionEditor();
624 624
            this.allowOverrideOrderAreas = true;
625
            overrideOrderAreas = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.AreasSortedInDistributionEditor.getKey()));
625
            overrideOrderAreas = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.AreasSortedInDistributionEditor.getKey()));
626 626
        }
627 627

  
628
        pref = PreferencesUtil.getPreferenceFromDB(EditorPreferencePredicate.ShowRankInDistributionEditor);
628
        pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.ShowRankInDistributionEditor);
629 629
        if (pref != null){
630 630

  
631 631
            allowOverrideRank = pref.isAllowOverride();
632 632
            if (allowOverrideRank){
633 633
                isShowRank = PreferencesUtil.isShowRankInChecklistEditor();
634
                overrideRank = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.ShowRankInDistributionEditor.getKey()));
634
                overrideRank = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowRankInDistributionEditor.getKey()));
635 635
            }else{
636 636
                this.isShowRank = Boolean.valueOf(pref.getValue().toString());
637 637
            }
638 638
        }else{
639 639
            isShowRank = PreferencesUtil.isShowRankInChecklistEditor();
640 640
            this.allowOverrideRank = true;
641
            overrideRank = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.ShowRankInDistributionEditor.getKey()));
641
            overrideRank = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowRankInDistributionEditor.getKey()));
642 642
        }
643 643

  
644
        pref = PreferencesUtil.getPreferenceFromDB(EditorPreferencePredicate.OwnDescriptionForDistributionEditor);
644
        pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.OwnDescriptionForDistributionEditor);
645 645
        if (pref != null){
646 646

  
647 647
            allowOverrideOwnDescriptionForDistributionEditor = pref.isAllowOverride();
......
653 653
        }else{
654 654
            ownDescriptionForDistributionEditor = PreferencesUtil.isShowRankInChecklistEditor();
655 655
            allowOverrideOwnDescriptionForDistributionEditor = true;
656
            overrideOwnDescriptionForDistributionEditor = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.OwnDescriptionForDistributionEditor.getKey()));
656
            overrideOwnDescriptionForDistributionEditor = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.OwnDescriptionForDistributionEditor.getKey()));
657 657
        }
658 658

  
659 659

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/EditorPreferencePredicate.java
15 15
import eu.etaxonomy.cdm.model.common.IEnumTerm;
16 16
import eu.etaxonomy.cdm.model.common.Language;
17 17
import eu.etaxonomy.cdm.model.metadata.IPreferencePredicate;
18
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
19
import eu.etaxonomy.cdm.model.metadata.TermDisplayEnum;
20 18

  
21 19
/**
22 20
 * @author k.luther
......
26 24
public enum EditorPreferencePredicate implements IEnumTerm<EditorPreferencePredicate>, IPreferencePredicate {
27 25

  
28 26

  
29

  
30
    TaxonNodeOrder(UUID.fromString("ce06bd8e-4371-4ee5-8f57-cf23930cfd12"), "Taxon node order", "model.taxon.TNO", NavigatorOrderEnum.RankAndNameOrder),  //default alphabet + rank
31
    NameDetailsView(UUID.fromString("3c4ec5f5-feb5-44a8-8533-c3c3484a6869"), "NameDetailsView", "model.editor.NDV", null),
32
    DeterminationOnlyForFieldUnits(UUID.fromString("91b9224b-6610-4cf1-b3da-d60d6f9d59b1"), "DeterminationOnlyForFieldUnit", "model.editor.DOFU", Boolean.FALSE),
33

  
34
    //taxeditor UI
35
    ShowMediaView(UUID.fromString("ba7ba1bb-47e3-4b68-bc44-c5ac45775db4"), "Show media view", "views.showMediaView", Boolean.TRUE),
36
    ShowTaxonNodeWizard(UUID.fromString("af06fbec-635b-4676-8b60-0b98aefda6aa"), "Show TaxonNode wizard", "views.showTaxonNodeWizard", Boolean.TRUE),
37
    DisableMultiClassification(UUID.fromString("abdf7e40-afe6-4131-9af3-c6b6779ee6be"), "Disable multi-classification functionality", "menu.disableMultiClassification", Boolean.FALSE),
38
    ShowChecklistPerspective(UUID.fromString("6058762b-893c-4330-bfe7-45d5717d02b2"), "Show checklist perspective as default", "perspective.checklist", Boolean.FALSE),
39

  
40

  
41
    //sources
42
    ShowIdInSource(UUID.fromString("de291d1b-d89e-42ee-a7b5-15f306f50785"), "Source Details: Show ID in Source", "sourceDetails.IdInSource", Boolean.TRUE),
43
    //I did rename this "Name"-> "Namespace" (later we should adapt the modelKey similarly
44
    ShowNamespaceInSource(UUID.fromString("f2e881bb-03a1-4bf9-aff1-7bfd4d355a7c"), "Source Details: Show Namespace in Source", "sourceDetails.NameInSource", Boolean.TRUE),
45

  
46
    //name details view
47
    SimpleDetailsViewActivated(UUID.fromString("78666fde-9ee5-4c09-923b-be98604aace6"), "Name Details: Activated", "editor.nameDetails.activated", Boolean.FALSE),
48
    ShowTaxon(UUID.fromString("0853e47a-68a8-49af-94d6-505a0479cb28"), "Name Details: Show Taxon", "editor.nameDetails.taxon", Boolean.TRUE),
49
    ShowLSID(UUID.fromString("fa26eba7-43ed-4498-83a5-8f306a3ef6b3"), "Name Details: Show LSID", "editor.nameDetails.LSID", Boolean.TRUE),
50
    ShowNomenclaturalCode(UUID.fromString("b54c7670-a4eb-4d41-b847-2c1a48efdd25"), "Name Details: Show Nomenclatural Code", "editor.nameDetails.NC", Boolean.TRUE),
51
    ShowNameCache(UUID.fromString("d2e74b5b-90ca-4f5a-8979-d3c065512d63"), "Name Details: Show Namecache", "editor.nameDetails.nameCache", Boolean.TRUE),
52
    ShowNameEpithets(UUID.fromString("816b7edd-0e1e-4277-9931-f73f1970dfe2"), "Name Details: Show Name Epithets", "editor.nameDetails.NE", Boolean.TRUE),
53
    ShowAppendedPhrase(UUID.fromString("ca0b3d02-09f0-458f-af88-9c9d281f029d"), "Name Details: Show Appended Phrase", "editor.nameDetails.AP", Boolean.TRUE),
54
    ShowRankInNameDetails(UUID.fromString("b1181426-e87a-4cd2-80bb-40224182efda"), "Name Details: Show Rank", "editor.nameDetails.rank", Boolean.TRUE),
55
    ShowAuthorship(UUID.fromString("ce6e1a79-f0c3-4542-a93c-2dbd0023220e"), "Name Details: Show Authorship", "editor.nameDetails.AS", Boolean.TRUE),
56
    ShowAuthorshipCache(UUID.fromString("dbc95c3c-b984-406c-b060-67bde64bb968"), "Name Details: Show AuthorshipCache", "editor.nameDetails.ASC", Boolean.TRUE),
57
    ShowNomenclaturalReference(UUID.fromString("5b318525-8830-4dbd-8f31-df93bbc69800"), "Name Details: Show Nomenclatural Reference", "editor.nameDetails.NR", Boolean.TRUE),
58
    ShowNomenclaturalStatus(UUID.fromString("075eba36-90fc-42a2-8e2d-98a61ee88205"), "Name Details: Show Nomenclatural Status", "editor.nameDetails.NS", Boolean.TRUE),
59
    ShowProtologue(UUID.fromString("fd1105cf-5c98-4325-9db3-117907dac448"), "Name Details: Show Protologue", "editor.nameDetails.SP", Boolean.TRUE),
60
    ShowTypeDesignation(UUID.fromString("dc79a014-5307-457e-9e92-7353a47a4df6"), "Name Details: Show Typedesignation", "editor.nameDetails.TD", Boolean.TRUE),
61
    ShowNameRelations(UUID.fromString("7173817e-c15f-4618-8dea-2035b84f7757"), "Name Details: Show Namerelationships", "editor.nameDetails.NRS", Boolean.TRUE),
62
    ShowHybrid(UUID.fromString("f58a4e82-8162-4d2e-905d-466d40069df8"), "Name Details: Show Hybrid Section", "editor.nameDetails.hybrids", Boolean.TRUE),
63

  
64
    //distribution editor
65
    DistributionEditorActivated(UUID.fromString("733e9bce-4394-4fae-97d3-1b7dfc48ee3c"), "Distribution Editor Is activated", "distribution.editor.activated",  Boolean.TRUE),
66
    AreasSortedInDistributionEditor(UUID.fromString("513d7de9-fec4-432c-b4dd-75f9f6e74ad0"), "Distribution Editor: Areas sorted in Distribution Editor", "distribution.editor.areas.sortedInDistributionEditor", TermOrder.IdInVoc),  //unsure about correct default value, please decide
67
    //the following 4 should be replaced by termLabelPreferenceEnum , enum should contain label, abbrevLabel, idInVoc, symbol1, symbol2, ...
68
    DisplayOfStatus(UUID.fromString("1ee6b945-0a81-4f05-b867-f9d105882249"), "Distribution Editor: Display of Status", "distribution.editor.status.display", TermDisplayEnum.Title),
69
    DisplayOfAreasInDistributionEditor(UUID.fromString("7b671bba-1b7f-4cb9-bbac-c914518a4bf8"), "Distribution Editor: Display of Areas", "distribution.editor.areas.displayAreas",  TermDisplayEnum.Title),
70
    OwnDescriptionForDistributionEditor(UUID.fromString("38282571-049c-473e-bec3-bde6f65f796a"), "Distribution Editor: Create distribution editor TaxonDescription", "distribution.editor.distributionOwnDescription",  Boolean.FALSE),
71
    AvailableDistributionAreaTerms(UUID.fromString("34469acc-9e23-4f95-92d4-1695e02cb5a0"), "Available Distribution Area Terms", "distribution.area.terms", null),  //default: all/no filter
72

  
73

  
74
    ShowRankInDistributionEditor(UUID.fromString("fb13b4f2-2d82-4fd3-8abe-2b955a695245"), "Distribution Editor: Show Rank", "distribution.editor.showRank", Boolean.FALSE),
75

  
76

  
77
    //import
78
    ShowImportExportMenu(UUID.fromString("92839352-beee-4d66-b078-77fd4f500ab4"), "Show Import Export Menu Items", "io.showMenu", Boolean.TRUE),
79
    AbcdImportConfig(UUID.fromString("65380375-d041-458c-8275-c36cdc1f34df"), "AbcdImportConfig", "io.ABCD.config", null),  //default defined in TaxEditor
80
    BioCaseProvider(UUID.fromString("bd22c85c-f4e8-4771-ae7b-5750868762c4"), "BioCaseProvider", "io.ABCD.providerList", null),  //default defined in TaxEditor
81

  
82
    //specimen
83
    ShowSpecimen(UUID.fromString("a925f874-b953-429f-9db7-f28e3beb576f"), "Show Specimen", "showSpecimen", Boolean.TRUE),
84
    ShowCollectingAreasInGeneralSection(UUID.fromString("578a1195-64ce-4dfb-9be9-6f2823288678"), "Show Collecting Area in General Section", "specimen.detail.showCollectingAreaInGeneralSection", Boolean.FALSE),
85
    ShowTaxonAssociations(UUID.fromString("849c24f9-b62b-4f70-b0a0-1b02182b3433"), "Show Taxon Associations", "specimen.detail.showTaxonAssociations", Boolean.FALSE),
86
    ShowLifeForm(UUID.fromString("85870e7d-a6a3-4c9b-97d6-eb27e6516860"), "Show Life Form", "showLifeForm", Boolean.FALSE),
87

  
88

  
89
    DefaultBehaviourForPublishFlag(UUID.fromString("24e636fc-ef3b-4a2c-8c9e-018143e66949"), "Default behaviour for publish flag", "defaultBehaviourForPublishFlag", PublishEnum.InheritFromParent)
27
//    TaxonNodeOrder(UUID.fromString("ce06bd8e-4371-4ee5-8f57-cf23930cfd12"), "Taxon node order", "model.taxon.TNO", NavigatorOrderEnum.RankAndNameOrder),  //default alphabet + rank
28
//    NameDetailsView(UUID.fromString("3c4ec5f5-feb5-44a8-8533-c3c3484a6869"), "NameDetailsView", "model.editor.NDV", null),
29
//    DeterminationOnlyForFieldUnits(UUID.fromString("91b9224b-6610-4cf1-b3da-d60d6f9d59b1"), "DeterminationOnlyForFieldUnit", "model.editor.DOFU", Boolean.FALSE),
30
//
31
//    //taxeditor UI
32
//    ShowMediaView(UUID.fromString("ba7ba1bb-47e3-4b68-bc44-c5ac45775db4"), "Show media view", "views.showMediaView", Boolean.TRUE),
33
//    ShowTaxonNodeWizard(UUID.fromString("af06fbec-635b-4676-8b60-0b98aefda6aa"), "Show TaxonNode wizard", "views.showTaxonNodeWizard", Boolean.TRUE),
34
//    DisableMultiClassification(UUID.fromString("abdf7e40-afe6-4131-9af3-c6b6779ee6be"), "Disable multi-classification functionality", "menu.disableMultiClassification", Boolean.FALSE),
35
//    ShowChecklistPerspective(UUID.fromString("6058762b-893c-4330-bfe7-45d5717d02b2"), "Show checklist perspective as default", "perspective.checklist", Boolean.FALSE),
36
//
37
//
38
//    //sources
39
//    ShowIdInSource(UUID.fromString("de291d1b-d89e-42ee-a7b5-15f306f50785"), "Source Details: Show ID in Source", "sourceDetails.IdInSource", Boolean.TRUE),
40
//    //I did rename this "Name"-> "Namespace" (later we should adapt the modelKey similarly
41
//    ShowNamespaceInSource(UUID.fromString("f2e881bb-03a1-4bf9-aff1-7bfd4d355a7c"), "Source Details: Show Namespace in Source", "sourceDetails.NameInSource", Boolean.TRUE),
42
//
43
//    //name details view
44
//    SimpleDetailsViewActivated(UUID.fromString("78666fde-9ee5-4c09-923b-be98604aace6"), "Name Details: Activated", "editor.nameDetails.activated", Boolean.FALSE),
45
//    ShowTaxon(UUID.fromString("0853e47a-68a8-49af-94d6-505a0479cb28"), "Name Details: Show Taxon", "editor.nameDetails.taxon", Boolean.TRUE),
46
//    ShowLSID(UUID.fromString("fa26eba7-43ed-4498-83a5-8f306a3ef6b3"), "Name Details: Show LSID", "editor.nameDetails.LSID", Boolean.TRUE),
47
//    ShowNomenclaturalCode(UUID.fromString("b54c7670-a4eb-4d41-b847-2c1a48efdd25"), "Name Details: Show Nomenclatural Code", "editor.nameDetails.NC", Boolean.TRUE),
48
//    ShowNameCache(UUID.fromString("d2e74b5b-90ca-4f5a-8979-d3c065512d63"), "Name Details: Show Namecache", "editor.nameDetails.nameCache", Boolean.TRUE),
49
//    ShowNameEpithets(UUID.fromString("816b7edd-0e1e-4277-9931-f73f1970dfe2"), "Name Details: Show Name Epithets", "editor.nameDetails.NE", Boolean.TRUE),
50
//    ShowAppendedPhrase(UUID.fromString("ca0b3d02-09f0-458f-af88-9c9d281f029d"), "Name Details: Show Appended Phrase", "editor.nameDetails.AP", Boolean.TRUE),
51
//    ShowRankInNameDetails(UUID.fromString("b1181426-e87a-4cd2-80bb-40224182efda"), "Name Details: Show Rank", "editor.nameDetails.rank", Boolean.TRUE),
52
//    ShowAuthorship(UUID.fromString("ce6e1a79-f0c3-4542-a93c-2dbd0023220e"), "Name Details: Show Authorship", "editor.nameDetails.AS", Boolean.TRUE),
53
//    ShowAuthorshipCache(UUID.fromString("dbc95c3c-b984-406c-b060-67bde64bb968"), "Name Details: Show AuthorshipCache", "editor.nameDetails.ASC", Boolean.TRUE),
54
//    ShowNomenclaturalReference(UUID.fromString("5b318525-8830-4dbd-8f31-df93bbc69800"), "Name Details: Show Nomenclatural Reference", "editor.nameDetails.NR", Boolean.TRUE),
55
//    ShowNomenclaturalStatus(UUID.fromString("075eba36-90fc-42a2-8e2d-98a61ee88205"), "Name Details: Show Nomenclatural Status", "editor.nameDetails.NS", Boolean.TRUE),
56
//    ShowProtologue(UUID.fromString("fd1105cf-5c98-4325-9db3-117907dac448"), "Name Details: Show Protologue", "editor.nameDetails.SP", Boolean.TRUE),
57
//    ShowTypeDesignation(UUID.fromString("dc79a014-5307-457e-9e92-7353a47a4df6"), "Name Details: Show Typedesignation", "editor.nameDetails.TD", Boolean.TRUE),
58
//    ShowNameRelations(UUID.fromString("7173817e-c15f-4618-8dea-2035b84f7757"), "Name Details: Show Namerelationships", "editor.nameDetails.NRS", Boolean.TRUE),
59
//    ShowHybrid(UUID.fromString("f58a4e82-8162-4d2e-905d-466d40069df8"), "Name Details: Show Hybrid Section", "editor.nameDetails.hybrids", Boolean.TRUE),
60
//
61
//    //distribution editor
62
//    DistributionEditorActivated(UUID.fromString("733e9bce-4394-4fae-97d3-1b7dfc48ee3c"), "Distribution Editor Is activated", "distribution.editor.activated",  Boolean.TRUE),
63
//    AreasSortedInDistributionEditor(UUID.fromString("513d7de9-fec4-432c-b4dd-75f9f6e74ad0"), "Distribution Editor: Areas sorted in Distribution Editor", "distribution.editor.areas.sortedInDistributionEditor", TermOrder.IdInVoc),  //unsure about correct default value, please decide
64
//    //the following 4 should be replaced by termLabelPreferenceEnum , enum should contain label, abbrevLabel, idInVoc, symbol1, symbol2, ...
65
//    DisplayOfStatus(UUID.fromString("1ee6b945-0a81-4f05-b867-f9d105882249"), "Distribution Editor: Display of Status", "distribution.editor.status.display", TermDisplayEnum.Title),
66
//    DisplayOfAreasInDistributionEditor(UUID.fromString("7b671bba-1b7f-4cb9-bbac-c914518a4bf8"), "Distribution Editor: Display of Areas", "distribution.editor.areas.displayAreas",  TermDisplayEnum.Title),
67
//    OwnDescriptionForDistributionEditor(UUID.fromString("38282571-049c-473e-bec3-bde6f65f796a"), "Distribution Editor: Create distribution editor TaxonDescription", "distribution.editor.distributionOwnDescription",  Boolean.FALSE),
68
//    AvailableDistributionAreaTerms(UUID.fromString("34469acc-9e23-4f95-92d4-1695e02cb5a0"), "Available Distribution Area Terms", "distribution.area.terms", null),  //default: all/no filter
69
//
70
//
71
//    ShowRankInDistributionEditor(UUID.fromString("fb13b4f2-2d82-4fd3-8abe-2b955a695245"), "Distribution Editor: Show Rank", "distribution.editor.showRank", Boolean.FALSE),
72
//
73
//
74
//    //import
75
//    ShowImportExportMenu(UUID.fromString("92839352-beee-4d66-b078-77fd4f500ab4"), "Show Import Export Menu Items", "io.showMenu", Boolean.TRUE),
76
//    AbcdImportConfig(UUID.fromString("65380375-d041-458c-8275-c36cdc1f34df"), "AbcdImportConfig", "io.ABCD.config", null),  //default defined in TaxEditor
77
//    BioCaseProvider(UUID.fromString("bd22c85c-f4e8-4771-ae7b-5750868762c4"), "BioCaseProvider", "io.ABCD.providerList", null),  //default defined in TaxEditor
78
//
79
//    //specimen
80
//    ShowSpecimen(UUID.fromString("a925f874-b953-429f-9db7-f28e3beb576f"), "Show Specimen", "showSpecimen", Boolean.TRUE),
81
//    ShowCollectingAreasInGeneralSection(UUID.fromString("578a1195-64ce-4dfb-9be9-6f2823288678"), "Show Collecting Area in General Section", "specimen.detail.showCollectingAreaInGeneralSection", Boolean.FALSE),
82
//    ShowTaxonAssociations(UUID.fromString("849c24f9-b62b-4f70-b0a0-1b02182b3433"), "Show Taxon Associations", "specimen.detail.showTaxonAssociations", Boolean.FALSE),
83
//    ShowLifeForm(UUID.fromString("85870e7d-a6a3-4c9b-97d6-eb27e6516860"), "Show Life Form", "showLifeForm", Boolean.FALSE),
84
//
85
//
86
//    DefaultBehaviourForPublishFlag(UUID.fromString("24e636fc-ef3b-4a2c-8c9e-018143e66949"), "Default behaviour for publish flag", "defaultBehaviourForPublishFlag", PublishEnum.InheritFromParent)
90 87
    ;
91 88

  
92 89

  
93 90

  
94 91
    private static EnumeratedTermVoc<EditorPreferencePredicate> delegateVoc;
95 92
    private IEnumTerm<EditorPreferencePredicate> delegateVocTerm;
96

  
97
    static {
98
        delegateVoc = EnumeratedTermVoc.getVoc(EditorPreferencePredicate.class);
99
    }
93
//
94
//    static {
95
//        delegateVoc = EnumeratedTermVoc.getVoc(EditorPreferencePredicate.class);
96
//    }
100 97
    private Object defaultValue;
101

  
102

  
103
    private EditorPreferencePredicate(UUID uuid, String messageString, String key, Object defaultValue){
104
       this(uuid, messageString, key, null, defaultValue);
105
    }
106

  
107
    private EditorPreferencePredicate(UUID uuid, String messageString, String modelKey, PreferencePredicate parent, Object defaultValue){
108
        delegateVocTerm = EnumeratedTermVoc.addTerm(getClass(), this, uuid, messageString, modelKey, parent);
109
        this.defaultValue = defaultValue;
110

  
111
    }
112

  
98
//
99
//
100
//    private EditorPreferencePredicate(UUID uuid, String messageString, String key, Object defaultValue){
101
//       this(uuid, messageString, key, null, defaultValue);
102
//    }
103
//
104
//    private EditorPreferencePredicate(UUID uuid, String messageString, String modelKey, PreferencePredicate parent, Object defaultValue){
105
//        delegateVocTerm = EnumeratedTermVoc.addTerm(getClass(), this, uuid, messageString, modelKey, parent);
106
//        this.defaultValue = defaultValue;
107
//
108
//    }
109
//
113 110
    @Override
114 111
    public Object getDefaultValue() {return defaultValue;}
115 112

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralPreferencePage.java
18 18
import org.eclipse.swt.widgets.Label;
19 19

  
20 20
import eu.etaxonomy.cdm.model.metadata.CdmPreference;
21
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
21 22
import eu.etaxonomy.taxeditor.l10n.Messages;
22 23
import eu.etaxonomy.taxeditor.preference.menu.CdmPreferencePage;
23 24

  
......
204 205
    @Override
205 206
    public boolean performOk() {
206 207
        if (isAllowOverrideShowCheckListPerspective){
207
            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.ShowChecklistPerspective.getKey()), isOverrideShowCheckListPerspective);
208
            PreferencesUtil.setBooleanValue(EditorPreferencePredicate.ShowChecklistPerspective.getKey(), isShowCheckListPerspective);
208
            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowChecklistPerspective.getKey()), isOverrideShowCheckListPerspective);
209
            PreferencesUtil.setBooleanValue(PreferencePredicate.ShowChecklistPerspective.getKey(), isShowCheckListPerspective);
209 210
        }
210 211
        if (isAllowOverrideShowIOMenu){
211
            PreferencesUtil.setBooleanValue(EditorPreferencePredicate.ShowImportExportMenu.getKey(), isShowIOMenu);
212
            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.ShowImportExportMenu.getKey()), isOverrideShowIOMenu);
212
            PreferencesUtil.setBooleanValue(PreferencePredicate.ShowImportExportMenu.getKey(), isShowIOMenu);
213
            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowImportExportMenu.getKey()), isOverrideShowIOMenu);
213 214
        }
214 215
//        if (isAllowOverrideShowMediaView){
215
//            PreferencesUtil.setBooleanValue(EditorPreferencePredicate.ShowMediaView.getKey(), isShowMediaView);
216
//            PreferencesUtil.setBooleanValue(PreferencePredicate.ShowMediaView.getKey(), isShowMediaView);
216 217
//        }
217 218
        if (isAllowOverrideShowTaxonNodeWizard){
218
            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.ShowTaxonNodeWizard.getKey()), isOverrideShowTaxonNodeWizard);
219
            PreferencesUtil.setBooleanValue(EditorPreferencePredicate.ShowTaxonNodeWizard.getKey(), isShowTaxonNodeWizard);
219
            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowTaxonNodeWizard.getKey()), isOverrideShowTaxonNodeWizard);
220
            PreferencesUtil.setBooleanValue(PreferencePredicate.ShowTaxonNodeWizard.getKey(), isShowTaxonNodeWizard);
220 221
        }
221 222

  
222 223
       return true;
......
226 227
        isAdminPreference = false;
227 228

  
228 229
        CdmPreferenceCache cache = CdmPreferenceCache.instance();
229
        isShowIOMenu = PreferencesUtil.getBooleanValue(EditorPreferencePredicate.ShowImportExportMenu.getKey());
230
        isOverrideShowIOMenu = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.ShowImportExportMenu.getKey()));
231
        CdmPreference pref = cache.get(EditorPreferencePredicate.ShowImportExportMenu.getKey());
230
        isShowIOMenu = PreferencesUtil.getBooleanValue(PreferencePredicate.ShowImportExportMenu.getKey());
231
        isOverrideShowIOMenu = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowImportExportMenu.getKey()));
232
        CdmPreference pref = cache.get(PreferencePredicate.ShowImportExportMenu.getKey());
232 233
        if (pref != null){
233 234
            isAllowOverrideShowIOMenu = pref.isAllowOverride();
234 235
        }else{
235 236
            isAllowOverrideShowIOMenu = true;
236 237
        }
237
//        isShowMediaView = PreferencesUtil.getBooleanValue(EditorPreferencePredicate.ShowMediaView.getKey());
238
//        pref = cache.get(EditorPreferencePredicate.ShowMediaView.getKey());
238
//        isShowMediaView = PreferencesUtil.getBooleanValue(PreferencePredicate.ShowMediaView.getKey());
239
//        pref = cache.get(PreferencePredicate.ShowMediaView.getKey());
239 240
//        if (pref != null){
240 241
//            isAllowOverrideShowMediaView = pref.isAllowOverride();
241 242
//        }else{
242 243
//            isAllowOverrideShowMediaView = true;
243 244
//        }
244
        isShowCheckListPerspective = PreferencesUtil.getBooleanValue(EditorPreferencePredicate.ShowChecklistPerspective.getKey());
245
        isOverrideShowCheckListPerspective = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.ShowChecklistPerspective.getKey()));
246
        pref = cache.get(EditorPreferencePredicate.ShowChecklistPerspective.getKey());
245
        isShowCheckListPerspective = PreferencesUtil.getBooleanValue(PreferencePredicate.ShowChecklistPerspective.getKey());
246
        isOverrideShowCheckListPerspective = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowChecklistPerspective.getKey()));
247
        pref = cache.get(PreferencePredicate.ShowChecklistPerspective.getKey());
247 248
        if (pref != null){
248 249
            isAllowOverrideShowCheckListPerspective = pref.isAllowOverride();
249 250
        }else{
250 251
            isAllowOverrideShowCheckListPerspective = true;
251 252
        }
252
        isShowTaxonNodeWizard = PreferencesUtil.getBooleanValue(EditorPreferencePredicate.ShowTaxonNodeWizard.getKey());
253
        isOverrideShowTaxonNodeWizard = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.ShowTaxonNodeWizard.getKey()));
254
        pref = cache.get(EditorPreferencePredicate.ShowTaxonNodeWizard.getKey());
253
        isShowTaxonNodeWizard = PreferencesUtil.getBooleanValue(PreferencePredicate.ShowTaxonNodeWizard.getKey());
254
        isOverrideShowTaxonNodeWizard = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowTaxonNodeWizard.getKey()));
255
        pref = cache.get(PreferencePredicate.ShowTaxonNodeWizard.getKey());
255 256
        if (pref != null){
256 257
            isAllowOverrideShowTaxonNodeWizard = pref.isAllowOverride();
257 258
        }else{
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsViewConfiguration.java
13 13
import org.eclipse.swt.widgets.Label;
14 14

  
15 15
import eu.etaxonomy.cdm.model.metadata.CdmPreference;
16
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
16 17
import eu.etaxonomy.taxeditor.l10n.Messages;
17 18
import eu.etaxonomy.taxeditor.preference.menu.CdmPreferencePage;
18 19

  
......
370 371
    @Override
371 372
    public boolean performOk() {
372 373
        if (nameDetailsConfig != null){
373
            PreferencesUtil.setStringValue(EditorPreferencePredicate.NameDetailsView.getKey(), nameDetailsConfig.toString());
374
            PreferencesUtil.setStringValue(PreferencePredicate.NameDetailsView.getKey(), nameDetailsConfig.toString());
374 375
            PreferencesUtil.setBooleanValue(IPreferenceKeys.OVERRIDE_NAME_DETAILS, isOverride);
375 376
        }
376 377

  
......
380 381

  
381 382
    @Override
382 383
    public void init(){
383
        CdmPreference nameDetailsPref = PreferencesUtil.getPreferenceFromDB(EditorPreferencePredicate.NameDetailsView);
384
        CdmPreference nameDetailsPref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.NameDetailsView);
384 385
        isAdminPreference = false;
385 386
        isAllowOverride = true;
386 387
        if (nameDetailsPref != null){
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/OrderPreferences.java
83 83
            orderSelectionCombo.addSelectionListener(this);
84 84

  
85 85
            final Label description = new Label(parent, SWT.NONE);
86
            description.setText(""); //$NON-NLS-1$
86
            description.setText(Messages.OrderPreferencePage_NewNavigatorWindowRequired);
87 87

  
88 88
	        return composite;
89 89
	    }
......
94 94
		    if (this.orderActivated != null){
95 95
    		    PreferencesUtil.setSortNodes(this.orderActivated);
96 96
    	        PreferencesUtil.setStoreNavigatorState(isRestoreTaxonNavigator);
97
    	    	MessageDialog.openInformation(getShell(), null, ""); //$NON-NLS-1$
97
    	    	MessageDialog.openInformation(getShell(), null, Messages.OrderPreferencePage_PleaseReopenNavigator);
98 98
		    }
99 99
			return super.performOk();
100 100

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencePropertyTester.java
11 11

  
12 12
import org.eclipse.core.expressions.PropertyTester;
13 13

  
14
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
15

  
14 16
/**
15 17
 * @author n.hoffmann
16 18
 * @created Jan 26, 2011
......
54 56
	}
55 57

  
56 58
	private boolean isChecklistEditorEnabled() {
57
        return PreferencesUtil.getBooleanValue(EditorPreferencePredicate.DistributionEditorActivated.getKey());
59
        return PreferencesUtil.getBooleanValue(PreferencePredicate.DistributionEditorActivated.getKey());
58 60
    }
59 61
	private boolean isShowIOMenuEnabled() {
60
        return PreferencesUtil.getBooleanValue(EditorPreferencePredicate.ShowImportExportMenu.getKey());
62
        return PreferencesUtil.getBooleanValue(PreferencePredicate.ShowImportExportMenu.getKey());
61 63
    }
62 64

  
63 65
	private boolean isShowSpecimenMenuEnabled() {
64
        return PreferencesUtil.getBooleanValue(EditorPreferencePredicate.ShowSpecimen.getKey());
66
        return PreferencesUtil.getBooleanValue(PreferencePredicate.ShowSpecimen.getKey());
65 67
    }
66 68

  
67 69
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
497 497
    }
498 498

  
499 499
	public static boolean isShowTaxonAssociations(){
500
        boolean result = getBooleanValue(EditorPreferencePredicate.ShowTaxonAssociations.getKey());
500
        boolean result = getBooleanValue(PreferencePredicate.ShowTaxonAssociations.getKey());
501 501
        return result;
502 502
    }
503 503

  
504 504
	public static boolean isShowLifeForm(){
505
	    boolean result =  getBooleanValue(EditorPreferencePredicate.ShowLifeForm.getKey());
505
	    boolean result =  getBooleanValue(PreferencePredicate.ShowLifeForm.getKey());
506 506
	    return result;
507 507
    }
508 508

  
509 509
	public static boolean isDeterminationOnlyForFieldUnits(){
510
	    boolean result =  getBooleanValue(EditorPreferencePredicate.DeterminationOnlyForFieldUnits.getKey());
510
	    boolean result =  getBooleanValue(PreferencePredicate.DeterminationOnlyForFieldUnits.getKey());
511 511
        return result;
512 512
    }
513 513

  
514 514
	public static boolean isCollectingAreaInGeneralSection(){
515
	    boolean result =  getBooleanValue(EditorPreferencePredicate.ShowCollectingAreasInGeneralSection.getKey());
515
	    boolean result =  getBooleanValue(PreferencePredicate.ShowCollectingAreasInGeneralSection.getKey());
516 516
        return result;
517 517
	}
518 518

  
......
838 838
		getPreferenceStore().setDefault(createPreferenceString(OPENURL_IMAGE_MAX_WIDTH), "1000");
839 839
		getPreferenceStore().setDefault(createPreferenceString(OPENURL_IMAGE_MAX_HEIGHT), "1000");
840 840
		//Distribution Editor:
841
		getPreferenceStore().setDefault(createPreferenceString(EditorPreferencePredicate.DistributionEditorActivated.getKey()), Boolean.valueOf(EditorPreferencePredicate.DistributionEditorActivated.getDefaultValue().toString()));
842
		getPreferenceStore().setDefault(createPreferenceString(EditorPreferencePredicate.DisplayOfAreasInDistributionEditor.getKey()), EditorPreferencePredicate.DisplayOfAreasInDistributionEditor.getDefaultValue().toString());
843
		getPreferenceStore().setDefault(createPreferenceString(EditorPreferencePredicate.DisplayOfStatus.getKey()), EditorPreferencePredicate.DisplayOfStatus.getDefaultValue().toString());
841
		getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.DistributionEditorActivated.getKey()), Boolean.valueOf(PreferencePredicate.DistributionEditorActivated.getDefaultValue().toString()));
842
		getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.DisplayOfAreasInDistributionEditor.getKey()), PreferencePredicate.DisplayOfAreasInDistributionEditor.getDefaultValue().toString());
843
		getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.DisplayOfStatus.getKey()), PreferencePredicate.DisplayOfStatus.getDefaultValue().toString());
844 844

  
845 845

  
846 846
		//Name Details
847
		getPreferenceStore().setDefault(createPreferenceString(EditorPreferencePredicate.NameDetailsView.getKey()), new NameDetailsConfigurator(false).toString());
847
		getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.NameDetailsView.getKey()), new NameDetailsConfigurator(false).toString());
848 848

  
849 849
		//Navigator preferences
850 850
		getPreferenceStore().setDefault(createPreferenceString(SORT_NODES), NavigatorOrderEnum.RankAndNameOrder.getKey());
851 851

  
852 852
		getPreferenceStore().setDefault(createPreferenceString(SORT_TAXA_BY_RANK_AND_NAME), true);
853 853
		//override db preferences
854
		getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(EditorPreferencePredicate.AbcdImportConfig.getKey())), false);
855
		getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(EditorPreferencePredicate.ShowSpecimen.getKey())), true);
856
		getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(EditorPreferencePredicate.NameDetailsView.getKey())), false);
857
		getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(EditorPreferencePredicate.DistributionEditorActivated.getKey())), false);
854
		getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(PreferencePredicate.AbcdImportConfig.getKey())), false);
855
		getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(PreferencePredicate.ShowSpecimen.getKey())), true);
856
		getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(PreferencePredicate.NameDetailsView.getKey())), false);
857
		getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(PreferencePredicate.DistributionEditorActivated.getKey())), false);
858 858

  
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff