[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[cdt-patch] Cleanup in the EditorAction
|
Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/ChangeLog,v
retrieving revision 1.88
diff -u -r1.88 ChangeLog
--- ChangeLog 9 Apr 2003 03:07:38 -0000 1.88
+++ ChangeLog 10 Apr 2003 19:23:55 -0000
@@ -1,3 +1,14 @@
+2003-04-10 Alain Magloire
+
+ * src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java:
+ Cleanup to be more Eclipse-2.1
+ * src/org/eclipse/cdt/internal/ui/editor/GotoErrorAction.java:
+ Was using the wrong bundle.
+ * src/org/eclipse/cdt/internal/ui/CPluginImage.java:
+ New imange for code assist.
+ * plugin.xml:
+ added "hpp" in the list of possible source C/C++ file.
+
2003-04-08 Alain Magloire
* src/org/eclipse/cdt/ui/CElementLabelProvider.java:
Index: plugin.xml
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/plugin.xml,v
retrieving revision 1.23
diff -u -r1.23 plugin.xml
--- plugin.xml 17 Feb 2003 19:13:07 -0000 1.23
+++ plugin.xml 10 Apr 2003 19:23:56 -0000
@@ -236,7 +236,7 @@
<editor
name="%CEditor.name"
icon="icons/full/obj16/c_file_obj.gif"
- extensions="c, h, cc, hh, cpp, cxx"
+ extensions="c, h, cc, hh, cpp, cxx, hpp"
contributorClass="org.eclipse.cdt.internal.ui.editor.CEditorActionContributor"
class="org.eclipse.cdt.internal.ui.editor.CEditor"
id="org.eclipse.cdt.ui.editor.CEditor">
@@ -373,14 +373,14 @@
<extension
point="org.eclipse.compare.structureCreators">
<structureCreator
- extensions="c,cc,cpp,cxx,h"
+ extensions="c,cc,cpp,cxx,h,hpp"
class="org.eclipse.cdt.internal.ui.compare.CStructureCreator">
</structureCreator>
</extension>
<extension
point="org.eclipse.compare.contentMergeViewers">
<viewer
- extensions="c,cc,cpp,cxx,h,c2"
+ extensions="c,cc,cpp,cxx,h,c2,hpp"
class="org.eclipse.cdt.internal.ui.compare.CContentViewerCreator">
</viewer>
</extension>
Index: icons/full/clcl16/metharg_obj.gif
===================================================================
RCS file: icons/full/clcl16/metharg_obj.gif
diff -N icons/full/clcl16/metharg_obj.gif
Binary files /dev/null and metharg_obj.gif differ
Index: icons/full/dlcl16/metharg_obj.gif
===================================================================
RCS file: icons/full/dlcl16/metharg_obj.gif
diff -N icons/full/dlcl16/metharg_obj.gif
Binary files /dev/null and metharg_obj.gif differ
Index: icons/full/elcl16/metharg_obj.gif
===================================================================
RCS file: icons/full/elcl16/metharg_obj.gif
diff -N icons/full/elcl16/metharg_obj.gif
Binary files /dev/null and metharg_obj.gif differ
Index: src/org/eclipse/cdt/internal/ui/CPluginImages.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java,v
retrieving revision 1.12
diff -u -r1.12 CPluginImages.java
--- src/org/eclipse/cdt/internal/ui/CPluginImages.java 9 Apr 2003 15:07:59 -0000 1.12
+++ src/org/eclipse/cdt/internal/ui/CPluginImages.java 10 Apr 2003 19:23:56 -0000
@@ -113,6 +113,7 @@
public static final String IMG_MENU_SHIFT_LEFT= NAME_PREFIX + "shift_l_edit.gif";
public static final String IMG_MENU_OPEN_INCLUDE= NAME_PREFIX + "open_incl.gif";
public static final String IMG_MENU_SEGMENT_EDIT= NAME_PREFIX + "segment_edit.gif";
+ public static final String IMG_MENU_CODE_ASSIST= NAME_PREFIX + "metharg_obj.gif";
public static final String IMG_MENU_COLLAPSE_ALL= NAME_PREFIX + "collapseall.gif";
public static final String IMG_CLEAR_CONSOLE= NAME_PREFIX + "clear_co.gif";
public static final String IMG_ALPHA_SORTING= NAME_PREFIX + "alphab_sort_co.gif";
Index: src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java,v
retrieving revision 1.8
diff -u -r1.8 CEditorActionContributor.java
--- src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java 5 Apr 2003 02:04:45 -0000 1.8
+++ src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java 10 Apr 2003 19:23:57 -0000
@@ -9,7 +9,6 @@
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.IContextMenuConstants;
-import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.IStatusLineManager;
import org.eclipse.jface.action.IToolBarManager;
@@ -36,7 +35,7 @@
public SelectionAction(String prefix, int operation) {
- super(CUIPlugin.getResourceBundle(), prefix, null);
+ super(CEditorMessages.getResourceBundle(), prefix, null);
fOperationCode= operation;
setEnabled(false);
}
@@ -56,8 +55,9 @@
ISelectionProvider p= editor.getSelectionProvider();
if (p != null) p.addSelectionChangedListener(this);
fOperationTarget= (ITextOperationTarget) editor.getAdapter(ITextOperationTarget.class);
- } else
+ } else {
fOperationTarget= null;
+ }
selectionChanged(null);
}
@@ -78,8 +78,7 @@
fOperationTarget.doOperation(fOperationCode);
}
};
-
-
+
protected CEditor fCEditor;
protected RetargetTextEditorAction fContentAssist;
protected RetargetTextEditorAction fAddInclude;
@@ -97,24 +96,36 @@
super();
ResourceBundle bundle = CEditorMessages.getResourceBundle();
-
-
- fShiftRight= new SelectionAction("Editor.ShiftRight.", ITextOperationTarget.SHIFT_RIGHT);
- fShiftLeft= new SelectionAction("Editor.ShiftLeft.", ITextOperationTarget.SHIFT_LEFT);
-
+
+ fShiftRight= new SelectionAction("ShiftRight.", ITextOperationTarget.SHIFT_RIGHT);
+ fShiftRight.setActionDefinitionId(ICEditorActionDefinitionIds.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);
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.setActionDefinitionId(ICEditorActionDefinitionIds.ADD_INCLUDE);
+
fOpenOnSelection = new RetargetTextEditorAction(bundle, "OpenOnSelection.");
// actions that are "contributed" to editors, they are considered belonging to the active editor
fTogglePresentation= new TogglePresentationAction();
+ fTogglePresentation.setActionDefinitionId(ICEditorActionDefinitionIds.TOGGLE_PRESENTATION);
+
//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);
- 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);
}
@@ -169,8 +180,7 @@
ITextEditor textEditor= null;
if (part instanceof ITextEditor)
textEditor= (ITextEditor) part;
-
-
+
fShiftRight.setEditor(textEditor);
fShiftLeft.setEditor(textEditor);
fNextError.setEditor(textEditor);
@@ -182,7 +192,6 @@
fContentAssist.setAction(getAction(textEditor, "ContentAssistProposal")); //$NON-NLS-1$
fAddInclude.setAction(getAction(textEditor, "AddIncludeOnSelection")); //$NON-NLS-1$
fOpenOnSelection.setAction(getAction(textEditor, "OpenOnSelection")); //$NON-NLS-1$
-
}
/*
@@ -192,6 +201,6 @@
*/
public void contributeeToStatusLine(IStatusLineManager statusLineManager) {
super.contributeToStatusLine(statusLineManager);
+ }
- }
}
Index: src/org/eclipse/cdt/internal/ui/editor/CEditorMessages.properties
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorMessages.properties,v
retrieving revision 1.2
diff -u -r1.2 CEditorMessages.properties
--- src/org/eclipse/cdt/internal/ui/editor/CEditorMessages.properties 5 Apr 2003 02:04:45 -0000 1.2
+++ src/org/eclipse/cdt/internal/ui/editor/CEditorMessages.properties 10 Apr 2003 19:23:57 -0000
@@ -94,11 +94,11 @@
ToggleTextHover.label=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.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.description=Go to previous problem
Index: src/org/eclipse/cdt/internal/ui/editor/GotoErrorAction.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/GotoErrorAction.java,v
retrieving revision 1.2
diff -u -r1.2 GotoErrorAction.java
--- src/org/eclipse/cdt/internal/ui/editor/GotoErrorAction.java 29 Oct 2002 21:40:58 -0000 1.2
+++ src/org/eclipse/cdt/internal/ui/editor/GotoErrorAction.java 10 Apr 2003 19:23:57 -0000
@@ -5,8 +5,6 @@
* All Rights Reserved.
*/
-import org.eclipse.cdt.ui.CUIPlugin;
-
import org.eclipse.ui.texteditor.ITextEditor;
import org.eclipse.ui.texteditor.TextEditorAction;
@@ -18,7 +16,7 @@
public GotoErrorAction(String prefix, boolean forward) {
- super(CUIPlugin.getResourceBundle(), prefix, null);
+ super(CEditorMessages.getResourceBundle(), prefix, null);
fForward= forward;
}
/**
