Update of /cvsroot/e-p-i-c/org.epic.ext.unsupported.colorer/src/org/epic/ext/unsupported/colorer In directory sc8-pr-cvs1:/tmp/cvs-serv2947/src/org/epic/ext/unsupported/colorer Modified Files: FormatSourceAction.java PerlEditor.java PerlActionContributor.java Log Message: Source menu definition moved to plugin.xml Index: FormatSourceAction.java =================================================================== RCS file: /cvsroot/e-p-i-c/org.epic.ext.unsupported.colorer/src/org/epic/ext/unsupported/colorer/FormatSourceAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- FormatSourceAction.java 6 Oct 2003 16:20:22 -0000 1.2 +++ FormatSourceAction.java 25 Oct 2003 12:50:06 -0000 1.3 @@ -18,8 +18,8 @@ /** * Constructs and updates the action. */ - public FormatSourceAction(String label) { - super(label); + public FormatSourceAction() { + super(); } Index: PerlEditor.java =================================================================== RCS file: /cvsroot/e-p-i-c/org.epic.ext.unsupported.colorer/src/org/epic/ext/unsupported/colorer/PerlEditor.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- PerlEditor.java 13 Oct 2003 16:12:51 -0000 1.6 +++ PerlEditor.java 25 Oct 2003 12:50:06 -0000 1.7 @@ -37,7 +37,6 @@ import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IFileEditorInput; import org.eclipse.ui.editors.text.TextEditorPreferenceConstants; -import org.eclipse.ui.internal.editors.text.EditorsPlugin; import org.eclipse.ui.texteditor.AnnotationPreference; import org.eclipse.ui.texteditor.ContentAssistAction; import org.eclipse.ui.texteditor.DefaultMarkerAnnotationAccess; @@ -95,7 +94,7 @@ public PerlEditor() { super(); - // TODO Added to suppor Colorer Plugin + // TODO Added to support Colorer Plugin setSourceViewerConfiguration(new PerlSourceViewerConfiguration(PerlEditorPlugin.getDefault().getPreferenceStore(), this)); //setDocumentProvider(new ColoringDocumentProvider()); @@ -124,21 +123,21 @@ action = new ContentAssistAction(PerlEditorMessages.getResourceBundle(), "ContentAssistProposal.", this); action.setActionDefinitionId(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS); - setAction("ContentAssist", action); + setAction("org.epic.perleditor.ContentAssist", action); // Add comment action action = new TextOperationAction( PerlEditorMessages.getResourceBundle(), "Comment.", this, ITextOperationTarget.PREFIX); action.setActionDefinitionId(IPerlEditorActionDefinitionIds.COMMENT); - setAction("Comment", action); + setAction("org.epic.perleditor.Comment", action); // Add uncomment action action = new TextOperationAction( PerlEditorMessages.getResourceBundle(), "Uncomment.", this, ITextOperationTarget.STRIP_PREFIX); action.setActionDefinitionId(IPerlEditorActionDefinitionIds.UNCOMMENT); - setAction("Uncomment", action); + setAction("org.epic.perleditor.Uncomment", action); IDocumentProvider provider = getDocumentProvider(); IDocument document = provider.getDocument(getEditorInput()); Index: PerlActionContributor.java =================================================================== RCS file: /cvsroot/e-p-i-c/org.epic.ext.unsupported.colorer/src/org/epic/ext/unsupported/colorer/PerlActionContributor.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- PerlActionContributor.java 13 Oct 2003 16:12:51 -0000 1.4 +++ PerlActionContributor.java 25 Oct 2003 12:50:06 -0000 1.5 @@ -6,19 +6,9 @@ package org.epic.ext.unsupported.colorer; -import org.eclipse.jface.action.IMenuManager; -import org.eclipse.jface.action.MenuManager; import org.eclipse.ui.IActionBars; import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IWorkbenchActionConstants; import org.eclipse.ui.editors.text.TextEditorActionContributor; -import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds; -import org.eclipse.ui.texteditor.RetargetTextEditorAction; -import org.eclipse.swt.SWT; -import org.epic.perleditor.actions.IPerlEditorActionDefinitionIds; -import org.epic.perleditor.editors.PerlEditorMessages; - - /** * Contributes interesting Java actions to the desktop's Edit menu and the toolbar. @@ -26,75 +16,51 @@ public class PerlActionContributor extends TextEditorActionContributor { protected FormatSourceAction formatSourceAction; - protected RetargetTextEditorAction fContentAssist; - protected RetargetTextEditorAction fComment; - protected RetargetTextEditorAction fUncomment; /** * Default constructor. */ public PerlActionContributor() { super(); - - // Somehow the key bindings don't work in RC2 - formatSourceAction = new FormatSourceAction("&Format\tCtrl+Shift+F"); - formatSourceAction.setAccelerator(SWT.CTRL | SWT.SHIFT | 'F'); - - fContentAssist = new RetargetTextEditorAction(PerlEditorMessages.getResourceBundle(), "ContentAssistProposal."); - fContentAssist.setActionDefinitionId(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS); - - fComment = new RetargetTextEditorAction(PerlEditorMessages.getResourceBundle(), "Comment."); - fComment.setActionDefinitionId(IPerlEditorActionDefinitionIds.COMMENT); - - fUncomment = new RetargetTextEditorAction(PerlEditorMessages.getResourceBundle(), "Uncomment."); - fComment.setActionDefinitionId(IPerlEditorActionDefinitionIds.UNCOMMENT); - + formatSourceAction = new FormatSourceAction(); + formatSourceAction.setActionDefinitionId("org.epic.perledior.formatsource"); } - + /* * @see IEditorActionBarContributor#init(IActionBars) */ public void init(IActionBars bars) { super.init(bars); - IMenuManager menuManager= bars.getMenuManager(); - IMenuManager editMenu = menuManager.findMenuUsingPath(IWorkbenchActionConstants.M_EDIT); - IMenuManager sourceMenu = new MenuManager("&Source"); - menuManager.insertAfter(editMenu.getId(), sourceMenu); - sourceMenu.add(formatSourceAction); - sourceMenu.add(fContentAssist); - sourceMenu.add(fComment); - sourceMenu.add(fUncomment); - } - - private void doSetActiveEditor(IEditorPart part) { - super.setActiveEditor(part); - PerlEditor editor= null; - - if (part instanceof PerlEditor) - editor = (PerlEditor) part; - - formatSourceAction.setEditor(editor); - fContentAssist.setAction(getAction(editor, "ContentAssist")); - fComment.setAction(getAction(editor, "Comment")); - fUncomment.setAction(getAction(editor, "Uncomment")); - - } - /* * @see IEditorActionBarContributor#setActiveEditor(IEditorPart) */ public void setActiveEditor(IEditorPart part) { super.setActiveEditor(part); - doSetActiveEditor(part); + //doSetActiveEditor(part); + + PerlEditor editor = null; + if (part instanceof PerlEditor) { + editor = (PerlEditor) part; + + formatSourceAction.setEditor(editor); + + IActionBars bars= getActionBars(); + bars.setGlobalActionHandler("org.epic.perleditor.ContentAssist", getAction(editor, "org.epic.perleditor.ContentAssist")); + bars.setGlobalActionHandler("org.epic.perleditor.Comment", getAction(editor, "org.epic.perleditor.Comment")); + bars.setGlobalActionHandler("org.epic.perleditor.Uncomment", getAction(editor, "org.epic.perleditor.Uncomment")); + bars.setGlobalActionHandler("org.epic.perleditor.FormatSource", formatSourceAction); + } + + } - + /* * @see IEditorActionBarContributor#dispose() */ public void dispose() { - doSetActiveEditor(null); + formatSourceAction.setEditor(null); super.dispose(); } } |