Update codan plugins to CDT 7.0.HEADmaster

* org.eclipse.cdt.codan.checkers.ui: Updated.
* org.eclipse.cdt.codan.checkers: Updated.
* org.eclipse.cdt.codan.core: Updated.
* org.eclipse.cdt.codan.ui: Updated.
* org.eclipse.cdt.codan.core.cxx: Added.
* org.eclipse.cdt.codan.extension/META-INF/MANIFEST.MF: Import org.eclipse.cdt.codan.core.cxx.model.
* org.eclipse.cdt.codan.extension/src/org/eclipse/cdt/codan/extension/checkers/AbstractPropSimChecker.java: Superclass moved.

1 files changed, 27 insertions, 18 deletions

diff --git a/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/BuildPropertyPage.java b/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/BuildPropertyPage.java
index 95f7ff6..4155cce 100644
--- a/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/BuildPropertyPage.java
+++ b/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/BuildPropertyPage.java
@@ -1,17 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Alena Laskavaia and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Alena Laskavaia - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.cdt.codan.internal.ui.preferences;
 
-import org.eclipse.cdt.codan.core.CodanCorePlugin;
 import org.eclipse.cdt.codan.core.PreferenceConstants;
-import org.eclipse.cdt.codan.ui.actions.ToggleNatureAction;
+import org.eclipse.cdt.codan.internal.ui.CodanUIActivator;
+import org.eclipse.cdt.codan.internal.ui.CodanUIMessages;
+import org.eclipse.cdt.codan.internal.ui.actions.ToggleNatureAction;
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ProjectScope;
 import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.preferences.IScopeContext;
-import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.eclipse.jface.preference.BooleanFieldEditor;
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.ui.IWorkbenchPropertyPage;
-import org.eclipse.ui.preferences.ScopedPreferenceStore;
 
 public class BuildPropertyPage extends FieldEditorPreferencePage implements
 		IWorkbenchPropertyPage {
@@ -21,8 +29,7 @@ public class BuildPropertyPage extends FieldEditorPreferencePage implements
 	 * 
 	 */
 	public BuildPropertyPage() {
-		setPreferenceStore(org.eclipse.cdt.codan.ui.Activator.getDefault()
-				.getPreferenceStore());
+		setPreferenceStore(CodanUIActivator.getDefault().getPreferenceStore());
 	}
 
 	/*
@@ -35,7 +42,9 @@ public class BuildPropertyPage extends FieldEditorPreferencePage implements
 	@Override
 	protected void createFieldEditors() {
 		addField(new BooleanFieldEditor(PreferenceConstants.P_RUN_ON_BUILD,
-				"&Run with Build", getFieldEditorParent()));
+				CodanUIMessages.BuildPropertyPage_RunWithBuild, getFieldEditorParent()));
+		addField(new BooleanFieldEditor(PreferenceConstants.P_RUN_IN_EDITOR,
+				CodanUIMessages.BuildPropertyPage_RunAsYouType, getFieldEditorParent()));
 	}
 
 	@Override
@@ -70,7 +79,9 @@ public class BuildPropertyPage extends FieldEditorPreferencePage implements
 	 * @see org.eclipse.ui.IWorkbenchPropertyPage#getElement()
 	 */
 	public IAdaptable getElement() {
-		return element;
+		if (element.getAdapter(IProject.class) != null)
+			return (IProject) element.getAdapter(IProject.class);
+		return null;
 	}
 
 	/*
@@ -82,16 +93,14 @@ public class BuildPropertyPage extends FieldEditorPreferencePage implements
 	 */
 	public void setElement(IAdaptable element) {
 		this.element = element;
-		ProjectScope ps = new ProjectScope((IProject) getElement());
-		ScopedPreferenceStore scoped = new ScopedPreferenceStore(ps,
-				CodanCorePlugin.PLUGIN_ID);
-		scoped
-				.setSearchContexts(new IScopeContext[] { ps,
-						new InstanceScope() });
-		setPreferenceStore(scoped);
+		if (getElement() != null) {
+			IPreferenceStore scoped = CodanUIActivator.getDefault()
+					.getPreferenceStore(((IProject) getElement()));
+			setPreferenceStore(scoped);
+		}
 	}
 
 	protected String getPageId() {
-		return "org.eclipse.cdt.codan.internal.ui.preferences.CodanPreferencePage";
+		return "org.eclipse.cdt.codan.internal.ui.preferences.CodanPreferencePage"; //$NON-NLS-1$
 	}
 }