Project

General

Profile

« Previous | Next » 

Revision 79bd864f

Added by Katja Luther over 4 years ago

ref #8389: revert disabling of allowOverride for default selection

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguageRepresentationPreferencePage.java
94 94
			 */
95 95
			@Override
96 96
			public void widgetSelected(SelectionEvent e) {
97
			    setApply(true);
97

  
98 98
				int selectionIndex = combo_globalLanguage.getSelectionIndex();
99 99
				globalLanguage = CdmStore.getCurrentApplicationConfiguration().getTermService().getLanguageByLabel(combo_globalLanguage.getItem(selectionIndex));
100
				setApply(true);
100 101
			}
101 102
		});
102 103
	}
103 104

  
104 105
	private void createSetMultiLanguageTextEditingCapability(Composite parent) {
105
		isMultilanguageTextEditingCapability = getPreferenceStore().getBoolean(IPreferenceKeys.MULTILANGUAGE_TEXT_EDITING_CAPABILITY);
106
		isMultilanguageTextEditingCapability = PreferencesUtil.getBooleanValue(IPreferenceKeys.MULTILANGUAGE_TEXT_EDITING_CAPABILITY);
106 107

  
107 108
		final Composite composite = createComposite(parent);
108 109

  
......
128 129

  
129 130
	@Override
130 131
	public boolean performOk() {
131
	    if (isApply()){
132
	        PreferencesUtil.setBooleanValue(IPreferenceKeys.MULTILANGUAGE_TEXT_EDITING_CAPABILITY, isMultilanguageTextEditingCapability);
133
	        PreferencesUtil.setGlobalLanguage(globalLanguage);
132
	    if (!isApply()){
133
	        return true;
134 134
	    }
135
	    PreferencesUtil.setBooleanValue(IPreferenceKeys.MULTILANGUAGE_TEXT_EDITING_CAPABILITY, isMultilanguageTextEditingCapability);
136
	    PreferencesUtil.setGlobalLanguage(globalLanguage);
137

  
135 138
		return super.performOk();
136 139
	}
137 140
}

Also available in: Unified diff