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

EA-26689 - NPE: PackageElement.getRoots

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-04-06 16:38:52 +02:00
parent a7d7d5bd95
commit 15a33f79a8
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageElement.java
+13 -8
View File
@@ -21,11 +21,15 @@ import com.intellij.openapi.module.Module;
import com.intellij.openapi.ui.Queryable;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiDirectory;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiPackage;
import com.intellij.psi.search.GlobalSearchScope;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.*;
import java.util.Collection;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
/**
* @author Eugene Zhuravlev
@@ -35,16 +39,17 @@ import java.util.*;
public final class PackageElement implements Queryable, RootsProvider {
public static final DataKey<PackageElement> DATA_KEY = DataKey.create("package.element");
private final Module myModule;
private final PsiPackage myElement;
@Nullable private final Module myModule;
@NotNull private final PsiPackage myElement;
private final boolean myIsLibraryElement;
public PackageElement(Module module, PsiPackage element, boolean isLibraryElement) {
public PackageElement(@Nullable Module module, @NotNull PsiPackage element, boolean isLibraryElement) {
myModule = module;
myElement = element;
myIsLibraryElement = isLibraryElement;
}
@Nullable
public Module getModule() {
return myModule;
}
@@ -56,7 +61,7 @@ public final class PackageElement implements Queryable, RootsProvider {
@Override
public Collection<VirtualFile> getRoots() {
Set<VirtualFile> roots= new HashSet<VirtualFile>();
final GlobalSearchScope scopeToShow = PackageUtil.getScopeToShow(myModule.getProject(), myModule, isLibraryElement());
final GlobalSearchScope scopeToShow = PackageUtil.getScopeToShow(myElement.getProject(), myModule, isLibraryElement());
final PsiDirectory[] dirs = getPackage().getDirectories(scopeToShow);
for (PsiDirectory each : dirs) {
roots.add(each.getVirtualFile());
@@ -71,7 +76,7 @@ public final class PackageElement implements Queryable, RootsProvider {
final PackageElement packageElement = (PackageElement)o;
if (myIsLibraryElement != packageElement.myIsLibraryElement) return false;
if (myElement != null ? !myElement.equals(packageElement.myElement) : packageElement.myElement != null) return false;
if (!myElement.equals(packageElement.myElement)) return false;
if (myModule != null ? !myModule.equals(packageElement.myModule) : packageElement.myModule != null) return false;
return true;
@@ -80,7 +85,7 @@ public final class PackageElement implements Queryable, RootsProvider {
public int hashCode() {
int result;
result = (myModule != null ? myModule.hashCode() : 0);
result = 29 * result + (myElement != null ? myElement.hashCode() : 0);
result = 29 * result + (myElement.hashCode());
result = 29 * result + (myIsLibraryElement ? 1 : 0);
return result;
}