Attachment 181296 Details for Bug 325437 – patch

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

[patch] patch

RenameMethodPatch.txt (text/plain), 2.65 KB, created by Petya Sabeva

on 2010-10-20 10:49:53 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Petya Sabeva

Created: 2010-10-20 10:49:53 EDT

Size: 2.65 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.ui
>Index: core refactoring/org/eclipse/jdt/internal/corext/refactoring/rename/RenameVirtualMethodProcessor.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/rename/RenameVirtualMethodProcessor.java,v
>retrieving revision 1.37
>diff -u -r1.37 RenameVirtualMethodProcessor.java
>--- core refactoring/org/eclipse/jdt/internal/corext/refactoring/rename/RenameVirtualMethodProcessor.java	11 Sep 2008 11:59:50 -0000	1.37
>+++ core refactoring/org/eclipse/jdt/internal/corext/refactoring/rename/RenameVirtualMethodProcessor.java	20 Oct 2010 14:22:58 -0000
>@@ -25,6 +25,7 @@
> import org.eclipse.ltk.core.refactoring.RefactoringStatusContext;
> import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
> 
>+import org.eclipse.jdt.core.IJavaProject;
> import org.eclipse.jdt.core.IMethod;
> import org.eclipse.jdt.core.IType;
> import org.eclipse.jdt.core.ITypeHierarchy;
>@@ -93,10 +94,10 @@
> 		return fOriginalMethod;
> 	}
> 
>-	private ITypeHierarchy getCachedHierarchy(IType declaring, IProgressMonitor monitor) throws JavaModelException {
>+	private ITypeHierarchy getCachedHierarchy(IJavaProject javaProject, IType declaring, IProgressMonitor monitor) throws JavaModelException {
> 		if (fCachedHierarchy != null && declaring.equals(fCachedHierarchy.getType()))
> 			return fCachedHierarchy;
>-		fCachedHierarchy= declaring.newTypeHierarchy(new SubProgressMonitor(monitor, 1));
>+		fCachedHierarchy= declaring.newTypeHierarchy(javaProject, (new SubProgressMonitor(monitor, 1)));
> 		return fCachedHierarchy;
> 	}
> 
>@@ -119,8 +120,9 @@
> 
> 				ITypeHierarchy hierarchy= null;
> 				IType declaringType= method.getDeclaringType();
>+				IJavaProject javaProject = declaringType.getJavaProject();
> 				if (!declaringType.isInterface())
>-					hierarchy= getCachedHierarchy(declaringType, new SubProgressMonitor(monitor, 1));
>+					hierarchy= getCachedHierarchy(javaProject, declaringType, new SubProgressMonitor(monitor, 1));
> 
> 				IMethod topmost= getMethod();
> 				if (MethodChecks.isVirtual(topmost))
>@@ -146,7 +148,8 @@
> 
> 			final IMethod method= getMethod();
> 			final IType declaring= method.getDeclaringType();
>-			final ITypeHierarchy hierarchy= getCachedHierarchy(declaring, new SubProgressMonitor(pm, 1));
>+			IJavaProject javaProject = declaring.getJavaProject();
>+			final ITypeHierarchy hierarchy= getCachedHierarchy(javaProject, declaring, new SubProgressMonitor(pm, 1));
> 			final String name= getNewElementName();
> 			if (declaring.isInterface()) {
> 				if (isSpecialCase())

Actions: View | Diff

Attachments on bug 325437: 179020 | 181296