Project

General

Profile

« Previous | Next » 

Revision f8fa200d

Added by Katja Luther over 4 years ago

ref #8489: code cleaning

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/FeatureAdminMenuPreference.java
23 23
     */
24 24
    public FeatureAdminMenuPreference() {
25 25
        super();
26
        setLocalPref(false);
26
        isAdminPreference = true;
27 27
        setPredicate(PreferencePredicate.TaxonFeatures);
28 28
        type = TermType.Feature;
29 29
    }
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NameFeatureAdminMenuPreference.java
24 24
     */
25 25
    public NameFeatureAdminMenuPreference() {
26 26
        super();
27
        setLocalPref(false);
27
        isAdminPreference = true;
28 28
        setPredicate(PreferencePredicate.NameFeatures);
29 29
        type = TermType.Feature;
30 30
    }
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NomenclaturalStatusTypeAdminPreference.java
30 30

  
31 31
    public NomenclaturalStatusTypeAdminPreference(){
32 32
        super();
33
        setLocalPref(false);
33
        isAdminPreference = true;
34 34
     }
35 35

  
36 36

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/RankAdminPreference.java
34 34

  
35 35
    public RankAdminPreference(){
36 36
        super();
37
        setLocalPref(false);
37
        isAdminPreference = true;
38 38
     }
39 39

  
40 40

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralTermPreference.java
60 60
    protected boolean allowOverride;
61 61
    protected CdmPreference pref;
62 62
    protected IPreferencePredicate predicate;
63
    protected boolean localPref;
63

  
64 64

  
65 65
    public GeneralTermPreference(){
66 66
        super();
......
68 68
    }
69 69

  
70 70
    public boolean isLocalPref() {
71
        return localPref;
71
        return !isAdminPreference;
72 72
    }
73 73

  
74
    public void setLocalPref(boolean localPref) {
75
        this.localPref = localPref;
76
    }
77 74

  
78 75
    protected TermType type;
79 76

  
......
112 109
        container.setLayout(gridLayout);
113 110
        parent.setLayout(new GridLayout());
114 111
        useLocalOrAdmin = new Combo(parent, SWT.BORDER | SWT.READ_ONLY);
