Attachment 85240 Details for Bug 212330 – Proof of Concept for SSE UI

[patch] Proof of Concept for SSE UI

sseuimenus.patch (text/plain), 12.92 KB, created by David Carver

on 2007-12-13 22:22:40 EST

(hide)

Description:

Filename:

MIME Type:

Creator: David Carver

Created: 2007-12-13 22:22:40 EST

Size: 12.92 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.wst.xml.ui
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.xml.ui/plugin.xml,v
>retrieving revision 1.73
>diff -u -r1.73 plugin.xml
>--- plugin.xml	5 Nov 2007 22:20:20 -0000	1.73
>+++ plugin.xml	14 Dec 2007 03:01:01 -0000
>@@ -275,10 +275,12 @@
> 			</action>
> 		</objectContribution>
> 	</extension>
>+
> 
> 	
> 	
>-	
>+	
>+
> 	
> 	
> 	
>@@ -393,7 +395,7 @@
> 		</provider>
> 	</extension>
> 
>-
>+
> 	
> 	
> 	
>@@ -443,7 +445,8 @@
> 		</objectContribution>
> 	</extension>
> 
>-	
>+
>+
> 	<extension
> 		point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectorTargets">
> 		<target
>#P org.eclipse.wst.sse.ui
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.sse.ui/plugin.xml,v
>retrieving revision 1.44
>diff -u -r1.44 plugin.xml
>--- plugin.xml	15 Oct 2007 17:39:51 -0000	1.44
>+++ plugin.xml	14 Dec 2007 03:01:07 -0000
>@@ -381,7 +381,9 @@
> 			symbolicFontName="org.eclipse.wst.sse.ui.textfont"
> 			id="org.eclipse.wst.sse.ui.StructuredTextEditor">
> 		</editor>
>-	</extension>
>+	</extension>
>+
>+   	
>+
> 	
> 	
> 	
>@@ -461,5 +465,82 @@
> 	<extension-point
> 		id="sourcevalidation"
> 		name="%Source_Validation_Extension_Point.name"
>-		schema="schema/org.eclipse.wst.sse.ui.sourcevalidation.exsd" />
>+		schema="schema/org.eclipse.wst.sse.ui.sourcevalidation.exsd" />
>+ <extension
>+       point="org.eclipse.ui.menus">
>+    <menuContribution
>+          locationURI="menu:org.eclipse.ui.main.menu?after=edit">
>+       <menu
>+             id="sourceMenuId"
>+             label="Source"
>+             mnemonic="S">
>+       </menu>
>+    </menuContribution>
>+    <menuContribution
>+          locationURI="menu:sourceMenuId">
>+       <separator
>+             name="sourceBegin"
>+             visible="false">
>+       </separator>
>+       <command
>+             commandId="org.eclipse.wst.sse.ui.toggle.comment"
>+             id="ToggleComment"
>+             style="push">
>+       </command>
>+       <command
>+             commandId="org.eclipse.wst.sse.ui.add.block.comment"
>+             id="AddBlockComment"
>+             style="push">
>+       </command>
>+       <command
>+             commandId="org.eclipse.wst.sse.ui.remove.block.comment"
>+             id="RemoveBlockComment"
>+             style="push">
>+       </command>
>+       <separator
>+             name="shiftStart"
>+             visible="true">
>+       </separator>
>+       <command
>+             commandId="org.eclipse.ui.edit.text.shiftRight"
>+             id="ShiftRight"
>+             style="push">
>+       </command>
>+       <command
>+             commandId="org.eclipse.ui.edit.text.shiftLeft"
>+             id="ShiftLeft"
>+             style="push">
>+       </command>
>+       <separator
>+             name="shiftEnd"
>+             visible="true">
>+       </separator>
>+       <separator
>+             name="additions"
>+             visible="false">
>+       </separator>
>+       <command
>+             commandId="org.eclipse.wst.sse.ui.format.document"
>+             id="FormatDocument"
>+             mnemonic="F"
>+             style="push">
>+       </command>
>+       <command
>+             commandId="org.eclipse.wst.sse.ui.format.active.elements"
>+             id="FormatElements"
>+             mnemonic="i"
>+             style="push">
>+       </command>
>+    </menuContribution>
>+    <menuContribution
>+          locationURI="menu:edit?after=additions">
>+       <command
>+             commandId="org.eclipse.ui.edit.text.toggleInsertMode"
>+             id="ToggleInsertMode"
>+             label="Smart Insert Mode"
>+             mnemonic="r"
>+             style="toggle">
>+       </command>
>+    </menuContribution>
>+ </extension>
> </plugin>
>Index: src/org/eclipse/wst/sse/ui/internal/actions/ActionContributor.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/actions/ActionContributor.java,v
>retrieving revision 1.5
>diff -u -r1.5 ActionContributor.java
>--- src/org/eclipse/wst/sse/ui/internal/actions/ActionContributor.java	8 Nov 2006 21:02:43 -0000	1.5
>+++ src/org/eclipse/wst/sse/ui/internal/actions/ActionContributor.java	14 Dec 2007 03:01:07 -0000
>@@ -12,11 +12,11 @@
>  *******************************************************************************/
> package org.eclipse.wst.sse.ui.internal.actions;
> 
>-import java.util.ResourceBundle;
>+//import java.util.ResourceBundle;
> 
> import org.eclipse.core.runtime.Platform;
> import org.eclipse.jface.action.GroupMarker;
>-import org.eclipse.jface.action.IAction;
>+//import org.eclipse.jface.action.IAction;
> import org.eclipse.jface.action.IMenuManager;
> import org.eclipse.jface.action.IStatusLineManager;
> import org.eclipse.jface.action.IToolBarManager;
>@@ -24,21 +24,21 @@
> import org.eclipse.jface.action.Separator;
> import org.eclipse.ui.IActionBars;
> import org.eclipse.ui.IEditorPart;
>-import org.eclipse.ui.IWorkbenchActionConstants;
>+//import org.eclipse.ui.IWorkbenchActionConstants;
> import org.eclipse.ui.IWorkbenchPage;
>-import org.eclipse.ui.actions.ActionFactory;
>+//import org.eclipse.ui.actions.ActionFactory;
> import org.eclipse.ui.editors.text.TextEditorActionContributor;
>-import org.eclipse.ui.ide.IDEActionFactory;
>+//import org.eclipse.ui.ide.IDEActionFactory;
> import org.eclipse.ui.texteditor.ITextEditor;
>-import org.eclipse.ui.texteditor.ITextEditorActionConstants;
>-import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
>-import org.eclipse.ui.texteditor.ITextEditorExtension;
>+//import org.eclipse.ui.texteditor.ITextEditorActionConstants;
>+//import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
>+//import org.eclipse.ui.texteditor.ITextEditorExtension;
> import org.eclipse.ui.texteditor.RetargetTextEditorAction;
>-import org.eclipse.wst.sse.ui.internal.ExtendedEditorActionBuilder;
>+//import org.eclipse.wst.sse.ui.internal.ExtendedEditorActionBuilder;
> import org.eclipse.wst.sse.ui.internal.GotoAnnotationAction;
> import org.eclipse.wst.sse.ui.internal.IExtendedContributor;
> import org.eclipse.wst.sse.ui.internal.ISourceViewerActionBarContributor;
>-import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
>+//import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
> import org.eclipse.wst.sse.ui.internal.ui.OffsetStatusLineContributionItem;
> 
> /**
>@@ -85,7 +85,7 @@
> 	public ActionContributor() {
> 		super();
> 
>-		ResourceBundle resourceBundle = SSEUIMessages.getResourceBundle();
>+/*		ResourceBundle resourceBundle = SSEUIMessages.getResourceBundle();
> 
> 		fCommandsSeparator = new Separator();
> 
>@@ -146,11 +146,11 @@
> 		if (_showDebugStatus) {
> 			fDebugStatusOffset = new OffsetStatusLineContributionItem(StructuredTextEditorActionConstants.STATUS_CATEGORY_OFFSET, true, 20);
> 		}
>-	}
>+*/	}
> 
> 	protected void addToMenu(IMenuManager menu) {
> 		// edit commands
>-		IMenuManager editMenu = menu.findMenuUsingPath(IWorkbenchActionConstants.M_EDIT);
>+/*		IMenuManager editMenu = menu.findMenuUsingPath(IWorkbenchActionConstants.M_EDIT);
> 		if (editMenu != null) {
> 			editMenu.add(fCommandsSeparator);
> 			editMenu.add(fToggleInsertModeAction);
>@@ -159,7 +159,7 @@
> 			editMenu.add(fCommandsSeparator);
> 			editMenu.add(fMenuAdditionsGroupMarker);
> 		}
>-
>+		
> 		// source commands
> 		String sourceMenuLabel = SSEUIMessages.SourceMenu_label; //$NON-NLS-1$
> 		String sourceMenuId = "sourceMenuId"; // This is just a menu id. No //$NON-NLS-1$
>@@ -175,7 +175,7 @@
> 			sourceMenu.add(fShiftRight);
> 			sourceMenu.add(fShiftLeft);
> 		}
>-	}
>+*/	}
> 
> 	protected void addToPopupMenu(IMenuManager menu) {
> 		// add nothing
>@@ -188,22 +188,22 @@
> 	}
> 
> 	protected void addToToolBar(IToolBarManager toolBarManager) {
>-		toolBarManager.add(fToolbarSeparator);
>+/*		toolBarManager.add(fToolbarSeparator);
> 		toolBarManager.add(fToolbarAdditionsGroupMarker);
>-	}
>+*/	}
> 
> 	/**
> 	 * @see org.eclipse.ui.part.EditorActionBarContributor#contributeToMenu(IMenuManager)
> 	 */
> 	public void contributeToMenu(IMenuManager menu) {
> 		super.contributeToMenu(menu);
>-
>+/*
> 		addToMenu(menu);
> 
> 		if (extendedContributor != null) {
> 			extendedContributor.contributeToMenu(menu);
> 		}
>-	}
>+*/	}
> 
> 	/*
> 	 * (non-Javadoc)
>@@ -212,12 +212,12 @@
> 	 */
> 	public void contributeToPopupMenu(IMenuManager menu) {
> 
>-		addToPopupMenu(menu);
>+/*		addToPopupMenu(menu);
> 
> 		if (extendedContributor != null) {
> 			extendedContributor.contributeToPopupMenu(menu);
> 		}
>-	}
>+*/	}
> 
> 	/*
> 	 * (non-Javadoc)
>@@ -240,12 +240,12 @@
> 	public void contributeToToolBar(IToolBarManager toolBarManager) {
> 		super.contributeToToolBar(toolBarManager);
> 
>-		addToToolBar(toolBarManager);
>+/*		addToToolBar(toolBarManager);
> 
> 		if (extendedContributor != null) {
> 			extendedContributor.contributeToToolBar(toolBarManager);
> 		}
>-	}
>+*/	}
> 
> 	/**
> 	 * @see org.eclipse.ui.part.EditorActionBarContributor#dispose()
>@@ -300,9 +300,9 @@
> 			return;
> 		super.setActiveEditor(activeEditor);
> 
>-		ITextEditor textEditor = getTextEditor(activeEditor);
>+//		ITextEditor textEditor = getTextEditor(activeEditor);
> 
>-		IActionBars actionBars = getActionBars();
>+/*		IActionBars actionBars = getActionBars();
> 		if (actionBars != null) {
> 			actionBars.setGlobalActionHandler(ITextEditorActionDefinitionIds.GOTO_NEXT_ANNOTATION, fNextAnnotation);
> 			actionBars.setGlobalActionHandler(ITextEditorActionDefinitionIds.GOTO_PREVIOUS_ANNOTATION, fPreviousAnnotation);
>@@ -342,7 +342,7 @@
> 			((ITextEditorExtension) textEditor).setStatusField(fDebugStatusOffset, StructuredTextEditorActionConstants.STATUS_CATEGORY_OFFSET);
> 			fDebugStatusOffset.setActiveEditor(textEditor);
> 		}
>-	}
>+*/	}
> 
> 	/*
> 	 * (non-Javadoc)
>@@ -350,19 +350,19 @@
> 	 * @see org.eclipse.wst.sse.ui.ISourceViewerActionBarContributor#setViewerSpecificContributionsEnabled(boolean)
> 	 */
> 	public void setViewerSpecificContributionsEnabled(boolean enabled) {
>-		fShiftRight.setEnabled(enabled);
>+/*		fShiftRight.setEnabled(enabled);
> 		fShiftLeft.setEnabled(enabled);
> 		fNextAnnotation.setEnabled(enabled);
> 		fPreviousAnnotation.setEnabled(enabled);
> 
>-		/*
>+		
> 		 * fComment.setEnabled(enabled); fUncomment.setEnabled(enabled);
>-		 */
>+		 
> 		fToggleComment.setEnabled(enabled);
> 		fAddBlockComment.setEnabled(enabled);
> 		fRemoveBlockComment.setEnabled(enabled);
> 		// convert line delimiters are not source viewer-specific
>-	}
>+*/	}
> 
> 	/*
> 	 * (non-Javadoc)
>@@ -370,8 +370,8 @@
> 	 * @see org.eclipse.wst.sse.ui.extension.IExtendedContributor#updateToolbarActions()
> 	 */
> 	public void updateToolbarActions() {
>-		if (extendedContributor != null) {
>+/*		if (extendedContributor != null) {
> 			extendedContributor.updateToolbarActions();
> 		}
>-	}
>+*/	}
> }

Actions: View | Diff

Attachments on bug 212330: 85240 | 85305 | 85343 | 85359 | 85510 | 85614 | 85623 | 85671 | 85691 | 89897 | 90283 | 92198 | 92199 | 92436 | 92731