mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-20 06:35:50 +02:00
Code Issues Wiki Activity

Bug 333839 - NPE opening Rename refactoring dialog.

Browse source
This commit is contained in:
Sergey Prigogin 2011-10-17 20:10:15 -07:00
parent 806b1a45b0
commit 9bf0315622
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameSupport.java
View file

@ -191,7 +191,11 @@ public class RenameSupport {
CRenameProcessor processor = (CRenameProcessor) refactoring.getProcessor(); CRenameProcessor processor = (CRenameProcessor) refactoring.getProcessor();
processor.lockIndex(); processor.lockIndex();
try { try {
processor.checkInitialConditions(new NullProgressMonitor()); RefactoringStatus status = processor.checkInitialConditions(new NullProgressMonitor());
if (status.hasFatalError()) {
showInformation(shell, status);
return DialogResult.CANCELED;
}
if (starter.activate(wizard, shell, RenameMessages.CRefactory_title_rename, if (starter.activate(wizard, shell, RenameMessages.CRefactory_title_rename,
processor.getSaveMode())) { processor.getSaveMode())) {
return DialogResult.OK; return DialogResult.OK;
@ -298,7 +302,7 @@ public class RenameSupport {
} }
} }
private void showInformation(Shell parent, RefactoringStatus status) { private static void showInformation(Shell parent, RefactoringStatus status) {
String message= status.getMessageMatchingSeverity(RefactoringStatus.FATAL); String message= status.getMessageMatchingSeverity(RefactoringStatus.FATAL);
MessageDialog.openInformation(parent, RenameMessages.RenameSupport_dialog_title, message); MessageDialog.openInformation(parent, RenameMessages.RenameSupport_dialog_title, message);
} }