mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-27 02:45:32 +02:00
Code Issues Wiki Activity

Fixes a NPE, bug 294797.

Browse source
This commit is contained in:
Markus Schorn 2009-11-12 18:09:50 +00:00
parent 18c73ee0f5
commit c3d24bd1b4
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/ASTManager.java
View file

@ -94,6 +94,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPNamespaceScope;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPReferenceType; import org.eclipse.cdt.core.dom.ast.cpp.ICPPReferenceType;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateTypeParameter; import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateTypeParameter;
import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.index.IIndex;
import org.eclipse.cdt.core.index.IIndexName;
import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.model.ITranslationUnit;
@ -394,7 +395,10 @@ public class ASTManager {
try { try {
if (s1 instanceof IIndexScope) { if (s1 instanceof IIndexScope) {
IIndexScope indexScope= (IIndexScope) s1; IIndexScope indexScope= (IIndexScope) s1;
name= indexScope.getScopeName().toString(); final IIndexName scopeName = indexScope.getScopeName();
if (scopeName != null) {
name= scopeName.toString();
}
} else { } else {
name= getNameOrNull(ASTInternal.getPhysicalNodeOfScope(s1)); name= getNameOrNull(ASTInternal.getPhysicalNodeOfScope(s1));
} }