mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Cleanup in the EditorAction to use

Browse source 
the Eclipse-2.1 functionnalities.
This commit is contained in:
Alain Magloire 2003-04-10 19:25:49 +00:00
parent 28bd5c346f
commit 9fabb00098
3 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java
View file

@ -9,7 +9,6 @@ import java.util.ResourceBundle;
import org.eclipse.cdt.internal.ui.CPluginImages; import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.IContextMenuConstants; import org.eclipse.cdt.internal.ui.IContextMenuConstants;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.IStatusLineManager; import org.eclipse.jface.action.IStatusLineManager;
import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.action.IToolBarManager;
@ -36,7 +35,7 @@ public class CEditorActionContributor extends TextEditorActionContributor {
public SelectionAction(String prefix, int operation) { public SelectionAction(String prefix, int operation) {
super(CUIPlugin.getResourceBundle(), prefix, null); super(CEditorMessages.getResourceBundle(), prefix, null);
fOperationCode= operation; fOperationCode= operation;
setEnabled(false); setEnabled(false);
} }
@ -56,8 +55,9 @@ public class CEditorActionContributor extends TextEditorActionContributor {
ISelectionProvider p= editor.getSelectionProvider(); ISelectionProvider p= editor.getSelectionProvider();
if (p != null) p.addSelectionChangedListener(this); if (p != null) p.addSelectionChangedListener(this);
fOperationTarget= (ITextOperationTarget) editor.getAdapter(ITextOperationTarget.class); fOperationTarget= (ITextOperationTarget) editor.getAdapter(ITextOperationTarget.class);
} else } else {
fOperationTarget= null; fOperationTarget= null;
}
selectionChanged(null); selectionChanged(null);
} }
@ -79,7 +79,6 @@ public class CEditorActionContributor extends TextEditorActionContributor {
} }
}; };
protected CEditor fCEditor; protected CEditor fCEditor;
protected RetargetTextEditorAction fContentAssist; protected RetargetTextEditorAction fContentAssist;
protected RetargetTextEditorAction fAddInclude; protected RetargetTextEditorAction fAddInclude;
@ -98,23 +97,35 @@ public class CEditorActionContributor extends TextEditorActionContributor {
ResourceBundle bundle = CEditorMessages.getResourceBundle(); ResourceBundle bundle = CEditorMessages.getResourceBundle();
fShiftRight= new SelectionAction("ShiftRight.", ITextOperationTarget.SHIFT_RIGHT);
fShiftRight= new SelectionAction("Editor.ShiftRight.", ITextOperationTarget.SHIFT_RIGHT); fShiftRight.setActionDefinitionId(ICEditorActionDefinitionIds.SHIFT_RIGHT);
fShiftLeft= new SelectionAction("Editor.ShiftLeft.", ITextOperationTarget.SHIFT_LEFT);
CPluginImages.setImageDescriptors(fShiftRight, CPluginImages.T_LCL, CPluginImages.IMG_MENU_SHIFT_RIGHT); CPluginImages.setImageDescriptors(fShiftRight, CPluginImages.T_LCL, CPluginImages.IMG_MENU_SHIFT_RIGHT);
fShiftLeft= new SelectionAction("ShiftLeft.", ITextOperationTarget.SHIFT_LEFT);
fShiftLeft.setActionDefinitionId(ICEditorActionDefinitionIds.SHIFT_LEFT);
CPluginImages.setImageDescriptors(fShiftLeft, CPluginImages.T_LCL, CPluginImages.IMG_MENU_SHIFT_LEFT); CPluginImages.setImageDescriptors(fShiftLeft, CPluginImages.T_LCL, CPluginImages.IMG_MENU_SHIFT_LEFT);
fContentAssist = new RetargetTextEditorAction(bundle, "ContentAssistProposal."); fContentAssist = new RetargetTextEditorAction(bundle, "ContentAssistProposal.");
fContentAssist.setActionDefinitionId(ICEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS);
CPluginImages.setImageDescriptors(fContentAssist, CPluginImages.T_TOOL, CPluginImages.IMG_MENU_COLLAPSE_ALL);
fAddInclude = new RetargetTextEditorAction(bundle, "AddIncludeOnSelection."); fAddInclude = new RetargetTextEditorAction(bundle, "AddIncludeOnSelection.");
fAddInclude.setActionDefinitionId(ICEditorActionDefinitionIds.ADD_INCLUDE);
fOpenOnSelection = new RetargetTextEditorAction(bundle, "OpenOnSelection."); fOpenOnSelection = new RetargetTextEditorAction(bundle, "OpenOnSelection.");
// actions that are "contributed" to editors, they are considered belonging to the active editor // actions that are "contributed" to editors, they are considered belonging to the active editor
fTogglePresentation= new TogglePresentationAction(); fTogglePresentation= new TogglePresentationAction();
fTogglePresentation.setActionDefinitionId(ICEditorActionDefinitionIds.TOGGLE_PRESENTATION);
//fToggleTextHover= new ToggleTextHoverAction(); //fToggleTextHover= new ToggleTextHoverAction();
fPreviousError= new GotoErrorAction("Editor.PreviousError.", false); //$NON-NLS-1$
fPreviousError= new GotoErrorAction("PreviousError.", false); //$NON-NLS-1$
fPreviousError.setActionDefinitionId("org.eclipse.ui.navigate.previous"); //$NON-NLS-1$
CPluginImages.setImageDescriptors(fPreviousError, CPluginImages.T_TOOL, CPluginImages.IMG_TOOL_GOTO_PREV_ERROR); CPluginImages.setImageDescriptors(fPreviousError, CPluginImages.T_TOOL, CPluginImages.IMG_TOOL_GOTO_PREV_ERROR);
fNextError= new GotoErrorAction("Editor.NextError.", true); //$NON-NLS-1$
fNextError= new GotoErrorAction("NextError.", true); //$NON-NLS-1$
fNextError.setActionDefinitionId("org.eclipse.ui.navigate.next"); //$NON-NLS-1$
CPluginImages.setImageDescriptors(fNextError, CPluginImages.T_TOOL, CPluginImages.IMG_TOOL_GOTO_NEXT_ERROR); CPluginImages.setImageDescriptors(fNextError, CPluginImages.T_TOOL, CPluginImages.IMG_TOOL_GOTO_NEXT_ERROR);
} }
@ -170,7 +181,6 @@ public class CEditorActionContributor extends TextEditorActionContributor {
if (part instanceof ITextEditor) if (part instanceof ITextEditor)
textEditor= (ITextEditor) part; textEditor= (ITextEditor) part;
fShiftRight.setEditor(textEditor); fShiftRight.setEditor(textEditor);
fShiftLeft.setEditor(textEditor); fShiftLeft.setEditor(textEditor);
fNextError.setEditor(textEditor); fNextError.setEditor(textEditor);
@ -182,7 +192,6 @@ public class CEditorActionContributor extends TextEditorActionContributor {
fContentAssist.setAction(getAction(textEditor, "ContentAssistProposal")); //$NON-NLS-1$ fContentAssist.setAction(getAction(textEditor, "ContentAssistProposal")); //$NON-NLS-1$
fAddInclude.setAction(getAction(textEditor, "AddIncludeOnSelection")); //$NON-NLS-1$ fAddInclude.setAction(getAction(textEditor, "AddIncludeOnSelection")); //$NON-NLS-1$
fOpenOnSelection.setAction(getAction(textEditor, "OpenOnSelection")); //$NON-NLS-1$ fOpenOnSelection.setAction(getAction(textEditor, "OpenOnSelection")); //$NON-NLS-1$
} }
/* /*
@ -192,6 +201,6 @@ public class CEditorActionContributor extends TextEditorActionContributor {
*/ */
public void contributeeToStatusLine(IStatusLineManager statusLineManager) { public void contributeeToStatusLine(IStatusLineManager statusLineManager) {
super.contributeToStatusLine(statusLineManager); super.contributeToStatusLine(statusLineManager);
} }
} }

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorMessages.properties
View file