115
        if (localPref){
112
        if (!isAdminPreference){
116 113
            useLocalOrAdmin.add(LocalOrDefaultEnum.Default.getLabel(), 0);
117 114
            useLocalOrAdmin.add(LocalOrDefaultEnum.Local.getLabel(), 1);
118 115

  
......
153 150

  
154 151
    public String getCheckedValuesFromPreferences(){
155 152
        String values;
156
        if (localPref && isOverride){
153
        if (!isAdminPreference && isOverride){
157 154
            values = PreferencesUtil.getStringValue(predicate.getKey(), true);
158 155
        }else{
159 156
            values = pref != null ?pref.getValue(): null;
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NomenclaturalStatusTypePreferences.java
27 27
	 */
28 28
	public NomenclaturalStatusTypePreferences() {
29 29
		super();
30
		setLocalPref(true);
31 30
		setPredicate(PreferencePredicate.AvailableNomenclaturalStatus);
32 31
		type = TermType.NomenclaturalStatusType;
33 32
	}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/RankPreference.java
30 30

  
31 31
    public RankPreference(){
32 32
        super();
33
        setLocalPref(true);
33
        isAdminPreference = false;
34 34
        setPredicate(PreferencePredicate.AvailableRanks);
35 35
        type = TermType.Rank;
36 36
    }
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CdmPreferencePage.java
35 35

  
36 36
    private boolean isDefaultButtonActivated = true;
37 37

  
38
    protected boolean isAdminPreference;
38
    protected boolean isAdminPreference = false;
39 39

  
40 40
    private boolean isApply;
41 41

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CommonNameLanguagePreferences.java
30 30
	 */
31 31
	public CommonNameLanguagePreferences() {
32 32
	    super();
33
        setLocalPref(true);
33
        isAdminPreference = false;
34 34
        setPredicate(PreferencePredicate.CommonNameLanguages);
35 35
        type = TermType.Language;
36 36
	}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/FeatureMenuPreferences.java
38 38
     */
39 39
    public FeatureMenuPreferences() {
40 40
        super();
41
        setLocalPref(true);
41
        isAdminPreference = false;
42 42
        setPredicate(PreferencePredicate.TaxonFeatures);
43 43
        type = TermType.Feature;
44 44
    }
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/LanguageMenuPreferences.java
30 30
	 */
31 31
	public LanguageMenuPreferences() {
32 32
	    super();
33
        setLocalPref(true);
34 33
        setPredicate(PreferencePredicate.AvailableLanguages);
35 34
        type = TermType.Language;
36 35
	}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/MarkerTypeMenuPreferences.java
27 27
	 */
28 28
	public MarkerTypeMenuPreferences() {
29 29
	    super();
30
        setLocalPref(true);
31
        setPredicate(PreferencePredicate.MarkerTypes);
30
	    setPredicate(PreferencePredicate.MarkerTypes);
32 31
        type = TermType.MarkerType;
33 32
	}
34 33

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/MeasurementUnitMenuPreferences.java
20 20
	 */
21 21
	public MeasurementUnitMenuPreferences() {
22 22
	    super();
23
        setLocalPref(true);
24 23
        setPredicate(PreferencePredicate.MeasurementUnit);
25 24
        type = TermType.MeasurementUnit;
26 25
	}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NameFeatureMenuPreference.java
34 34
     */
35 35
    public NameFeatureMenuPreference() {
36 36
        super();
37
        setLocalPref(true);
38 37
        setPredicate(PreferencePredicate.NameFeatures);
39 38
        type = TermType.Feature;
40 39
    }
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NameRelationshipTypeMenuPreferences.java
29 29
	 */
30 30
	public NameRelationshipTypeMenuPreferences() {
31 31
	    super();
32
        setLocalPref(true);
33 32
        setPredicate(PreferencePredicate.NameRelationshipType);
34 33
        type = TermType.NameRelationshipType;
35 34
	}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NameTypeDesignationStatusMenuPreferences.java
37 37
     */
38 38
    public NameTypeDesignationStatusMenuPreferences() {
39 39
        super();
40
        setLocalPref(true);
41 40
        setPredicate(PreferencePredicate.NameTypeDesignationStatus);
42 41
        type = TermType.NameTypeDesignationStatus;
43 42
    }
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NamedAreaTypeMenuPreferences.java
26 26
	 * <p>Constructor for NamedAreaTypeMenuPreferences.</p>
27 27
	 */
28 28
	public NamedAreaTypeMenuPreferences() {
29
	        setLocalPref(true);
30 29
	        setPredicate(PreferencePredicate.NamedAreaTypes);
31 30
	        type = TermType.NamedAreaType;
32 31
	    }
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/SpecimenTypeDesignationStatusMenuPreferences.java
37 37
    */
38 38
   public SpecimenTypeDesignationStatusMenuPreferences() {
39 39
       super();
40
       setLocalPref(true);
41 40
       setPredicate(PreferencePredicate.SpecimenTypeDesignationStatus);
42 41
       type = TermType.SpecimenTypeDesignationStatus;
43 42
   }
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/StageMenuPreferences.java
28 28
	 */
29 29
	public StageMenuPreferences() {
30 30
	    super();
31
        setLocalPref(true);
32 31
        setPredicate(PreferencePredicate.Stage);
33 32
        type = TermType.Stage;
34 33
	}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/TaxonRelationshipTypeMenuPreferences.java
28 28
	 */
29 29
	public TaxonRelationshipTypeMenuPreferences() {
30 30
	    super();
31
        setLocalPref(true);
32 31
        setPredicate(PreferencePredicate.ConceptRelationshipType);
33 32
        type = TermType.TaxonRelationshipType;
34 33
	}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionPerAreaStatusWizard.java
20 20
import eu.etaxonomy.cdm.model.metadata.CdmPreference;
21 21
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
22 22
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
23
import eu.etaxonomy.taxeditor.event.EventUtility;
24
import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;
25 23
import eu.etaxonomy.taxeditor.l10n.Messages;
26 24
import eu.etaxonomy.taxeditor.preference.CdmPreferenceCache;
27 25
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
......
107 105

  
108 106
       // PreferencesUtil.setBooleanValue(PreferencesUtil.createOverridePreferenceString(PreferencePredicate.AvailableDistributionStatus.getKey()), aPage.override);
109 107
        PreferencesUtil.firePreferencesChanged(this.getClass());
110
        EventUtility.postEvent(WorkbenchEventConstants.REFRESH_DISTRIBUTION_PREFERENCES, true);
108

  
111 109
        return true;
112 110
    }
113 111

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/GeneralVocabularyPreferencePage.java
194 194
        return true;
195 195
    }
196 196

  
197
    @Override
198
    protected void performDefaults(){
199
        if (isAdminPreference){
200
            rememberCheckedValues("");
201
            treeComposite.setEnabled(true);
202
        }else{
203
            isOverride = false;
204
            rememberCheckedValues(getCheckedValuesFromPreferences());
205
            treeComposite.setEnabled(false);
206
        }
207
       pref = null;
208
       useLocalOrAdmin.select(0);
209

  
210
       setApply(true);
211
       super.performDefaults();
212

  
213
    }
214

  
197 215
}

Also available in: Unified diff