@Nullable

This commit is contained in:
Roman Shevchenko
2011-03-11 21:12:41 +01:00
parent 9e9a610c40
commit bb5b499383
2 changed files with 6 additions and 3 deletions
@@ -15,10 +15,12 @@
*/
package com.intellij.psi.impl;
import com.intellij.psi.*;
import com.intellij.psi.PsiVariable;
import org.jetbrains.annotations.Nullable;
import java.util.Set;
public interface PsiVariableEx extends PsiVariable{
public interface PsiVariableEx extends PsiVariable {
@Nullable
Object computeConstantValue(Set<PsiVariable> visitedVars);
}
@@ -154,7 +154,8 @@ public class ClsFieldImpl extends ClsRepositoryPsiElement<PsiFieldStub> implemen
PsiExpression initializer = getInitializer();
if (initializer == null) return null;
final String qName = getContainingClass().getQualifiedName();
final PsiClass containingClass = getContainingClass();
final String qName = containingClass != null ? containingClass.getQualifiedName() : null;
if ("java.lang.Float".equals(qName)) {
@NonNls final String name = getName();
if ("POSITIVE_INFINITY".equals(name)) return new Float(Float.POSITIVE_INFINITY);