mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-05 16:56:04 +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 b01c9ad0cd
commit 9452859ec8
2 changed files with 6 additions and 7 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/rename/CRenameProcessor.java
View file

@ -42,8 +42,6 @@ import org.eclipse.cdt.core.index.IIndex;
import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.internal.ui.refactoring.RefactoringSaveHelper;
/** /**
* This is the processor used for the rename. It decides which of the delegates to * This is the processor used for the rename. It decides which of the delegates to
* use and forwards further calls to the delegate. * use and forwards further calls to the delegate.
@ -334,9 +332,6 @@ public class CRenameProcessor extends RenameProcessor {
* @return a save mode from {@link org.eclipse.cdt.internal.ui.refactoring.RefactoringSaveHelper} * @return a save mode from {@link org.eclipse.cdt.internal.ui.refactoring.RefactoringSaveHelper}
*/ */
public int getSaveMode() { public int getSaveMode() {
if (fDelegate == null) {
return RefactoringSaveHelper.SAVE_NOTHING;
}
return fDelegate.getSaveMode(); return fDelegate.getSaveMode();
} }

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);
} }