MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 23:39:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup, notnull

Browse Source 
GitOrigin-RevId: 3425c365fef32c002ebdbda4e48751c0c771eed9
This commit is contained in:
Alexey Kudravtsev
2023-09-20 15:11:27 +02:00
committed by intellij-monorepo-bot
parent 7696c58fa3
commit d6ec424292
2 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
java/java-analysis-impl/src/com/intellij/codeInspection/ex/EntryPointsManagerBase.java
View File

@@ -91,7 +91,7 @@ public abstract class EntryPointsManagerBase extends EntryPointsManager implemen
}
public static EntryPointsManagerBase getInstance(Project project) {
return (EntryPointsManagerBase)project.getService(EntryPointsManager.class);
return (EntryPointsManagerBase)EntryPointsManager.getInstance(project);
}
@Override
@@ -512,15 +512,10 @@ public abstract class EntryPointsManagerBase extends EntryPointsManager implemen
MetaAnnotationUtil.isMetaAnnotated(owner, defaultAdditionalAnnotations);
}
private static boolean isAcceptedByPattern(@NotNull PsiClass element, @Nullable String qualifiedName, @NotNull ClassPattern pattern, @NotNull Set<? super PsiClass> visited) {
if (qualifiedName == null) {
return false;
}
private static boolean isAcceptedByPattern(@NotNull PsiClass element, @NotNull String qualifiedName, @NotNull ClassPattern pattern, @NotNull Set<? super PsiClass> visited) {
if (qualifiedName.equals(pattern.pattern)) {
return true;
}
Pattern regexp = pattern.getRegexp();
if (regexp != null) {
try {
@@ -534,7 +529,7 @@ public abstract class EntryPointsManagerBase extends EntryPointsManager implemen
if (pattern.hierarchically) {
for (PsiClass superClass : element.getSupers()) {
String superClassQualifiedName = superClass.getQualifiedName();
if (visited.add(superClass) && isAcceptedByPattern(superClass, superClassQualifiedName, pattern, visited)) {
if (visited.add(superClass) && superClassQualifiedName != null && isAcceptedByPattern(superClass, superClassQualifiedName, pattern, visited)) {
return true;
}
}