Attachment 72467 Details for Bug 156852 – Fix

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fix

cvspatch.txt (text/plain), 4.41 KB, created by Dani Megert

on 2007-06-26 09:19:00 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Dani Megert

Created: 2007-06-26 09:19:00 EDT

Size: 4.41 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.team.cvs.ui
>Index: src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java,v
>retrieving revision 1.41
>diff -u -r1.41 CommitCommentArea.java
>--- src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java	22 May 2007 20:19:55 -0000	1.41
>+++ src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java	26 Jun 2007 12:16:55 -0000
>@@ -17,6 +17,8 @@
> import java.util.*;
> 
> import org.eclipse.core.resources.IProject;
>+import org.eclipse.jface.action.Action;
>+import org.eclipse.jface.commands.ActionHandler;
> import org.eclipse.jface.dialogs.*;
> import org.eclipse.jface.dialogs.Dialog;
> import org.eclipse.jface.preference.IPreferenceStore;
>@@ -33,11 +35,13 @@
> import org.eclipse.team.internal.ccvs.core.util.Util;
> import org.eclipse.team.internal.ui.SWTUtils;
> import org.eclipse.team.internal.ui.dialogs.DialogArea;
>+import org.eclipse.ui.*;
> import org.eclipse.ui.dialogs.PreferencesUtil;
>-import org.eclipse.ui.editors.text.EditorsUI;
>-import org.eclipse.ui.editors.text.TextSourceViewerConfiguration;
>+import org.eclipse.ui.editors.text.*;
>+import org.eclipse.ui.handlers.*;
> import org.eclipse.ui.texteditor.*;
> 
>+
> /**
>  * This area provides the widgets for providing the CVS commit comment
>  */
>@@ -72,10 +76,14 @@
>     		
>             support.install(EditorsUI.getPreferenceStore());
>             
>+            final IHandlerService handlerService= (IHandlerService)PlatformUI.getWorkbench().getService(IHandlerService.class);
>+            final IHandlerActivation handlerActivation= installQuickFixActionHandler(handlerService, sourceViewer);
>+            
>             sourceViewer.getTextWidget().addDisposeListener(new DisposeListener() {
> 			
> 				public void widgetDisposed(DisposeEvent e) {
> 					support.uninstall();
>+					handlerService.deactivateHandler(handlerActivation);
> 				}
> 			
> 			});
>@@ -91,6 +99,42 @@
>             fTextField.addTraverseListener(this);
>             fTextField.addModifyListener(this);
>             fTextField.addFocusListener(this);
>+            
>+        }
>+        
>+        /**
>+         * Installs the quick fix action handler
>+         * and returns the handler activation.
>+         * 
>+         * @param handlerService the handler service
>+         * @param sourceViewer the source viewer
>+         * @return the handler activation
>+         * @since 3.4
>+         */
>+		private IHandlerActivation installQuickFixActionHandler(IHandlerService handlerService, SourceViewer sourceViewer) {
>+            return handlerService.activateHandler(
>+            			ITextEditorActionDefinitionIds.QUICK_ASSIST,
>+            			createQuickFixActionHandler(sourceViewer),
>+            			new ActiveShellExpression(sourceViewer.getTextWidget().getShell()));
>+		}
>+        
>+        /**
>+         * Creates and returns a quick fix action handler.
>+         * 
>+         * @param textOperationTarget the target for text operations
>+         * @since 3.4
>+         */
>+        private ActionHandler createQuickFixActionHandler(final ITextOperationTarget textOperationTarget) {
>+            Action quickFixAction= new Action() {
>+            	/* (non-Javadoc)
>+            	 * @see org.eclipse.jface.action.Action#run()
>+            	 */
>+            	public void run() {
>+            		textOperationTarget.doOperation(ISourceViewer.QUICK_ASSIST);
>+            	}
>+            };
>+    		quickFixAction.setActionDefinitionId(ITextEditorActionDefinitionIds.QUICK_ASSIST);
>+    		return new ActionHandler(quickFixAction);    		
>         }
> 
>         public void modifyText(ModifyEvent e) {
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF,v
>retrieving revision 1.18
>diff -u -r1.18 MANIFEST.MF
>--- META-INF/MANIFEST.MF	4 Jun 2007 17:16:36 -0000	1.18
>+++ META-INF/MANIFEST.MF	26 Jun 2007 12:16:55 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %pluginName
> Bundle-SymbolicName: org.eclipse.team.cvs.ui; singleton:=true
>-Bundle-Version: 3.3.0.qualifier
>+Bundle-Version: 3.3.100.qualifier
> Bundle-Activator: org.eclipse.team.internal.ccvs.ui.CVSUIPlugin
> Bundle-Vendor: %providerName
> Bundle-Localization: plugin

Actions: View | Diff

Attachments on bug 156852: 72467