Attachment 93501 Details for Bug 223987 – Patch with potential fix.

[patch] Patch with potential fix.

2008-03-25_223987.patch (text/plain), 4.87 KB, created by Pawel Piech

on 2008-03-25 17:40:47 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Pawel Piech

Created: 2008-03-25 17:40:47 EDT

Size: 4.87 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.ui
>Index: src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverProxy.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverProxy.java,v
>retrieving revision 1.5
>diff -u -r1.5 CEditorTextHoverProxy.java
>--- src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverProxy.java	20 Mar 2008 16:02:42 -0000	1.5
>+++ src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverProxy.java	25 Mar 2008 21:39:53 -0000
>@@ -13,6 +13,7 @@
> package org.eclipse.cdt.internal.ui.text.c.hover;
> 
> import org.eclipse.jface.text.IInformationControlCreator;
>+import org.eclipse.jface.text.IInformationControlExtension5;
> import org.eclipse.jface.text.IRegion;
> import org.eclipse.jface.text.ITextHoverExtension;
> import org.eclipse.jface.text.ITextHoverExtension2;
>@@ -118,8 +119,8 @@
> 	 */
> 	public IInformationControlCreator getInformationPresenterControlCreator() {
> 		if (ensureHoverCreated()) {
>-			if (fHover instanceof ITextHoverExtension2)
>-				return ((ITextHoverExtension2) fHover).getInformationPresenterControlCreator();
>+			if (fHover instanceof IInformationControlExtension5)
>+				return ((IInformationControlExtension5) fHover).getInformationPresenterControlCreator();
> 			if (fHover instanceof IInformationProviderExtension2) // this is wrong, but left here for backwards compatibility
> 				return ((IInformationProviderExtension2) fHover).getInformationPresenterControlCreator();
> 		}
>Index: src/org/eclipse/cdt/internal/ui/text/c/hover/BestMatchHover.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/BestMatchHover.java,v
>retrieving revision 1.5
>diff -u -r1.5 BestMatchHover.java
>--- src/org/eclipse/cdt/internal/ui/text/c/hover/BestMatchHover.java	20 Mar 2008 16:02:42 -0000	1.5
>+++ src/org/eclipse/cdt/internal/ui/text/c/hover/BestMatchHover.java	25 Mar 2008 21:39:53 -0000
>@@ -16,10 +16,8 @@
> import java.util.Iterator;
> import java.util.List;
> 
>-import org.eclipse.cdt.ui.CUIPlugin;
>-import org.eclipse.cdt.ui.PreferenceConstants;
>-import org.eclipse.cdt.ui.text.c.hover.ICEditorTextHover;
> import org.eclipse.jface.text.IInformationControlCreator;
>+import org.eclipse.jface.text.IInformationControlExtension5;
> import org.eclipse.jface.text.IRegion;
> import org.eclipse.jface.text.ITextHover;
> import org.eclipse.jface.text.ITextHoverExtension;
>@@ -28,6 +26,10 @@
> import org.eclipse.jface.text.information.IInformationProviderExtension2;
> import org.eclipse.ui.IEditorPart;
> 
>+import org.eclipse.cdt.ui.CUIPlugin;
>+import org.eclipse.cdt.ui.PreferenceConstants;
>+import org.eclipse.cdt.ui.text.c.hover.ICEditorTextHover;
>+
> /**
>  * BestMatchHover
>  */
>@@ -157,8 +159,8 @@
> 	 * @since 3.0
> 	 */
> 	public IInformationControlCreator getInformationPresenterControlCreator() {
>-		if (fBestHover instanceof ITextHoverExtension2)
>-			return ((ITextHoverExtension2)fBestHover).getInformationPresenterControlCreator();
>+		if (fBestHover instanceof IInformationControlExtension5)
>+			return ((IInformationControlExtension5)fBestHover).getInformationPresenterControlCreator();
> 		if (fBestHover instanceof IInformationProviderExtension2)
> 			return ((IInformationProviderExtension2)fBestHover).getInformationPresenterControlCreator();
> 
>Index: src/org/eclipse/cdt/internal/ui/text/c/hover/CInformationProvider.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CInformationProvider.java,v
>retrieving revision 1.3
>diff -u -r1.3 CInformationProvider.java
>--- src/org/eclipse/cdt/internal/ui/text/c/hover/CInformationProvider.java	20 Mar 2008 16:02:42 -0000	1.3
>+++ src/org/eclipse/cdt/internal/ui/text/c/hover/CInformationProvider.java	25 Mar 2008 21:39:53 -0000
>@@ -15,6 +15,7 @@
> import org.eclipse.jface.text.DefaultInformationControl;
> import org.eclipse.jface.text.IInformationControl;
> import org.eclipse.jface.text.IInformationControlCreator;
>+import org.eclipse.jface.text.IInformationControlExtension5;
> import org.eclipse.jface.text.IRegion;
> import org.eclipse.jface.text.ITextHoverExtension2;
> import org.eclipse.jface.text.ITextViewer;
>@@ -123,8 +124,8 @@
> 	 * @see IInformationProviderExtension2#getInformationPresenterControlCreator()
> 	 */
> 	public IInformationControlCreator getInformationPresenterControlCreator() {
>-		if (fImplementation instanceof ITextHoverExtension2) {
>-			ITextHoverExtension2 ext2= (ITextHoverExtension2) fImplementation;
>+		if (fImplementation instanceof IInformationControlExtension5) {
>+			IInformationControlExtension5 ext2= (IInformationControlExtension5) fImplementation;
> 			return ext2.getInformationPresenterControlCreator();
> 		}
> 		if (fPresenterControlCreator == null)

Flags:

bjorn.freeman-benson: iplog+

Actions: View | Diff

Attachments on bug 223987: 93501