From 268e1ec73502af452b9af123cc6b00e8c2fc6cd7 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Sun, 2 Jan 2011 20:34:21 +0000 Subject: [PATCH] Cosmetics. --- .../ExtractConstantRefactoringRunner.java | 5 ++--- .../ExtractFunctionRefactoringRunner.java | 4 ++-- .../GenerateGettersAndSettersRefactoring.java | 10 ++++++---- .../GenerateGettersAndSettersRefactoringRunner.java | 3 ++- .../hidemethod/HideMethodRefactoringRunner.java | 4 ++-- .../ImplementMethodRefactoringRunner.java | 7 +++---- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoringRunner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoringRunner.java index e101dec2571..6668dd546bd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoringRunner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoringRunner.java @@ -23,11 +23,11 @@ import org.eclipse.cdt.internal.ui.refactoring.RefactoringRunner; /** * @author Emanuel Graf - * */ public class ExtractConstantRefactoringRunner extends RefactoringRunner { - public ExtractConstantRefactoringRunner(IFile file, ISelection selection, IShellProvider shellProvider, ICProject cProject) { + public ExtractConstantRefactoringRunner(IFile file, ISelection selection, + IShellProvider shellProvider, ICProject cProject) { super(file, selection, null, shellProvider, cProject); } @@ -40,7 +40,6 @@ public class ExtractConstantRefactoringRunner extends RefactoringRunner { try { operator.run(shellProvider.getShell(), refactoring.getName()); - } catch (InterruptedException e) { Thread.currentThread().interrupt(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoringRunner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoringRunner.java index 2886c0d747c..f7d0342068d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoringRunner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoringRunner.java @@ -23,11 +23,11 @@ import org.eclipse.cdt.internal.ui.refactoring.RefactoringRunner; /** * @author Emanuel Graf - * */ public class ExtractFunctionRefactoringRunner extends RefactoringRunner { - public ExtractFunctionRefactoringRunner(IFile file, ISelection selection, IShellProvider shellProvider, ICProject cProject) { + public ExtractFunctionRefactoringRunner(IFile file, ISelection selection, + IShellProvider shellProvider, ICProject cProject) { super(file, selection, null, shellProvider, cProject); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersRefactoring.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersRefactoring.java index a2f8dfd6e96..278662ef59f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersRefactoring.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersRefactoring.java @@ -88,12 +88,14 @@ public class GenerateGettersAndSettersRefactoring extends CRefactoring { private final GetterAndSetterContext context = new GetterAndSetterContext(); private InsertLocation definitionInsertLocation; - public GenerateGettersAndSettersRefactoring(IFile file, ISelection selection, ICElement element, ICProject project) { + public GenerateGettersAndSettersRefactoring(IFile file, ISelection selection, ICElement element, + ICProject project) { super(file, selection, element, project); } @Override - public RefactoringStatus checkInitialConditions(IProgressMonitor pm) throws CoreException, OperationCanceledException { + public RefactoringStatus checkInitialConditions(IProgressMonitor pm) + throws CoreException, OperationCanceledException { SubMonitor sm = SubMonitor.convert(pm, 10); RefactoringStatus status = super.checkInitialConditions(sm.newChild(6)); @@ -111,8 +113,8 @@ public class GenerateGettersAndSettersRefactoring extends CRefactoring { } @Override - public RefactoringStatus checkFinalConditions(IProgressMonitor pm) throws CoreException, - OperationCanceledException { + public RefactoringStatus checkFinalConditions(IProgressMonitor pm) + throws CoreException, OperationCanceledException { RefactoringStatus finalStatus = null; try { lockIndex(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersRefactoringRunner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersRefactoringRunner.java index d0dc48ffbb7..08f60ad9bbd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersRefactoringRunner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersRefactoringRunner.java @@ -29,7 +29,8 @@ import org.eclipse.cdt.internal.ui.refactoring.RefactoringRunner; */ public class GenerateGettersAndSettersRefactoringRunner extends RefactoringRunner { - public GenerateGettersAndSettersRefactoringRunner(IFile file, ISelection selection, ICElement elem, IShellProvider shellProvider, ICProject cProject) { + public GenerateGettersAndSettersRefactoringRunner(IFile file, ISelection selection, + ICElement elem, IShellProvider shellProvider, ICProject cProject) { super(file, selection, elem, shellProvider, cProject); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoringRunner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoringRunner.java index d2f277d4f10..848a1079403 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoringRunner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoringRunner.java @@ -24,11 +24,11 @@ import org.eclipse.cdt.internal.ui.refactoring.RefactoringRunner; /** * @author Guido Zgraggen IFS - * */ public class HideMethodRefactoringRunner extends RefactoringRunner { - public HideMethodRefactoringRunner(IFile file, ISelection selection, ICElement element, IShellProvider shellProvider, ICProject cProject) { + public HideMethodRefactoringRunner(IFile file, ISelection selection, ICElement element, + IShellProvider shellProvider, ICProject cProject) { super(file, selection, element, shellProvider, cProject); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ImplementMethodRefactoringRunner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ImplementMethodRefactoringRunner.java index e205505fee9..4376a4ed727 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ImplementMethodRefactoringRunner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ImplementMethodRefactoringRunner.java @@ -25,11 +25,11 @@ import org.eclipse.cdt.internal.ui.refactoring.RefactoringRunner; /** * @author Lukas Felber - * */ public class ImplementMethodRefactoringRunner extends RefactoringRunner { - public ImplementMethodRefactoringRunner(IFile file, ISelection selection, ICElement element, IShellProvider shellProvider, ICProject cProject) { + public ImplementMethodRefactoringRunner(IFile file, ISelection selection, ICElement element, + IShellProvider shellProvider, ICProject cProject) { super(file, selection, element, shellProvider, cProject); } @@ -43,8 +43,7 @@ public class ImplementMethodRefactoringRunner extends RefactoringRunner { refactoring.lockIndex(); try { operator.run(shellProvider.getShell(), refactoring.getName()); - } - finally { + } finally { refactoring.unlockIndex(); } } catch (InterruptedException e) {