EA-73499 - NPE: JavaFxClassBackedElementDescriptor.validate

This commit is contained in:
Anna Kozlova
2015-09-25 21:33:39 +03:00
parent 90b875488b
commit e61ac144da
2 changed files with 2 additions and 2 deletions
@@ -473,7 +473,7 @@ public class JavaFxPsiUtil {
});
}
public static String isClassAcceptable(@Nullable XmlTag parentTag, final PsiClass aClass) {
public static String isClassAcceptable(@Nullable XmlTag parentTag, @Nullable final PsiClass aClass) {
if (parentTag == null) {
return null;
}
@@ -369,7 +369,7 @@ public class JavaFxClassBackedElementDescriptor implements XmlElementDescriptor,
}
PsiClass aClass = myPsiClass;
final XmlAttribute constAttr = context.getAttribute(FxmlConstants.FX_CONSTANT);
if (constAttr != null) {
if (constAttr != null && aClass != null) {
final PsiField constField = aClass.findFieldByName(constAttr.getValue(), false);
if (constField != null) {
aClass = PsiUtil.resolveClassInType(constField.getType());