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-25738

Browse Source
This commit is contained in:
Alexey Kudravtsev
2011-03-25 11:10:01 +03:00
parent c4d9ee9882
commit d82a84224e
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/usageView/src/com/intellij/usages/impl/rules/FileGroupingRule.java
+7 -8
View File
@@ -50,8 +50,9 @@ public class FileGroupingRule implements UsageGroupingRule {
}
public UsageGroup groupUsage(Usage usage) {
if (usage instanceof UsageInFile) {
return new FileUsageGroup(myProject, ((UsageInFile)usage).getFile());
VirtualFile virtualFile;
if (usage instanceof UsageInFile && (virtualFile = ((UsageInFile)usage).getFile()) != null) {
return new FileUsageGroup(myProject, virtualFile);
}
return null;
}
@@ -62,7 +63,7 @@ public class FileGroupingRule implements UsageGroupingRule {
private String myPresentableName;
private ComputableIcon myIcon;
public FileUsageGroup(Project project, VirtualFile file) {
public FileUsageGroup(@NotNull Project project, @NotNull VirtualFile file) {
myProject = project;
myFile = file instanceof VirtualFileWindow ? ((VirtualFileWindow)file).getDelegate() : file;
myPresentableName = myFile.getName();
@@ -91,13 +92,11 @@ public class FileGroupingRule implements UsageGroupingRule {
final FileUsageGroup fileUsageGroup = (FileUsageGroup)o;
if (myFile != null ? !myFile.equals(fileUsageGroup.myFile) : fileUsageGroup.myFile != null) return false;
return true;
return myFile.equals(fileUsageGroup.myFile);
}
public int hashCode() {
return myFile != null ? myFile.hashCode() : 0;
return myFile.hashCode();
}
public Icon getIcon(boolean isOpen) {
@@ -145,7 +144,7 @@ public class FileGroupingRule implements UsageGroupingRule {
@Nullable
public PsiFile getPsiFile() {
return myFile != null && myFile.isValid() ? PsiManager.getInstance(myProject).findFile(myFile) : null;
return myFile.isValid() ? PsiManager.getInstance(myProject).findFile(myFile) : null;
}
@NotNull