From 2b26b067472e2ac997b71f70cc38a5b8b44aa62f Mon Sep 17 00:00:00 2001 From: Hoda Amer Date: Thu, 17 Jun 2004 15:28:42 +0000 Subject: [PATCH] Bug Fixing --- core/org.eclipse.cdt.ui/ChangeLog | 3 +++ .../eclipse/cdt/internal/corext/refactoring/Checks.java | 5 ++++- .../internal/corext/refactoring/refactoring.properties | 3 ++- .../refactoring/rename/RenameElementProcessor.java | 9 +++------ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index 968c208549d..edab1b29f57 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,6 @@ +2004-06-17 Hoda Amer + Fix for PR 63933: [Refactoring] compilation errors does not prevent rename refactoring + 2004-06-16 Hoda Amer Fix for PR 66730: [Refactoring] Renaming a class does not change .cpp file. Fix for PR 61045: [Accessibility] Code Templates Preview box has no MSAA name diff --git a/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/corext/refactoring/Checks.java b/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/corext/refactoring/Checks.java index bb16e1bee0b..68f572e6eb0 100644 --- a/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/corext/refactoring/Checks.java +++ b/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/corext/refactoring/Checks.java @@ -175,7 +175,7 @@ public class Checks { if (tu == null) return RefactoringStatus.createFatalErrorStatus(RefactoringCoreMessages.getString("Checks.cu_not_created")); //$NON-NLS-1$ else if (! tu.isStructureKnown()) - return RefactoringStatus.createErrorStatus(RefactoringCoreMessages.getString("Checks.cu_not_parsed")); //$NON-NLS-1$ + return RefactoringStatus.createFatalErrorStatus(RefactoringCoreMessages.getString("Checks.cu_not_parsed")); //$NON-NLS-1$ return new RefactoringStatus(); } //-------- validateEdit checks ---- @@ -227,6 +227,9 @@ public class Checks { if ((!wasEmpty) && result.isEmpty()) status.addFatalError(RefactoringCoreMessages.getString("Checks.all_excluded")); //$NON-NLS-1$ + else if (result.isEmpty()){ + status.addFatalError(RefactoringCoreMessages.getString("Checks.no_files")); + } return (SearchResultGroup[])result.toArray(new SearchResultGroup[result.size()]); } diff --git a/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/corext/refactoring/refactoring.properties b/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/corext/refactoring/refactoring.properties index 5f0e4cdb9e0..8d814b0885c 100644 --- a/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/corext/refactoring/refactoring.properties +++ b/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/corext/refactoring/refactoring.properties @@ -34,6 +34,7 @@ Checks.constructor_name= If you proceed, the method {0} in ''{1}'' will have a c Checks.method_names_lowercase=This name is discouraged. According to convention, names of methods should start with lowercase letters Checks.error.InvalidClassName=Class name is not valid. {0} Checks.warning.ClassNameDiscouraged=Class name is discouraged. {0} +Checks.no_files=No files are found. ####################################### # org.eclipse.jdt.internal.core.refactoring.base @@ -346,7 +347,7 @@ RenameTypeRefactoring.member_type=Member Type declared inside ''{0}'' is named { RenameTypeRefactoring.another_type=Another type named ''{0} is referenced in ''{1}'' RenameTypeRefactoring.wrong_element=Rename refactoring does not handle this type of element. RenameTypeRefactoring.virtual_method=Renaming a virtual method. Consider renaming the base and derived class methods (if any). -RenameTypeRefactoring.no_files=No files are found. + TextMatchFinder.comment=text reference update in a comment diff --git a/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/corext/refactoring/rename/RenameElementProcessor.java b/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/corext/refactoring/rename/RenameElementProcessor.java index 85d603eedf0..fd8312463cc 100644 --- a/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/corext/refactoring/rename/RenameElementProcessor.java +++ b/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/corext/refactoring/rename/RenameElementProcessor.java @@ -317,13 +317,10 @@ public class RenameElementProcessor extends RenameProcessor implements IReferenc pm.setTaskName(RefactoringCoreMessages.getString("RenameTypeRefactoring.checking")); //$NON-NLS-1$ if (pm.isCanceled()) throw new OperationCanceledException(); - - if (fReferences.length == 0){ - result.addFatalError(RefactoringCoreMessages.getString("RenameTypeRefactoring.no_files")); - } - + if (result.hasFatalError()) - return result; + return result; + // more checks go here fChangeManager= createChangeManager(new SubProgressMonitor(pm, 35)); pm.worked(5);