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

BaseExternalAnnotationsManager.getFQN() receives PsiFile instead of VirtualFile. Removed "fromVirtualFile" parameter dragged over several methods.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-08-24 19:12:14 +04:00
parent a6b4109b1e
commit 8e44a9d83e
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-api/src/com/intellij/codeInsight/BaseExternalAnnotationsManager.java
+3 -2
View File
@@ -56,7 +56,8 @@ public abstract class BaseExternalAnnotationsManager extends ExternalAnnotations
}
@Nullable
protected static String getFQN(String packageName, @Nullable VirtualFile virtualFile) {
protected static String getFQN(@NotNull String packageName, @NotNull PsiFile psiFile) {
VirtualFile virtualFile = psiFile.getVirtualFile();
if (virtualFile == null) return null;
return StringUtil.getQualifiedName(packageName, virtualFile.getNameWithoutExtension());
}
@@ -227,7 +228,7 @@ public abstract class BaseExternalAnnotationsManager extends ExternalAnnotations
final PsiJavaFile javaFile = (PsiJavaFile)containingFile;
final String packageName = javaFile.getPackageName();
final VirtualFile virtualFile = containingFile.getVirtualFile();
String fqn = getFQN(packageName, virtualFile);
String fqn = getFQN(packageName, containingFile);
if (fqn == null) return null;
final List<PsiFile> files = myExternalAnnotations.get(fqn);
if (files == NULL) return null;