mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-08 10:16:03 +02:00
Bug 345793 - Codan checkers run even when disabled.
This commit is contained in:
parent
4bd2d6a68d
commit
67e7fae707
3 changed files with 8 additions and 5 deletions
|
@ -381,7 +381,7 @@ public class CheckersRegistry implements Iterable<IChecker>, ICheckersRegistry {
|
|||
// load default values
|
||||
CodanPreferencesLoader loader = new CodanPreferencesLoader(prof);
|
||||
Preferences projectNode = CodanPreferencesLoader.getProjectNode((IProject) element);
|
||||
boolean useWorkspace = projectNode.getBoolean(PreferenceConstants.P_USE_PARENT, false);
|
||||
boolean useWorkspace = projectNode.getBoolean(PreferenceConstants.P_USE_PARENT, true);
|
||||
if (!useWorkspace) {
|
||||
loader.load(projectNode);
|
||||
}
|
||||
|
|
|
@ -220,8 +220,9 @@ public abstract class FieldEditorOverlayPage extends FieldEditorPreferencePage i
|
|||
});
|
||||
// Set workspace/project radio buttons
|
||||
try {
|
||||
Boolean useWorkspace = getPreferenceStore().getBoolean(PreferenceConstants.P_USE_PARENT);
|
||||
if (useWorkspace) {
|
||||
IPreferenceStore preferences = getPreferenceStore();
|
||||
if (!preferences.contains(PreferenceConstants.P_USE_PARENT) ||
|
||||
preferences.getBoolean(PreferenceConstants.P_USE_PARENT)) {
|
||||
useWorkspaceSettingsButton.setSelection(true);
|
||||
} else {
|
||||
useProjectSettingsButton.setSelection(true);
|
||||
|
@ -303,8 +304,8 @@ public abstract class FieldEditorOverlayPage extends FieldEditorPreferencePage i
|
|||
public boolean performOk() {
|
||||
boolean result = super.performOk();
|
||||
if (result && isPropertyPage()) {
|
||||
// Save state of radiobuttons in project properties
|
||||
getPreferenceStore().setValue(PreferenceConstants.P_USE_PARENT, !useProjectSettingsButton.getSelection());
|
||||
// Save state of radio buttons in project properties
|
||||
getPreferenceStore().setValue(PreferenceConstants.P_USE_PARENT, useWorkspaceSettingsButton.getSelection());
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
|
|
@ -25,9 +25,11 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
|
|||
* @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#
|
||||
* initializeDefaultPreferences()
|
||||
*/
|
||||
@Override
|
||||
public void initializeDefaultPreferences() {
|
||||
IPreferenceStore store = CodanUIActivator.getDefault().getPreferenceStore();
|
||||
store.setDefault(PreferenceConstants.P_RUN_ON_BUILD, false);
|
||||
store.setDefault(PreferenceConstants.P_RUN_IN_EDITOR, true);
|
||||
store.setDefault(PreferenceConstants.P_USE_PARENT, true);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue