mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 14:12:10 +02:00
Code Issues Wiki Activity

Bug 541270: Fix Restore Defaults for Console Prefs

Browse source 
Bug 414525 was trying to workaround Bug 270326/320723 but did not
handle the case that no plugin_customization.ini was provided.
This fix make Restore Defaults for Preferences ->  C/C++ ->
Build -> Console work again.

Change-Id: Idbacc2a0baece6c3f594cfac4a2eeece886bac80
This commit is contained in:
Jonah Graham 2018-11-17 19:49:13 +00:00
parent 39b6373f66
commit a7425a05b4
3 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildConsolePreferencePage.java
View file

@ -247,38 +247,38 @@ public class BuildConsolePreferencePage extends FieldEditorPreferencePage implem
public void init(IWorkbench workbench) {
}
public static void initDefaults(IPreferenceStore prefs) {
if(!prefs.contains(PREF_CLEAR_CONSOLE))
public static void initDefaults(IPreferenceStore prefs, boolean unconditionally) {
if(unconditionally || !prefs.contains(PREF_CLEAR_CONSOLE))
prefs.setDefault(PREF_CLEAR_CONSOLE, true);
if(!prefs.contains(PREF_AUTO_OPEN_CONSOLE))
if(unconditionally || !prefs.contains(PREF_AUTO_OPEN_CONSOLE))
prefs.setDefault(PREF_AUTO_OPEN_CONSOLE, true);
if(!prefs.contains(PREF_CONSOLE_ON_TOP))
if(unconditionally || !prefs.contains(PREF_CONSOLE_ON_TOP))
prefs.setDefault(PREF_CONSOLE_ON_TOP, true);
if(!prefs.contains(PREF_BUILDCONSOLE_WRAP_LINES))
if(unconditionally || !prefs.contains(PREF_BUILDCONSOLE_WRAP_LINES))
prefs.setDefault(PREF_BUILDCONSOLE_WRAP_LINES, false);
if(!prefs.contains(PREF_BUILDCONSOLE_LINES))
if(unconditionally || !prefs.contains(PREF_BUILDCONSOLE_LINES))
prefs.setDefault(PREF_BUILDCONSOLE_LINES, 500);
if(!prefs.contains(PREF_BUILDCONSOLE_WRAP_LINES_MAX))
if(unconditionally || !prefs.contains(PREF_BUILDCONSOLE_WRAP_LINES_MAX))
prefs.setDefault(PREF_BUILDCONSOLE_WRAP_LINES_MAX, 5000);
if(!prefs.contains(PREF_BUILDCONSOLE_UPDATE_DELAY_MS))
if(unconditionally || !prefs.contains(PREF_BUILDCONSOLE_UPDATE_DELAY_MS))
prefs.setDefault(PREF_BUILDCONSOLE_UPDATE_DELAY_MS, DEFAULT_BUILDCONSOLE_UPDATE_DELAY_MS);
if(!prefs.contains(PREF_BUILDCONSOLE_TAB_WIDTH))
if(unconditionally || !prefs.contains(PREF_BUILDCONSOLE_TAB_WIDTH))
prefs.setDefault(PREF_BUILDCONSOLE_TAB_WIDTH, 4);
if(!prefs.contains(PREF_BUILDCONSOLE_OUTPUT_COLOR))
if(unconditionally || !prefs.contains(PREF_BUILDCONSOLE_OUTPUT_COLOR))
PreferenceConverter.setDefault(prefs, PREF_BUILDCONSOLE_OUTPUT_COLOR, new RGB(0, 0, 0));
if(!prefs.contains(PREF_BUILDCONSOLE_INFO_COLOR))
if(unconditionally || !prefs.contains(PREF_BUILDCONSOLE_INFO_COLOR))
PreferenceConverter.setDefault(prefs, PREF_BUILDCONSOLE_INFO_COLOR, new RGB(0, 0, 255));
if(!prefs.contains(PREF_BUILDCONSOLE_ERROR_COLOR))
if(unconditionally || !prefs.contains(PREF_BUILDCONSOLE_ERROR_COLOR))
PreferenceConverter.setDefault(prefs, PREF_BUILDCONSOLE_ERROR_COLOR, new RGB(255, 0, 0));
if(!prefs.contains(PREF_BUILDCONSOLE_BACKGROUND_COLOR))
if(unconditionally || !prefs.contains(PREF_BUILDCONSOLE_BACKGROUND_COLOR))
PreferenceConverter.setDefault(prefs, PREF_BUILDCONSOLE_BACKGROUND_COLOR, new RGB(255, 255, 255));
if(!prefs.contains(PREF_BUILDCONSOLE_PROBLEM_BACKGROUND_COLOR))
if(unconditionally || !prefs.contains(PREF_BUILDCONSOLE_PROBLEM_BACKGROUND_COLOR))
PreferenceConverter.setDefault(prefs, PREF_BUILDCONSOLE_PROBLEM_BACKGROUND_COLOR, new RGB(254, 231, 224));
if(!prefs.contains(PREF_BUILDCONSOLE_PROBLEM_WARNING_BACKGROUND_COLOR))
if(unconditionally || !prefs.contains(PREF_BUILDCONSOLE_PROBLEM_WARNING_BACKGROUND_COLOR))
PreferenceConverter.setDefault(prefs, PREF_BUILDCONSOLE_PROBLEM_WARNING_BACKGROUND_COLOR, new RGB(254, 243, 218));
if(!prefs.contains(PREF_BUILDCONSOLE_PROBLEM_INFO_BACKGROUND_COLOR))
if(unconditionally || !prefs.contains(PREF_BUILDCONSOLE_PROBLEM_INFO_BACKGROUND_COLOR))
PreferenceConverter.setDefault(prefs, PREF_BUILDCONSOLE_PROBLEM_INFO_BACKGROUND_COLOR, new RGB(244, 247, 254));
if(!prefs.contains(PREF_BUILDCONSOLE_PROBLEM_HIGHLIGHTED_COLOR))
if(unconditionally || !prefs.contains(PREF_BUILDCONSOLE_PROBLEM_HIGHLIGHTED_COLOR))
PreferenceConverter.setDefault(prefs, PREF_BUILDCONSOLE_PROBLEM_HIGHLIGHTED_COLOR, new RGB(255, 0, 0));
}

5
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java
View file

@ -602,7 +602,10 @@ public class CUIPlugin extends AbstractUIPlugin {
@Override
public IStatus runInUIThread(IProgressMonitor monitor) {
// A workaround for black console bug 320723.
BuildConsolePreferencePage.initDefaults(getPreferenceStore());
// As we are running initDefaults after preferences have already been
// initialized, we don't want to do it unconditionally as that
// would override the defaults set in plugin_customization.ini files
BuildConsolePreferencePage.initDefaults(getPreferenceStore(), false);
// Initialize ContentAssistMatcherPreference.
ContentAssistPreference.getInstance();
return Status.OK_STATUS;

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPreferenceInitializer.java
View file

@ -45,7 +45,7 @@ public class CUIPreferenceInitializer extends AbstractPreferenceInitializer {
PreferenceConstants.initializeDefaultValues(store);
CPluginPreferencePage.initDefaults(store);
BuildConsolePreferencePage.initDefaults(store);
BuildConsolePreferencePage.initDefaults(store, true);
CView.initDefaults(store);
CEditorPreferencePage.initDefaults(store);
CodeAssistPreferencePage.initDefaults(store);