From 3fa42529d97c85c8e62370ed5ef06fe8128739d9 Mon Sep 17 00:00:00 2001 From: Anton Leherbauer Date: Tue, 9 Mar 2010 10:21:09 +0000 Subject: [PATCH] Fix deprecation warnings --- .../ui/navigator/CNavigatorEditActionGroup.java | 10 +++++----- .../ui/navigator/CNavigatorRefactorActionGroup.java | 8 ++++---- .../AbstractConfigurationBlockPreferencePage.java | 6 +----- .../ui/preferences/AbstractPreferencePage.java | 4 +--- .../ui/preferences/CTemplatePreferencePage.java | 12 +----------- .../ui/preferences/ScalabilityPreferencePage.java | 4 +--- 6 files changed, 13 insertions(+), 31 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorEditActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorEditActionGroup.java index 922755286a7..cc0cff5c425 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorEditActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorEditActionGroup.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2010 Wind River Systems, Inc. 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 @@ -19,13 +19,13 @@ import org.eclipse.swt.dnd.Clipboard; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IActionBars; import org.eclipse.ui.ISharedImages; +import org.eclipse.ui.IWorkbenchCommandConstants; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.ActionFactory; import org.eclipse.ui.actions.ActionGroup; import org.eclipse.ui.actions.DeleteResourceAction; import org.eclipse.ui.actions.TextActionHandler; import org.eclipse.ui.navigator.ICommonMenuConstants; -import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds; import org.eclipse.ui.views.navigator.ResourceSelectionUtil; import org.eclipse.cdt.internal.ui.cview.CopyAction; @@ -121,21 +121,21 @@ public class CNavigatorEditActionGroup extends ActionGroup { .getImageDescriptor(ISharedImages.IMG_TOOL_PASTE_DISABLED)); pasteAction.setImageDescriptor(images .getImageDescriptor(ISharedImages.IMG_TOOL_PASTE)); - pasteAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.PASTE); + pasteAction.setActionDefinitionId(IWorkbenchCommandConstants.EDIT_PASTE); copyAction = new CopyAction(shell, clipboard, pasteAction); copyAction.setDisabledImageDescriptor(images .getImageDescriptor(ISharedImages.IMG_TOOL_COPY_DISABLED)); copyAction.setImageDescriptor(images .getImageDescriptor(ISharedImages.IMG_TOOL_COPY)); - copyAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.COPY); + copyAction.setActionDefinitionId(IWorkbenchCommandConstants.EDIT_COPY); deleteAction = new DeleteResourceAction(shellProvider); deleteAction.setDisabledImageDescriptor(images .getImageDescriptor(ISharedImages.IMG_TOOL_DELETE_DISABLED)); deleteAction.setImageDescriptor(images .getImageDescriptor(ISharedImages.IMG_TOOL_DELETE)); - deleteAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.DELETE); + deleteAction.setActionDefinitionId(IWorkbenchCommandConstants.EDIT_DELETE); } @Override diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorRefactorActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorRefactorActionGroup.java index 2edae2027d1..6c3d2e0c10b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorRefactorActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorRefactorActionGroup.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2010 IBM Corporation 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 @@ -17,12 +17,12 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.window.IShellProvider; import org.eclipse.swt.widgets.Tree; import org.eclipse.ui.IActionBars; +import org.eclipse.ui.IWorkbenchCommandConstants; import org.eclipse.ui.actions.ActionFactory; import org.eclipse.ui.actions.ActionGroup; import org.eclipse.ui.actions.MoveResourceAction; import org.eclipse.ui.actions.RenameResourceAction; import org.eclipse.ui.navigator.ICommonMenuConstants; -import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds; import org.eclipse.ui.views.navigator.ResourceSelectionUtil; /** @@ -77,10 +77,10 @@ public class CNavigatorRefactorActionGroup extends ActionGroup { protected void makeActions() { moveAction = new MoveResourceAction(shellProvider); - moveAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.MOVE); + moveAction.setActionDefinitionId(IWorkbenchCommandConstants.FILE_MOVE); renameAction = new RenameResourceAction(shellProvider, tree); - renameAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.RENAME); + renameAction.setActionDefinitionId(IWorkbenchCommandConstants.FILE_RENAME); } @Override diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlockPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlockPreferencePage.java index 3d18d3301f1..d72b3de8eb3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlockPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlockPreferencePage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2010 IBM Corporation 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 @@ -22,8 +22,6 @@ import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.ui.CUIPlugin; - /** * Abstract preference page which is used to wrap a * {@link org.eclipse.cdt.internal.ui.preferences.IPreferenceConfigurationBlock}. @@ -98,8 +96,6 @@ public abstract class AbstractConfigurationBlockPreferencePage extends Preferenc fOverlayStore.propagate(); - CUIPlugin.getDefault().savePluginPreferences(); - return true; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractPreferencePage.java index fdbc1c90799..2839fbd9e58 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractPreferencePage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2002, 2008 QNX Software Systems and others. + * Copyright (c) 2002, 2010 QNX Software Systems 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 @@ -41,7 +41,6 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; -import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; @@ -352,7 +351,6 @@ public abstract class AbstractPreferencePage extends PreferencePage implements I @Override public boolean performOk() { fOverlayStore.propagate(); - CUIPlugin.getDefault().savePluginPreferences(); return true; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CTemplatePreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CTemplatePreferencePage.java index 60c3809c963..428d54fd206 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CTemplatePreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CTemplatePreferencePage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2002, 2008 QNX Software Systems and others. + * Copyright (c) 2002, 2010 QNX Software Systems 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 @@ -127,16 +127,6 @@ public class CTemplatePreferencePage extends TemplatePreferencePage { return null; } - /* - * @see org.eclipse.jface.preference.IPreferencePage#performOk() - */ - @Override - public boolean performOk() { - boolean ok= super.performOk(); - CUIPlugin.getDefault().savePluginPreferences(); - return ok; - } - /* * @see org.eclipse.ui.texteditor.templates.TemplatePreferencePage#createViewer(org.eclipse.swt.widgets.Composite) */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ScalabilityPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ScalabilityPreferencePage.java index 65cb9c17f48..fe242e8720a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ScalabilityPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ScalabilityPreferencePage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2010 IBM Corporation 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 @@ -40,7 +40,6 @@ import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.PlatformUI; -import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.cdt.utils.ui.controls.ControlFactory; @@ -279,7 +278,6 @@ public class ScalabilityPreferencePage extends PreferencePage implements prefs.setValue(key, b.getSelection()); } prefs.setValue(PreferenceConstants.SCALABILITY_NUMBER_OF_LINES, fLinesToTrigger.getIntValue()); - CUIPlugin.getDefault().savePluginPreferences(); return super.performOk(); }