@ -94,11 +94,11 @@ TogglePresentation.tooltip=Show Source of Selected Element Only
ToggleTextHover.label=Show Text Hover ToggleTextHover.label=Show Text Hover
ToggleTextHover.tooltip=Show Text Hover ToggleTextHover.tooltip=Show Text Hover
NextError.label=Ne&xt Problem@Ctrl+P NextError.label=Ne&xt Problem
NextError.tooltip=Go to Next Problem NextError.tooltip=Go to Next Problem
NextError.description=Go to next problem NextError.description=Go to next problem
PreviousError.label=Previo&us Problem@Ctrl+Shift+P PreviousError.label=Previo&us Problem
PreviousError.tooltip=Go to Previous Problem PreviousError.tooltip=Go to Previous Problem
PreviousError.description=Go to previous problem PreviousError.description=Go to previous problem

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/GotoErrorAction.java
View file

@ -5,8 +5,6 @@ package org.eclipse.cdt.internal.ui.editor;
* All Rights Reserved. * All Rights Reserved.
*/ */
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.ui.texteditor.ITextEditor;
import org.eclipse.ui.texteditor.TextEditorAction; import org.eclipse.ui.texteditor.TextEditorAction;
@ -18,7 +16,7 @@ public class GotoErrorAction extends TextEditorAction {
public GotoErrorAction(String prefix, boolean forward) { public GotoErrorAction(String prefix, boolean forward) {
super(CUIPlugin.getResourceBundle(), prefix, null); super(CEditorMessages.getResourceBundle(), prefix, null);
fForward= forward; fForward= forward;
} }
/** /**