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 cc0cff5c425..3a6cc599b39 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 @@ -25,8 +25,8 @@ 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.ide.ResourceSelectionUtil; import org.eclipse.ui.navigator.ICommonMenuConstants; -import org.eclipse.ui.views.navigator.ResourceSelectionUtil; import org.eclipse.cdt.internal.ui.cview.CopyAction; import org.eclipse.cdt.internal.ui.cview.PasteAction; @@ -37,8 +37,6 @@ import org.eclipse.cdt.internal.ui.cview.PasteAction; * A clone of org.eclipse.ui.internal.navigator.resources.actions.EditActionGroup. */ public class CNavigatorEditActionGroup extends ActionGroup { - - private Clipboard clipboard; private CopyAction copyAction; @@ -92,7 +90,6 @@ public class CNavigatorEditActionGroup extends ActionGroup { @Override public void fillActionBars(IActionBars actionBars) { - if (textActionHandler == null) { textActionHandler = new TextActionHandler(actionBars); // hook handlers } @@ -147,5 +144,4 @@ public class CNavigatorEditActionGroup extends ActionGroup { pasteAction.selectionChanged(selection); deleteAction.selectionChanged(selection); } - } 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 6c3d2e0c10b..0ff5ca515db 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 @@ -22,8 +22,8 @@ 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.ide.ResourceSelectionUtil; import org.eclipse.ui.navigator.ICommonMenuConstants; -import org.eclipse.ui.views.navigator.ResourceSelectionUtil; /** * This is the action group for refactor actions move and rename. @@ -90,5 +90,4 @@ public class CNavigatorRefactorActionGroup extends ActionGroup { moveAction.selectionChanged(selection); renameAction.selectionChanged(selection); } - }