Attachment #67965 for bug #187265

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

View | Details | Raw Unified | Return to bug 187265
Collapse All | Expand All

Lines 16-21 Link Here

(-)core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/MemberVisibilityAdjustor.java (+3 lines)
16		16
17	import org.eclipse.core.runtime.Assert;	17	import org.eclipse.core.runtime.Assert;
18	import org.eclipse.core.runtime.IProgressMonitor;	18	import org.eclipse.core.runtime.IProgressMonitor;
		19	import org.eclipse.core.runtime.OperationCanceledException;
19	import org.eclipse.core.runtime.SubProgressMonitor;	20	import org.eclipse.core.runtime.SubProgressMonitor;
20		21
21	import org.eclipse.ltk.core.refactoring.CategorizedTextEditGroup;	22	import org.eclipse.ltk.core.refactoring.CategorizedTextEditGroup;
Lines 1107-1112 Link Here
1107	adjustment= (IVisibilityAdjustment) fAdjustments.get(member);	1108	adjustment= (IVisibilityAdjustment) fAdjustments.get(member);
1108	if (adjustment != null)	1109	if (adjustment != null)
1109	adjustment.rewriteVisibility(this, new SubProgressMonitor(monitor, 1));	1110	adjustment.rewriteVisibility(this, new SubProgressMonitor(monitor, 1));
		1111	if (monitor.isCanceled())
		1112	throw new OperationCanceledException();
1110	}	1113	}
1111	} finally {	1114	} finally {
1112	fTypeHierarchies.clear();	1115	fTypeHierarchies.clear();

Lines 580-585 Link Here

(-)core refactoring/org/eclipse/jdt/internal/corext/refactoring/code/IntroduceIndirectionRefactoring.java (+3 lines)
580	IMethod method= tester.findOverridingMethodInType(subtypes[i], fTargetMethod);	580	IMethod method= tester.findOverridingMethodInType(subtypes[i], fTargetMethod);
581	if (method != null && method.exists()) {	581	if (method != null && method.exists()) {
582	result.merge(adjustVisibility(method, neededVisibility, monitor));	582	result.merge(adjustVisibility(method, neededVisibility, monitor));
		583	if (monitor.isCanceled())
		584	throw new OperationCanceledException();
		585
583	if (result.hasError())	586	if (result.hasError())
584	return result; // binary	587	return result; // binary
585	}	588	}

Lines 14-19 Link Here

(-)src/org/eclipse/ltk/core/refactoring/PerformChangeOperation.java (+4 lines)
14	import org.eclipse.core.runtime.CoreException;	14	import org.eclipse.core.runtime.CoreException;
15	import org.eclipse.core.runtime.IProgressMonitor;	15	import org.eclipse.core.runtime.IProgressMonitor;
16	import org.eclipse.core.runtime.NullProgressMonitor;	16	import org.eclipse.core.runtime.NullProgressMonitor;
		17	import org.eclipse.core.runtime.OperationCanceledException;
17	import org.eclipse.core.runtime.SubProgressMonitor;	18	import org.eclipse.core.runtime.SubProgressMonitor;
18	import org.eclipse.core.runtime.jobs.ISchedulingRule;	19	import org.eclipse.core.runtime.jobs.ISchedulingRule;
19		20
Lines 206-211 Link Here
206	pm.beginTask("", 4); //$NON-NLS-1$	207	pm.beginTask("", 4); //$NON-NLS-1$
207	pm.subTask(""); //$NON-NLS-1$	208	pm.subTask(""); //$NON-NLS-1$
208	fCreateChangeOperation.run(new SubProgressMonitor(pm, 3));	209	fCreateChangeOperation.run(new SubProgressMonitor(pm, 3));
		210	if (pm.isCanceled())
		211	throw new OperationCanceledException();
		212
209	fChange= fCreateChangeOperation.getChange();	213	fChange= fCreateChangeOperation.getChange();
210	if (fChange != null) {	214	if (fChange != null) {
211	executeChange(new SubProgressMonitor(pm, 1));	215	executeChange(new SubProgressMonitor(pm, 1));

Return to bug 187265