mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 18:26:01 +02:00
Code Issues Wiki Activity

Bug 345793 - Codan checkers run even when disabled.

Browse source
This commit is contained in:
Sergey Prigogin 2011-05-13 22:31:04 +00:00
parent 4bd2d6a68d
commit 67e7fae707
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CheckersRegistry.java
View file

@ -381,7 +381,7 @@ public class CheckersRegistry implements Iterable<IChecker>, ICheckersRegistry {
// load default values // load default values
CodanPreferencesLoader loader = new CodanPreferencesLoader(prof); CodanPreferencesLoader loader = new CodanPreferencesLoader(prof);
Preferences projectNode = CodanPreferencesLoader.getProjectNode((IProject) element); 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) { if (!useWorkspace) {
loader.load(projectNode); loader.load(projectNode);
} }

9
codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/FieldEditorOverlayPage.java
View file

@ -220,8 +220,9 @@ public abstract class FieldEditorOverlayPage extends FieldEditorPreferencePage i
}); });
// Set workspace/project radio buttons // Set workspace/project radio buttons
try { try {
Boolean useWorkspace = getPreferenceStore().getBoolean(PreferenceConstants.P_USE_PARENT); IPreferenceStore preferences = getPreferenceStore();
if (useWorkspace) { if (!preferences.contains(PreferenceConstants.P_USE_PARENT) ||
preferences.getBoolean(PreferenceConstants.P_USE_PARENT)) {
useWorkspaceSettingsButton.setSelection(true); useWorkspaceSettingsButton.setSelection(true);
} else { } else {
useProjectSettingsButton.setSelection(true); useProjectSettingsButton.setSelection(true);
@ -303,8 +304,8 @@ public abstract class FieldEditorOverlayPage extends FieldEditorPreferencePage i
public boolean performOk() { public boolean performOk() {
boolean result = super.performOk(); boolean result = super.performOk();
if (result && isPropertyPage()) { if (result && isPropertyPage()) {
// Save state of radiobuttons in project properties // Save state of radio buttons in project properties
getPreferenceStore().setValue(PreferenceConstants.P_USE_PARENT, !useProjectSettingsButton.getSelection()); getPreferenceStore().setValue(PreferenceConstants.P_USE_PARENT, useWorkspaceSettingsButton.getSelection());
} }
return result; return result;
} }

2
codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/PreferenceInitializer.java
View file

@ -25,9 +25,11 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
* @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer# * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#
* initializeDefaultPreferences() * initializeDefaultPreferences()
*/ */
@Override
public void initializeDefaultPreferences() { public void initializeDefaultPreferences() {
IPreferenceStore store = CodanUIActivator.getDefault().getPreferenceStore(); IPreferenceStore store = CodanUIActivator.getDefault().getPreferenceStore();
store.setDefault(PreferenceConstants.P_RUN_ON_BUILD, false); store.setDefault(PreferenceConstants.P_RUN_ON_BUILD, false);
store.setDefault(PreferenceConstants.P_RUN_IN_EDITOR, true); store.setDefault(PreferenceConstants.P_RUN_IN_EDITOR, true);
store.setDefault(PreferenceConstants.P_USE_PARENT, true);
} }
} }