Attachment 67965 Details for Bug 187265 – fix

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

[patch] fix

fix_187265.txt (text/plain), 3.65 KB, created by Benno Baumgartner

on 2007-05-21 06:50:47 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Benno Baumgartner

Created: 2007-05-21 06:50:47 EDT

Size: 3.65 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.ui
>Index: core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/MemberVisibilityAdjustor.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/MemberVisibilityAdjustor.java,v
>retrieving revision 1.41
>diff -u -r1.41 MemberVisibilityAdjustor.java
>--- core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/MemberVisibilityAdjustor.java	7 Apr 2006 16:51:44 -0000	1.41
>+++ core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/MemberVisibilityAdjustor.java	21 May 2007 10:02:36 -0000
>@@ -16,6 +16,7 @@
> 
> import org.eclipse.core.runtime.Assert;
> import org.eclipse.core.runtime.IProgressMonitor;
>+import org.eclipse.core.runtime.OperationCanceledException;
> import org.eclipse.core.runtime.SubProgressMonitor;
> 
> import org.eclipse.ltk.core.refactoring.CategorizedTextEditGroup;
>@@ -1107,6 +1108,8 @@
> 				adjustment= (IVisibilityAdjustment) fAdjustments.get(member);
> 				if (adjustment != null)
> 					adjustment.rewriteVisibility(this, new SubProgressMonitor(monitor, 1));
>+				if (monitor.isCanceled())
>+					throw new OperationCanceledException();
> 			}
> 		} finally {
> 			fTypeHierarchies.clear();
>Index: core refactoring/org/eclipse/jdt/internal/corext/refactoring/code/IntroduceIndirectionRefactoring.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/code/IntroduceIndirectionRefactoring.java,v
>retrieving revision 1.38
>diff -u -r1.38 IntroduceIndirectionRefactoring.java
>--- core refactoring/org/eclipse/jdt/internal/corext/refactoring/code/IntroduceIndirectionRefactoring.java	12 Jul 2006 14:19:10 -0000	1.38
>+++ core refactoring/org/eclipse/jdt/internal/corext/refactoring/code/IntroduceIndirectionRefactoring.java	21 May 2007 10:02:36 -0000
>@@ -580,6 +580,9 @@
> 				IMethod method= tester.findOverridingMethodInType(subtypes[i], fTargetMethod);
> 				if (method != null && method.exists()) {
> 					result.merge(adjustVisibility(method, neededVisibility, monitor));
>+					if (monitor.isCanceled())
>+						throw new OperationCanceledException();
>+					
> 					if (result.hasError())
> 						return result; // binary
> 				}
>#P org.eclipse.ltk.core.refactoring
>Index: src/org/eclipse/ltk/core/refactoring/PerformChangeOperation.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/PerformChangeOperation.java,v
>retrieving revision 1.16
>diff -u -r1.16 PerformChangeOperation.java
>--- src/org/eclipse/ltk/core/refactoring/PerformChangeOperation.java	25 Oct 2006 08:12:58 -0000	1.16
>+++ src/org/eclipse/ltk/core/refactoring/PerformChangeOperation.java	21 May 2007 10:02:37 -0000
>@@ -14,6 +14,7 @@
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.core.runtime.NullProgressMonitor;
>+import org.eclipse.core.runtime.OperationCanceledException;
> import org.eclipse.core.runtime.SubProgressMonitor;
> import org.eclipse.core.runtime.jobs.ISchedulingRule;
> 
>@@ -206,6 +207,9 @@
> 				pm.beginTask("", 4); //$NON-NLS-1$
> 				pm.subTask(""); //$NON-NLS-1$
> 				fCreateChangeOperation.run(new SubProgressMonitor(pm, 3));
>+				if (pm.isCanceled())
>+					throw new OperationCanceledException();
>+				
> 				fChange= fCreateChangeOperation.getChange();
> 				if (fChange != null) {
> 					executeChange(new SubProgressMonitor(pm, 1));

Actions: View | Diff

Attachments on bug 187265: 67405 | 67409 | 67965