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

EA-43312 - NPE: ClassUtil.getJVMClassName

Browse Source
This commit is contained in:
peter
2013-01-31 18:26:48 +01:00
parent d9050f29b4
commit 8da8ca06ca
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java
+1 -1
View File
@@ -106,7 +106,7 @@ public class JavaExecutionUtil {
}
@Nullable
public static String getRuntimeQualifiedName(final PsiClass aClass) {
public static String getRuntimeQualifiedName(@NotNull final PsiClass aClass) {
return ClassUtil.getJVMClassName(aClass);
}
java/java-psi-api/src/com/intellij/psi/util/ClassUtil.java
+1 -1
View File
@@ -244,7 +244,7 @@ public class ClassUtil {
}
@Nullable
public static String getJVMClassName(PsiClass aClass) {
public static String getJVMClassName(@NotNull PsiClass aClass) {
final PsiClass containingClass = aClass.getContainingClass();
if (containingClass != null) {
String parentName = getJVMClassName(containingClass);
plugins/testng/src/com/theoryinpractice/testng/model/TestData.java
+2 -1
View File
@@ -239,7 +239,8 @@ public class TestData implements Cloneable
element = PsiTreeUtil.getParentOfType(element, PsiModifierListOwner.class, false);
if (element instanceof PsiMethod && TEST_OBJECT.equals(TestType.METHOD.getType())) {
final PsiClass aClass = ((PsiMethod) element).getContainingClass();
return Comparing.strEqual(MAIN_CLASS_NAME, JavaExecutionUtil.getRuntimeQualifiedName(aClass)) &&
return aClass != null &&
Comparing.strEqual(MAIN_CLASS_NAME, JavaExecutionUtil.getRuntimeQualifiedName(aClass)) &&
Comparing.strEqual(METHOD_NAME, ((PsiMethod) element).getName());
} else if (element instanceof PsiClass && TEST_OBJECT.equals(TestType.CLASS.getType())) {
return Comparing.strEqual(MAIN_CLASS_NAME, JavaExecutionUtil.getRuntimeQualifiedName((PsiClass) element));