From f8fa200d25c8548746b096add628e33f793e06e2 Mon Sep 17 00:00:00 2001 From: Katja Luther Date: Mon, 16 Sep 2019 14:35:43 +0200 Subject: [PATCH] ref #8489: code cleaning --- .../FeatureAdminMenuPreference.java | 2 +- .../NameFeatureAdminMenuPreference.java | 2 +- ...NomenclaturalStatusTypeAdminPreference.java | 2 +- .../preferencePage/RankAdminPreference.java | 2 +- .../preference/GeneralTermPreference.java | 11 ++++------- .../NomenclaturalStatusTypePreferences.java | 1 - .../taxeditor/preference/RankPreference.java | 2 +- .../preference/menu/CdmPreferencePage.java | 2 +- .../menu/CommonNameLanguagePreferences.java | 2 +- .../menu/FeatureMenuPreferences.java | 2 +- .../menu/LanguageMenuPreferences.java | 1 - .../menu/MarkerTypeMenuPreferences.java | 3 +-- .../menu/MeasurementUnitMenuPreferences.java | 1 - .../menu/NameFeatureMenuPreference.java | 1 - .../NameRelationshipTypeMenuPreferences.java | 1 - ...meTypeDesignationStatusMenuPreferences.java | 1 - .../menu/NamedAreaTypeMenuPreferences.java | 1 - ...enTypeDesignationStatusMenuPreferences.java | 1 - .../preference/menu/StageMenuPreferences.java | 1 - .../TaxonRelationshipTypeMenuPreferences.java | 1 - ...ailableDistributionPerAreaStatusWizard.java | 4 +--- .../GeneralVocabularyPreferencePage.java | 18 ++++++++++++++++++ 22 files changed, 32 insertions(+), 30 deletions(-) diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/FeatureAdminMenuPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/FeatureAdminMenuPreference.java index 9d9df6fc0..1cd056f15 100755 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/FeatureAdminMenuPreference.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/FeatureAdminMenuPreference.java @@ -23,7 +23,7 @@ public class FeatureAdminMenuPreference extends FeatureMenuPreferences { */ public FeatureAdminMenuPreference() { super(); - setLocalPref(false); + isAdminPreference = true; setPredicate(PreferencePredicate.TaxonFeatures); type = TermType.Feature; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NameFeatureAdminMenuPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NameFeatureAdminMenuPreference.java index 50a5f68e5..20613925d 100755 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NameFeatureAdminMenuPreference.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NameFeatureAdminMenuPreference.java @@ -24,7 +24,7 @@ public class NameFeatureAdminMenuPreference extends NameFeatureMenuPreference { */ public NameFeatureAdminMenuPreference() { super(); - setLocalPref(false); + isAdminPreference = true; setPredicate(PreferencePredicate.NameFeatures); type = TermType.Feature; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NomenclaturalStatusTypeAdminPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NomenclaturalStatusTypeAdminPreference.java index 661e5fc49..6c847051f 100755 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NomenclaturalStatusTypeAdminPreference.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NomenclaturalStatusTypeAdminPreference.java @@ -30,7 +30,7 @@ public class NomenclaturalStatusTypeAdminPreference extends NomenclaturalStatusT public NomenclaturalStatusTypeAdminPreference(){ super(); - setLocalPref(false); + isAdminPreference = true; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/RankAdminPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/RankAdminPreference.java index 41588c49a..7ce08d482 100755 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/RankAdminPreference.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/RankAdminPreference.java @@ -34,7 +34,7 @@ public class RankAdminPreference extends RankPreference { public RankAdminPreference(){ super(); - setLocalPref(false); + isAdminPreference = true; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralTermPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralTermPreference.java index ccd178a27..ca8c753dc 100755 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralTermPreference.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralTermPreference.java @@ -60,7 +60,7 @@ abstract public class GeneralTermPreference extends CdmPreferencePage implements protected boolean allowOverride; protected CdmPreference pref; protected IPreferencePredicate predicate; - protected boolean localPref; + public GeneralTermPreference(){ super(); @@ -68,12 +68,9 @@ abstract public class GeneralTermPreference extends CdmPreferencePage implements } public boolean isLocalPref() { - return localPref; + return !isAdminPreference; } - public void setLocalPref(boolean localPref) { - this.localPref = localPref; - } protected TermType type; @@ -112,7 +109,7 @@ abstract public class GeneralTermPreference extends CdmPreferencePage implements container.setLayout(gridLayout); parent.setLayout(new GridLayout()); useLocalOrAdmin = new Combo(parent, SWT.BORDER | SWT.READ_ONLY); - if (localPref){ + if (!isAdminPreference){ useLocalOrAdmin.add(LocalOrDefaultEnum.Default.getLabel(), 0); useLocalOrAdmin.add(LocalOrDefaultEnum.Local.getLabel(), 1); @@ -153,7 +150,7 @@ abstract public class GeneralTermPreference extends CdmPreferencePage implements public String getCheckedValuesFromPreferences(){ String values; - if (localPref && isOverride){ + if (!isAdminPreference && isOverride){ values = PreferencesUtil.getStringValue(predicate.getKey(), true); }else{ values = pref != null ?pref.getValue(): null; diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NomenclaturalStatusTypePreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NomenclaturalStatusTypePreferences.java index a0bd17339..d6d4d9305 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NomenclaturalStatusTypePreferences.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NomenclaturalStatusTypePreferences.java @@ -27,7 +27,6 @@ public class NomenclaturalStatusTypePreferences extends */ public NomenclaturalStatusTypePreferences() { super(); - setLocalPref(true); setPredicate(PreferencePredicate.AvailableNomenclaturalStatus); type = TermType.NomenclaturalStatusType; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/RankPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/RankPreference.java index fb7d52808..996cfbfb0 100755 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/RankPreference.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/RankPreference.java @@ -30,7 +30,7 @@ public class RankPreference extends GeneralTermPreference { public RankPreference(){ super(); - setLocalPref(true); + isAdminPreference = false; setPredicate(PreferencePredicate.AvailableRanks); type = TermType.Rank; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CdmPreferencePage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CdmPreferencePage.java index 694065062..89c58715a 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CdmPreferencePage.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CdmPreferencePage.java @@ -35,7 +35,7 @@ public abstract class CdmPreferencePage extends PreferencePage implements IE4Pre private boolean isDefaultButtonActivated = true; - protected boolean isAdminPreference; + protected boolean isAdminPreference = false; private boolean isApply; diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CommonNameLanguagePreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CommonNameLanguagePreferences.java index 7321816ad..f0e8ad599 100755 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CommonNameLanguagePreferences.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CommonNameLanguagePreferences.java @@ -30,7 +30,7 @@ public class CommonNameLanguagePreferences extends GeneralTermPreference { */ public CommonNameLanguagePreferences() { super(); - setLocalPref(true); + isAdminPreference = false; setPredicate(PreferencePredicate.CommonNameLanguages); type = TermType.Language; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/FeatureMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/FeatureMenuPreferences.java index 5954c21d9..0f8d02b9b 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/FeatureMenuPreferences.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/FeatureMenuPreferences.java @@ -38,7 +38,7 @@ public class FeatureMenuPreferences extends GeneralTermPreference{ */ public FeatureMenuPreferences() { super(); - setLocalPref(true); + isAdminPreference = false; setPredicate(PreferencePredicate.TaxonFeatures); type = TermType.Feature; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/LanguageMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/LanguageMenuPreferences.java index 5d9781224..32a5364a0 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/LanguageMenuPreferences.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/LanguageMenuPreferences.java @@ -30,7 +30,6 @@ public class LanguageMenuPreferences extends GeneralTermPreference { */ public LanguageMenuPreferences() { super(); - setLocalPref(true); setPredicate(PreferencePredicate.AvailableLanguages); type = TermType.Language; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/MarkerTypeMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/MarkerTypeMenuPreferences.java index 35964c069..42a38259b 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/MarkerTypeMenuPreferences.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/MarkerTypeMenuPreferences.java @@ -27,8 +27,7 @@ public class MarkerTypeMenuPreferences extends GeneralTermPreference{ */ public MarkerTypeMenuPreferences() { super(); - setLocalPref(true); - setPredicate(PreferencePredicate.MarkerTypes); + setPredicate(PreferencePredicate.MarkerTypes); type = TermType.MarkerType; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/MeasurementUnitMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/MeasurementUnitMenuPreferences.java index f9e3f8642..09009b61b 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/MeasurementUnitMenuPreferences.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/MeasurementUnitMenuPreferences.java @@ -20,7 +20,6 @@ public class MeasurementUnitMenuPreferences extends GeneralTermPreference { */ public MeasurementUnitMenuPreferences() { super(); - setLocalPref(true); setPredicate(PreferencePredicate.MeasurementUnit); type = TermType.MeasurementUnit; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NameFeatureMenuPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NameFeatureMenuPreference.java index 71edfc525..892df4be7 100755 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NameFeatureMenuPreference.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NameFeatureMenuPreference.java @@ -34,7 +34,6 @@ public class NameFeatureMenuPreference extends GeneralTermPreference { */ public NameFeatureMenuPreference() { super(); - setLocalPref(true); setPredicate(PreferencePredicate.NameFeatures); type = TermType.Feature; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NameRelationshipTypeMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NameRelationshipTypeMenuPreferences.java index 022b14865..c84fb65b8 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NameRelationshipTypeMenuPreferences.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NameRelationshipTypeMenuPreferences.java @@ -29,7 +29,6 @@ public class NameRelationshipTypeMenuPreferences extends */ public NameRelationshipTypeMenuPreferences() { super(); - setLocalPref(true); setPredicate(PreferencePredicate.NameRelationshipType); type = TermType.NameRelationshipType; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NameTypeDesignationStatusMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NameTypeDesignationStatusMenuPreferences.java index a39468b87..ff5b03bab 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NameTypeDesignationStatusMenuPreferences.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NameTypeDesignationStatusMenuPreferences.java @@ -37,7 +37,6 @@ public class NameTypeDesignationStatusMenuPreferences extends */ public NameTypeDesignationStatusMenuPreferences() { super(); - setLocalPref(true); setPredicate(PreferencePredicate.NameTypeDesignationStatus); type = TermType.NameTypeDesignationStatus; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NamedAreaTypeMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NamedAreaTypeMenuPreferences.java index 73e5625dd..5659b7f3b 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NamedAreaTypeMenuPreferences.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NamedAreaTypeMenuPreferences.java @@ -26,7 +26,6 @@ public class NamedAreaTypeMenuPreferences extends GeneralTermPreference{ *

