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

Provide a meaningful message if CRefactoring.checkInitialConditions() find an Error

Browse source
This commit is contained in:
Emanuel Graf 2009-11-05 09:51:55 +00:00
parent 6efa4eac63
commit 8b299df1e4
4 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractconstant/ExtractConstantRefactoring.java
View file

@ -99,7 +99,10 @@ public class ExtractConstantRefactoring extends CRefactoring {
try { try {
lockIndex(); lockIndex();
try { try {
super.checkInitialConditions(sm.newChild(6)); RefactoringStatus status = super.checkInitialConditions(sm.newChild(6));
if(status.hasError()) {
return status;
}
Collection<IASTLiteralExpression> literalExpressionCollection = findAllLiterals(); Collection<IASTLiteralExpression> literalExpressionCollection = findAllLiterals();
if(literalExpressionCollection.isEmpty()){ if(literalExpressionCollection.isEmpty()){

5
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoring.java
View file

@ -156,7 +156,10 @@ public class ExtractFunctionRefactoring extends CRefactoring {
lockIndex(); lockIndex();
try { try {
super.checkInitialConditions(sm.newChild(6)); RefactoringStatus status = super.checkInitialConditions(sm.newChild(6));
if(status.hasError()) {
return status;
}
container = findExtractableNodes(); container = findExtractableNodes();
sm.worked(1); sm.worked(1);

5
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoring.java
View file

@ -97,7 +97,10 @@ public class ExtractLocalVariableRefactoring extends CRefactoring {
try { try {
lockIndex(); lockIndex();
try { try {
super.checkInitialConditions(sm.newChild(6)); RefactoringStatus status = super.checkInitialConditions(sm.newChild(6));
if(status.hasError()) {
return status;
}
container = findAllExpressions(); container = findAllExpressions();
if (container.size() < 1) { if (container.size() < 1) {

5
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersRefactoring.java
View file

@ -99,7 +99,10 @@ public class GenerateGettersAndSettersRefactoring extends CRefactoring {
public RefactoringStatus checkInitialConditions(IProgressMonitor pm) throws CoreException, OperationCanceledException { public RefactoringStatus checkInitialConditions(IProgressMonitor pm) throws CoreException, OperationCanceledException {
SubMonitor sm = SubMonitor.convert(pm, 10); 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()) { if(!initStatus.hasFatalError()) {