mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2011-04-18 17:15:32 +00:00
parent eb7b349013
commit 0f416da87c
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ImplementMethodRefactoringWizard.java
View file

@ -24,24 +24,23 @@ import org.eclipse.cdt.ui.CUIPlugin;
/**
* @author Mirko Stocker
*
*/
public class ImplementMethodRefactoringWizard extends RefactoringWizard {
private final ImplementMethodRefactoring refactoring;
private Map<MethodToImplementConfig, ParameterNamesInputPage>pagesMap = new HashMap<MethodToImplementConfig, ParameterNamesInputPage>();
private final ImplementMethodRefactoring refactoring;
private Map<MethodToImplementConfig, ParameterNamesInputPage>pagesMap =
new HashMap<MethodToImplementConfig, ParameterNamesInputPage>();
public ImplementMethodRefactoringWizard(ImplementMethodRefactoring refactoring) {
super(refactoring, WIZARD_BASED_USER_INTERFACE);
this.refactoring = refactoring;
}
super(refactoring, WIZARD_BASED_USER_INTERFACE);
this.refactoring = refactoring;
}
@Override
protected void addUserInputPages() {
addPage(new ImplementMethodInputPage(refactoring.getRefactoringData(), this));
ImplementMethodData data = refactoring.getRefactoringData();
for (MethodToImplementConfig config : data.getMethodDeclarations()) {
if(config.getParaHandler().needsAdditionalArgumentNames()) {
if (config.getParaHandler().needsAdditionalArgumentNames()) {
ParameterNamesInputPage page = new ParameterNamesInputPage(config, this);
pagesMap.put(config, page);
addPage(page);
@ -54,11 +53,12 @@ public class ImplementMethodRefactoringWizard extends RefactoringWizard {
}
/**
* - When cancelling the wizard, RefactoringASTCache gets disposed and releases the lock on the index but
* the preview jobs might still be running and access the index or an index based AST so we need to make sure they
* are done before disposing the cache
* - When proceeding to the last page and finishing the wizard, the
* refactoring will run and possibly use concurrently the same ASTs that the jobs use, so we need to make
* When canceling the wizard, RefactoringASTCache gets disposed and releases the lock on
* the index but the preview jobs might still be running and access the index or an index-based
* AST so we need to make sure they are done before disposing the cache
* <p>
* When proceeding to the last page and finishing the wizard, the refactoring will run
* and possibly use concurrently the same ASTs that the jobs use, so we need to make
* sure the jobs are joined.
*/
protected void cancelAndJoinPreviewJobs() {
@ -67,13 +67,14 @@ public class ImplementMethodRefactoringWizard extends RefactoringWizard {
isOnePreviewJobRunning |= parameterNamesInputPage.cancelPreviewJob();
}
// There are good chances that one job is still running, show a progress bar to the user, join everything
if(isOnePreviewJobRunning) {
// There are good chances that one job is still running, show a progress bar to the user,
// join everything.
if (isOnePreviewJobRunning) {
try {
getContainer().run(false, false, new IRunnableWithProgress() {
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
monitor.beginTask(Messages.ImplementMethodRefactoringWizard_CancelingPreviewGeneration, pagesMap.size() + 1);
monitor.beginTask(Messages.ImplementMethodRefactoringWizard_CancelingPreviewGeneration,
pagesMap.size() + 1);
monitor.worked(1);
for (ParameterNamesInputPage parameterNamesInputPage : pagesMap.values()) {
@ -89,10 +90,9 @@ public class ImplementMethodRefactoringWizard extends RefactoringWizard {
} catch (InterruptedException e) {
// ignore since not cancelable
}
}
// We don't take any chances, we still join everything. But there are good chances that the jobs are stopped
// so we don't show a progress bar.
else {
} else {
// We don't take any chances, we still join everything. But there are good chances that
// the jobs are stopped so we don't show a progress bar.
for (ParameterNamesInputPage parameterNamesInputPage : pagesMap.values()) {
parameterNamesInputPage.joinPreviewJob();
}