Bug 290044 - Add editor context menu identifier to RemoteCEditor

6 files changed, 34 insertions, 168 deletions

diff --git a/rdt/org.eclipse.ptp.rdt.ui/plugin.properties b/rdt/org.eclipse.ptp.rdt.ui/plugin.properties
index 014ca96cd..9c49a799e 100755
--- a/rdt/org.eclipse.ptp.rdt.ui/plugin.properties
+++ b/rdt/org.eclipse.ptp.rdt.ui/plugin.properties
@@ -56,10 +56,15 @@ openCSearchPageAction.label=&Remote C/C++...
 searchMenu.label= Se&arch
 Index.menu=Index
 SearchUnresolvedIncludes.name=Search for Unresolved &Includes
-AddBreakpoint.label=Toggle &Breakpoint
-EnableBreakpoint.label=&Toggle Breakpoint Enabled
-BreakpointProperties.label=Breakpoint P&roperties...
 
 CIndexingService.name = Code Indexing
 BuildService.name = Build
-CDevelopment.name = C/C++ Development
\ No newline at end of file
+CDevelopment.name = C/C++ Development
+
+# Common Editor ruler actions
+AddTask.label=Add &Task...
+AddTask.tooltip=Add Task...
+AddBookmark.label=Add Boo&kmark...
+AddBookmark.tooltip=Add Bookmark...
+QuickFix.label=&Quick Fix
+QuickFix.tooltip=Quick Fix
\ No newline at end of file
diff --git a/rdt/org.eclipse.ptp.rdt.ui/plugin.xml b/rdt/org.eclipse.ptp.rdt.ui/plugin.xml
index 494070604..73cc64707 100755
--- a/rdt/org.eclipse.ptp.rdt.ui/plugin.xml
+++ b/rdt/org.eclipse.ptp.rdt.ui/plugin.xml
@@ -549,43 +549,36 @@
         </objectContribution>
         <viewerContribution
             targetID="#RemoteCEditorRulerContext"
-            id="org.eclipse.ptp.rdt.debug.ui.RemoteCEditorRulerActions">
+            id="org.eclipse.ptp.rdt.ui.RemoteCEditorRulerActions">
          <action
-               class="org.eclipse.ptp.internal.rdt.ui.actions.CBreakpointPropertiesRulerActionDelegate"
-               id="org.eclipse.ptp.rdt.debug.internal.ui.actions.CBreakpointPropertiesRulerActionDelegate"
-               label="%BreakpointProperties.label"
-               menubarPath="debug"
-               overrideActionId="org.eclipse.cdt.debug.internal.ui.actions.CBreakpointPropertiesRulerActionDelegate">
+               label="%AddTask.label"
+               helpContextId="org.eclipse.ui.AddTask_action_context"
+               class="org.eclipse.ui.texteditor.TaskRulerAction"
+               tooltip="%AddTask.tooltip"
+               menubarPath="add"
+               id="org.eclipse.ui.texteditor.TaskRulerAction">
          </action>
          <action
-               class="org.eclipse.ptp.internal.rdt.ui.actions.EnableDisableBreakpointRulerActionDelegate"
-               id="org.eclipse.ptp.rdt.debug.internal.ui.actions.EnableDisableBreakpointRulerActionDelegate"
-               label="%EnableBreakpoint.label"
-               menubarPath="debug"
-               overrideActionId="org.eclipse.cdt.debug.internal.ui.actions.EnableDisableBreakpointRulerActionDelegate">
+               label="%AddBookmark.label"
+               helpContextId="org.eclipse.ui.bookmark_action_context"
+               class="org.eclipse.ui.texteditor.BookmarkRulerAction"
+               tooltip="%AddBookmark.tooltip"
+               menubarPath="add"
+               id="org.eclipse.ui.texteditor.BookmarkRulerAction">
          </action>
+         <!-- requires org.eclipse.cdt.internal.ui.text.correction package
          <action
-               class="org.eclipse.ptp.internal.rdt.ui.actions.ManageBreakpointRulerActionDelegate"
-               id="org.eclipse.ptp.rdt.debug.internal.ui.actions.ManageBreakpointRulerActionDelegate"
-               label="%AddBreakpoint.label"
-               menubarPath="debug"
-               overrideActionId="org.eclipse.cdt.debug.internal.ui.actions.ManageBreakpointRulerActionDelegate">
+               class="org.eclipse.cdt.internal.ui.text.correction.CSelectRulerAction"
+               definitionId="org.eclipse.jdt.ui.edit.text.java.correction.assist.proposals"
+               id="org.eclipse.cdt.internal.ui.text.correction.CSelectRulerAction"
+               label="%QuickFix.label"
+               menubarPath="additions"
+               tooltip="%QuickFix.tooltip">
          </action>
+         -->
       </viewerContribution>
      </extension>
