From 8b299df1e4e655a1039a689437f807e3ff283634 Mon Sep 17 00:00:00 2001 From: Emanuel Graf Date: Thu, 5 Nov 2009 09:51:55 +0000 Subject: [PATCH] Provide a meaningful message if CRefactoring.checkInitialConditions() find an Error --- .../extractconstant/ExtractConstantRefactoring.java | 5 ++++- .../extractfunction/ExtractFunctionRefactoring.java | 5 ++++- .../ExtractLocalVariableRefactoring.java | 5 ++++- .../GenerateGettersAndSettersRefactoring.java | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoring.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoring.java index 398db84af8f..018f2bd5aca 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoring.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoring.java @@ -99,7 +99,10 @@ public class ExtractConstantRefactoring extends CRefactoring { try { lockIndex(); try { - super.checkInitialConditions(sm.newChild(6)); + RefactoringStatus status = super.checkInitialConditions(sm.newChild(6)); + if(status.hasError()) { + return status; + } Collection literalExpressionCollection = findAllLiterals(); if(literalExpressionCollection.isEmpty()){ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoring.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoring.java index 7f4efb8620c..f5f05d9b3a6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoring.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoring.java @@ -156,7 +156,10 @@ public class ExtractFunctionRefactoring extends CRefactoring { lockIndex(); try { - super.checkInitialConditions(sm.newChild(6)); + RefactoringStatus status = super.checkInitialConditions(sm.newChild(6)); + if(status.hasError()) { + return status; + } container = findExtractableNodes(); sm.worked(1); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoring.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoring.java index 790506449e8..eca1a2c0914 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoring.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoring.java @@ -97,7 +97,10 @@ public class ExtractLocalVariableRefactoring extends CRefactoring { try { lockIndex(); try { - super.checkInitialConditions(sm.newChild(6)); + RefactoringStatus status = super.checkInitialConditions(sm.newChild(6)); + if(status.hasError()) { + return status; + } container = findAllExpressions(); if (container.size() < 1) { 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 02b0acc19ab..1e4aff4f2c4 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 @@ -99,7 +99,10 @@ public class GenerateGettersAndSettersRefactoring extends CRefactoring { public RefactoringStatus checkInitialConditions(IProgressMonitor pm) throws CoreException, OperationCanceledException { SubMonitor sm = SubMonitor.convert(pm, 10); - super.checkInitialConditions(sm.newChild(6)); + RefactoringStatus status = super.checkInitialConditions(sm.newChild(6)); + if(status.hasError()) { + return status; + } if(!initStatus.hasFatalError()) {