MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

NPE

Browse Source
This commit is contained in:
anna
2010-08-09 18:54:31 +04:00
parent f981dac24b
commit a97f796ed0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java
+1 -1
View File
@@ -400,7 +400,7 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase
return RefactoringUtil.getTypeByExpressionWithExpectedType(expr);
}
public PsiClass getParentClass(PsiExpression initializerExpression) {
public PsiClass getParentClass(@NotNull PsiExpression initializerExpression) {
PsiElement element = initializerExpression.getUserData(ElementToWorkOn.PARENT);
if (element == null) element = initializerExpression.getParent();
PsiElement parent = element;
java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantHandler.java
+2 -2
View File
@@ -161,7 +161,7 @@ public class IntroduceConstantHandler extends BaseExpressionToFieldHandler {
@Nullable
private PsiElement isStaticFinalInitializer(PsiExpression expr) {
PsiClass parentClass = getParentClass(expr);
PsiClass parentClass = expr != null ? getParentClass(expr) : null;
if (parentClass == null) return null;
IsStaticFinalInitializerExpression visitor = new IsStaticFinalInitializerExpression(parentClass, expr);
expr.accept(visitor);
@@ -212,7 +212,7 @@ public class IntroduceConstantHandler extends BaseExpressionToFieldHandler {
}
}
public PsiClass getParentClass(PsiExpression initializerExpression) {
public PsiClass getParentClass(@NotNull PsiExpression initializerExpression) {
final PsiType type = initializerExpression.getType();
if (type != null && PsiUtil.isConstantExpression(initializerExpression)) {