-     <extension
-         point="org.eclipse.ui.editorActions">
-      <editorContribution
-            targetID="org.eclipse.ptp.rdt.ui.editor.CEditor"
-            id="org.eclipse.ptp.rdt.debug.ui.CEditor.BreakpointRulerActions">
-         <action
-               label="%Dummy.label"
-               class="org.eclipse.ptp.internal.rdt.ui.actions.ManageBreakpointRulerActionDelegate"
-               actionID="RulerDoubleClick"
-               id="org.eclipse.ptp.rdt.debug.ui.CEditor.ManageBreakpointRulerAction">
-         </action>
-      </editorContribution>
-   </extension>
+     
         <extension
            point="org.eclipse.ptp.services.ui.providerContributors">
         <providerContributor
diff --git a/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/internal/rdt/ui/actions/CBreakpointPropertiesRulerActionDelegate.java b/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/internal/rdt/ui/actions/CBreakpointPropertiesRulerActionDelegate.java
deleted file mode 100644
index 3cdea2bad..000000000
--- a/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/internal/rdt/ui/actions/CBreakpointPropertiesRulerActionDelegate.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.internal.rdt.ui.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.text.source.IVerticalRulerInfo;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.texteditor.AbstractRulerActionDelegate;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-public class CBreakpointPropertiesRulerActionDelegate extends AbstractRulerActionDelegate {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.AbstractRulerActionDelegate#createAction(org.eclipse.ui.texteditor.ITextEditor, org.eclipse.jface.text.source.IVerticalRulerInfo)
-	 */
-	protected IAction createAction( ITextEditor editor, IVerticalRulerInfo rulerInfo ) {
-		return null;
-	}
-	
-	@Override
-	public void menuAboutToShow(IMenuManager manager) {
-	}
-	
-	public void selectionChanged(IAction action, ISelection selection) {
-		action.setEnabled(false);
-	}
-}
diff --git a/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/internal/rdt/ui/actions/EnableDisableBreakpointRulerActionDelegate.java b/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/internal/rdt/ui/actions/EnableDisableBreakpointRulerActionDelegate.java
deleted file mode 100644
index 501afc11f..000000000
--- a/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/internal/rdt/ui/actions/EnableDisableBreakpointRulerActionDelegate.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.internal.rdt.ui.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.text.source.IVerticalRulerInfo;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.texteditor.AbstractRulerActionDelegate;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-public class EnableDisableBreakpointRulerActionDelegate extends AbstractRulerActionDelegate {
-
-	/*
-	 * @see AbstractRulerActionDelegate#createAction(ITextEditor, IVerticalRulerInfo)
-	 */
-	protected IAction createAction( ITextEditor editor, IVerticalRulerInfo rulerInfo ) {
-		return null;
-	}
-	
-	@Override
-	public void menuAboutToShow(IMenuManager manager) {
-
-	}
-	
-	@Override
-	public void selectionChanged(IAction action, ISelection selection) {
-		action.setEnabled(false);
-	}
-}
diff --git a/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/internal/rdt/ui/actions/ManageBreakpointRulerActionDelegate.java b/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/internal/rdt/ui/actions/ManageBreakpointRulerActionDelegate.java
deleted file mode 100644
index 70ceaccac..000000000
--- a/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/internal/rdt/ui/actions/ManageBreakpointRulerActionDelegate.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.internal.rdt.ui.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.text.source.IVerticalRulerInfo;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.texteditor.AbstractRulerActionDelegate;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-public class ManageBreakpointRulerActionDelegate extends AbstractRulerActionDelegate {
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.AbstractRulerActionDelegate#createAction(ITextEditor, IVerticalRulerInfo)
-	 */
-	public IAction createAction( ITextEditor editor, IVerticalRulerInfo rulerInfo ) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorActionDelegate#setActiveEditor(org.eclipse.jface.action.IAction, org.eclipse.ui.IEditorPart)
-	 */
-	public void setActiveEditor( IAction callerAction, IEditorPart targetEditor ) {
-	}
-
-	@Override
-	public void menuAboutToShow(IMenuManager manager) {
-	}
-
-	@Override
-	public void mouseDown(MouseEvent e) {
-	}
-
-
-	@Override
-	public void run(IAction callerAction) {
-	}
-
-	@Override
-	public void runWithEvent(IAction action, Event event) {
-	}
-
-	@Override
-	public void selectionChanged(IAction action, ISelection selection) {
-		action.setEnabled(false);
-	}
-}
diff --git a/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/internal/rdt/ui/editor/RemoteCEditor.java b/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/internal/rdt/ui/editor/RemoteCEditor.java
index cef7c67be..a0ac990fa 100644
--- a/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/internal/rdt/ui/editor/RemoteCEditor.java
+++ b/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/internal/rdt/ui/editor/RemoteCEditor.java
@@ -52,8 +52,10 @@ public class RemoteCEditor extends CEditor {
 	 * Default constructor.
 	 */
 	public RemoteCEditor() {
-		super();		
+		super();
+		setEditorContextMenuId("#RemoteCEditorContext"); //$NON-NLS-1$
 		setRulerContextMenuId("#RemoteCEditorRulerContext"); //$NON-NLS-1$
+		setOutlinerContextMenuId("#RemoteCEditorOutlinerContext"); //$NON-NLS-1$
 	}
 	
 	/**