Constructor for NamedAreaTypeMenuPreferences.

*/ public NamedAreaTypeMenuPreferences() { - setLocalPref(true); setPredicate(PreferencePredicate.NamedAreaTypes); type = TermType.NamedAreaType; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/SpecimenTypeDesignationStatusMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/SpecimenTypeDesignationStatusMenuPreferences.java index d8944a8ca..c37ad2498 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/SpecimenTypeDesignationStatusMenuPreferences.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/SpecimenTypeDesignationStatusMenuPreferences.java @@ -37,7 +37,6 @@ public class SpecimenTypeDesignationStatusMenuPreferences extends */ public SpecimenTypeDesignationStatusMenuPreferences() { super(); - setLocalPref(true); setPredicate(PreferencePredicate.SpecimenTypeDesignationStatus); type = TermType.SpecimenTypeDesignationStatus; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/StageMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/StageMenuPreferences.java index 813b42eb2..25214152a 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/StageMenuPreferences.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/StageMenuPreferences.java @@ -28,7 +28,6 @@ public class StageMenuPreferences extends GeneralTermPreference { */ public StageMenuPreferences() { super(); - setLocalPref(true); setPredicate(PreferencePredicate.Stage); type = TermType.Stage; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/TaxonRelationshipTypeMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/TaxonRelationshipTypeMenuPreferences.java index 0bd2c73ce..b108d698f 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/TaxonRelationshipTypeMenuPreferences.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/TaxonRelationshipTypeMenuPreferences.java @@ -28,7 +28,6 @@ public class TaxonRelationshipTypeMenuPreferences extends */ public TaxonRelationshipTypeMenuPreferences() { super(); - setLocalPref(true); setPredicate(PreferencePredicate.ConceptRelationshipType); type = TermType.TaxonRelationshipType; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionPerAreaStatusWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionPerAreaStatusWizard.java index 42809e421..e60bdd173 100755 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionPerAreaStatusWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionPerAreaStatusWizard.java @@ -20,8 +20,6 @@ import eu.etaxonomy.cdm.model.location.NamedArea; import eu.etaxonomy.cdm.model.metadata.CdmPreference; import eu.etaxonomy.cdm.model.metadata.PreferencePredicate; import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap; -import eu.etaxonomy.taxeditor.event.EventUtility; -import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants; import eu.etaxonomy.taxeditor.l10n.Messages; import eu.etaxonomy.taxeditor.preference.CdmPreferenceCache; import eu.etaxonomy.taxeditor.preference.PreferencesUtil; @@ -107,7 +105,7 @@ public class AvailableDistributionPerAreaStatusWizard extends Wizard implements // PreferencesUtil.setBooleanValue(PreferencesUtil.createOverridePreferenceString(PreferencePredicate.AvailableDistributionStatus.getKey()), aPage.override); PreferencesUtil.firePreferencesChanged(this.getClass()); - EventUtility.postEvent(WorkbenchEventConstants.REFRESH_DISTRIBUTION_PREFERENCES, true); + return true; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/GeneralVocabularyPreferencePage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/GeneralVocabularyPreferencePage.java index 05cd9cf2a..ce28e9a8e 100755 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/GeneralVocabularyPreferencePage.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/GeneralVocabularyPreferencePage.java @@ -194,4 +194,22 @@ public class GeneralVocabularyPreferencePage extends GeneralTermPreference imple return true; } + @Override + protected void performDefaults(){ + if (isAdminPreference){ + rememberCheckedValues(""); + treeComposite.setEnabled(true); + }else{ + isOverride = false; + rememberCheckedValues(getCheckedValuesFromPreferences()); + treeComposite.setEnabled(false); + } + pref = null; + useLocalOrAdmin.select(0); + + setApply(true); + super.performDefaults(); + + } + } -- 2.34.1