Attachment #161020 for bug #283427

Lines 2-8 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %pluginName	3	Bundle-Name: %pluginName
4	Bundle-SymbolicName: org.eclipse.ltk.ui.refactoring; singleton:=true	4	Bundle-SymbolicName: org.eclipse.ltk.ui.refactoring; singleton:=true
5	Bundle-Version: 3.4.200.qualifier	5	Bundle-Version: 3.5.0.qualifier
6	Bundle-Activator: org.eclipse.ltk.internal.ui.refactoring.RefactoringUIPlugin	6	Bundle-Activator: org.eclipse.ltk.internal.ui.refactoring.RefactoringUIPlugin
7	Bundle-ActivationPolicy: lazy	7	Bundle-ActivationPolicy: lazy
8	Bundle-Vendor: %providerName	8	Bundle-Vendor: %providerName

Lines 1-5 Link Here

(-)src/org/eclipse/ltk/ui/refactoring/RefactoringWizard.java (-3 / +19 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 157-162 Link Here
157	private boolean fForcePreviewReview;	157	private boolean fForcePreviewReview;
158	private boolean fPreviewShown;	158	private boolean fPreviewShown;
159		159
		160	private IRunnableContext fRunnableContext;
		161
160	/**	162	/**
161	* Creates a new refactoring wizard for the given refactoring.	163	* Creates a new refactoring wizard for the given refactoring.
162	*	164	*
Lines 398-408 Link Here
398	if (hasUserInput())	400	if (hasUserInput())
399	return super.getStartingPage();	401	return super.getStartingPage();
400		402
		403	IRunnableContext context= fRunnableContext != null ? fRunnableContext : PlatformUI.getWorkbench().getActiveWorkbenchWindow();
401	/*	404	/*
402	* XXX: Can return null if there's no user input page and change creation has been cancelled.	405	* XXX: Can return null if there's no user input page and change creation has been cancelled.
403	* The only way to avoid this would be setChangeCreationCancelable(true).	406	* The only way to avoid this would be setChangeCreationCancelable(false).
404	*/	407	*/
405	return computeUserInputSuccessorPage(null, PlatformUI.getWorkbench().getActiveWorkbenchWindow());	408	return computeUserInputSuccessorPage(null, context);
		409	}
		410
		411	/**
		412	* Sets the runnable context that will be used to computing refactoring conditions and change
		413	* while the refactoring dialog is not yet shown. The default is to use the active workbench
		414	* window.
		415	*
		416	* @param context a runnable context, or <code>null</code> to re-set the default
		417	*
		418	* @since 3.5
		419	*/
		420	public void setInitialComputationContext(IRunnableContext context) {
		421	fRunnableContext= context;
406	}	422	}
407		423
408	/**	424	/**




/*******************************************************************************
 * Copyright (c) 2000, 2010 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.operation.IRunnableContext;
import org.eclipse.jface.window.Window;
import org.eclipse.jface.wizard.IWizardContainer;


	 *  the user.
	 */
	public int run(final Shell parent, final String dialogTitle) throws InterruptedException {
		return run(parent, dialogTitle, null);
	}
	
	/**
	 * Opens the refactoring dialog for the refactoring wizard passed to the constructor.
	 * The method first checks the initial conditions of the refactoring. If the condition
	 * checking returns a status with a severity of {@link RefactoringStatus#FATAL} then
	 * a message dialog is opened containing the corresponding status message. No wizard
	 * dialog is opened in this situation. If the condition checking passes then the
	 * refactoring dialog is opened.
	 * <p>
	 * The methods ensures that the workspace lock is held while the condition checking,
	 * change creation and change execution is performed. Clients can't make any assumption
	 * about the thread in which these steps are executed. However the framework ensures
	 * that the workspace lock is transfered to the thread in which the execution of the
	 * steps takes place.
	 * </p>
	 * @param parent the parent shell for the dialog or <code>null</code> if the dialog
	 *  is a top level dialog
	 * @param dialogTitle the dialog title of the message box presenting the failed
	 *  condition check (if any)
	 * @param context the runnable context to use for conditions checking before the
	 *  refactoring wizard dialog is visible. If <code>null</code>, the workbench window's
	 *  progress service is used.  
	 *
	 * @return {@link #INITIAL_CONDITION_CHECKING_FAILED} if the initial condition checking
	 *  failed and no wizard dialog was presented. Otherwise either {@link IDialogConstants#OK_ID}
	 *  or {@link IDialogConstants#CANCEL_ID} is returned depending on whether the user
	 *  has pressed the OK or cancel button on the wizard dialog.
	 *
	 * @throws InterruptedException if the initial condition checking got canceled by
	 *  the user.
	 *  
	 * @since 3.5
	 */
	public int run(final Shell parent, final String dialogTitle, final IRunnableContext context) throws InterruptedException {
		Assert.isNotNull(dialogTitle);
		final Refactoring refactoring= fWizard.getRefactoring();
		final IJobManager manager= Job.getJobManager();

					manager.beginRule(ResourcesPlugin.getWorkspace().getRoot(), null);

					refactoring.setValidationContext(parent);
					fInitialConditions= checkInitialConditions(refactoring, parent, dialogTitle, context);
					if (fInitialConditions.hasFatalError()) {
						String message= fInitialConditions.getMessageMatchingSeverity(RefactoringStatus.FATAL);
						MessageDialog.openInformation(parent, dialogTitle, message);


	//---- private helper methods -----------------------------------------------------------------

	private RefactoringStatus checkInitialConditions(Refactoring refactoring, Shell parent, String title, IRunnableContext context) throws InterruptedException {
		try {
			CheckConditionsOperation cco= new CheckConditionsOperation(refactoring, CheckConditionsOperation.INITIAL_CONDITONS);
			WorkbenchRunnableAdapter workbenchRunnableAdapter= new WorkbenchRunnableAdapter(cco, ResourcesPlugin.getWorkspace().getRoot());
			if (context == null) {
				PlatformUI.getWorkbench().getProgressService().busyCursorWhile(workbenchRunnableAdapter);
			} else if (context instanceof IProgressService) {
				((IProgressService) context).busyCursorWhile(workbenchRunnableAdapter);
			} else {
				context.run(true, true, workbenchRunnableAdapter);
			}
			return cco.getStatus();
		} catch (InvocationTargetException e) {
			ExceptionHandler.handle(e, parent, title,

Return to bug 283427