Attachment 196723 Details for Bug 333494 – Fix

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fix

fix_333494.txt (text/plain), 4.52 KB, created by Sergey Prigogin

on 2011-05-26 23:32:20 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sergey Prigogin

Created: 2011-05-26 23:32:20 EDT

Size: 4.52 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.codan.ui
>Index: src/org/eclipse/cdt/codan/internal/ui/CodanUIActivator.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/CodanUIActivator.java,v
>retrieving revision 1.5
>diff -u -r1.5 CodanUIActivator.java
>--- src/org/eclipse/cdt/codan/internal/ui/CodanUIActivator.java	24 Feb 2011 00:49:56 -0000	1.5
>+++ src/org/eclipse/cdt/codan/internal/ui/CodanUIActivator.java	27 May 2011 03:31:47 -0000
>@@ -31,7 +31,7 @@
> 	public static final String PLUGIN_ID = "org.eclipse.cdt.codan.ui"; //$NON-NLS-1$
> 	// The shared instance
> 	private static CodanUIActivator plugin;
>-	private IPreferenceStore preferenceCoreStore;
>+	private IPreferenceStore corePreferenceStore;
> 
> 	/**
> 	 * The constructor
>@@ -39,25 +39,13 @@
> 	public CodanUIActivator() {
> 	}
> 
>-	/*
>-	 * (non-Javadoc)
>-	 * 
>-	 * @see
>-	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext
>-	 * )
>-	 */
>+	@Override
> 	public void start(BundleContext context) throws Exception {
> 		super.start(context);
> 		plugin = this;
> 	}
> 
>-	/*
>-	 * (non-Javadoc)
>-	 * 
>-	 * @see
>-	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext
>-	 * )
>-	 */
>+	@Override
> 	public void stop(BundleContext context) throws Exception {
> 		plugin = null;
> 		super.stop(context);
>@@ -118,16 +106,16 @@
> 	 * @return
> 	 */
> 	public IPreferenceStore getCorePreferenceStore() {
>-		if (preferenceCoreStore == null) {
>-			preferenceCoreStore = new ScopedPreferenceStore(new InstanceScope(), CodanCorePlugin.PLUGIN_ID);
>+		if (corePreferenceStore == null) {
>+			corePreferenceStore = new ScopedPreferenceStore(InstanceScope.INSTANCE, CodanCorePlugin.PLUGIN_ID);
> 		}
>-		return preferenceCoreStore;
>+		return corePreferenceStore;
> 	}
> 
> 	public IPreferenceStore getPreferenceStore(IProject project) {
> 		ProjectScope ps = new ProjectScope(project);
>-		ScopedPreferenceStore scoped = new ScopedPreferenceStore(ps, PLUGIN_ID);
>-		scoped.setSearchContexts(new IScopeContext[] { ps, new InstanceScope() });
>+		ScopedPreferenceStore scoped = new ScopedPreferenceStore(ps, CodanCorePlugin.PLUGIN_ID);
>+		scoped.setSearchContexts(new IScopeContext[] { ps, InstanceScope.INSTANCE });
> 		return scoped;
> 	}
> }
>Index: src/org/eclipse/cdt/codan/internal/ui/preferences/BuildPropertyPage.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/BuildPropertyPage.java,v
>retrieving revision 1.13
>diff -u -r1.13 BuildPropertyPage.java
>--- src/org/eclipse/cdt/codan/internal/ui/preferences/BuildPropertyPage.java	27 Feb 2011 01:58:43 -0000	1.13
>+++ src/org/eclipse/cdt/codan/internal/ui/preferences/BuildPropertyPage.java	27 May 2011 03:31:47 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2010 Alena Laskavaia and others.
>+ * Copyright (c) 2011 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
>@@ -7,6 +7,7 @@
>  *
>  * Contributors:
>  *     Alena Laskavaia - initial API and implementation
>+ *     Sergey Prigogin (Google)
>  *******************************************************************************/
> package org.eclipse.cdt.codan.internal.ui.preferences;
> 
>@@ -25,20 +26,10 @@
> public class BuildPropertyPage extends FieldEditorPreferencePage implements IWorkbenchPropertyPage {
> 	private IAdaptable element;
> 
>-	/**
>-	 * 
>-	 */
> 	public BuildPropertyPage() {
>-		setPreferenceStore(CodanUIActivator.getDefault().getPreferenceStore());
>+		setPreferenceStore(CodanUIActivator.getDefault().getCorePreferenceStore());
> 	}
> 
>-	/*
>-	 * (non-Javadoc)
>-	 * 
>-	 * @see
>-	 * org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors
>-	 * ()
>-	 */
> 	@Override
> 	protected void createFieldEditors() {
> 		addField(new LabelFieldEditor("Set launch method for checkers, you can override this by editing individual problem settings",
>@@ -87,9 +78,7 @@
> 	/*
> 	 * (non-Javadoc)
> 	 * 
>-	 * @see
>-	 * org.eclipse.ui.IWorkbenchPropertyPage#setElement(org.eclipse.core.runtime
>-	 * .IAdaptable)
>+	 * @see org.eclipse.ui.IWorkbenchPropertyPage#setElement(org.eclipse.core.runtime.IAdaptable)
> 	 */
> 	public void setElement(IAdaptable element) {
> 		this.element = element;
>#P org.eclipse.cdt.codan.ui.cxx

Flags:

eclipse.sprigogin: iplog-

Actions: View | Diff

Attachments on bug 333494: 196723