azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JavaDescriptorResolver exposes ModuleDescriptor

Browse Source
This commit is contained in:
Andrey Breslav
2013-12-26 14:23:59 +04:00
parent 7ebaeae37e
commit 1f382ca744
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+5 -4
View File
@@ -23,7 +23,6 @@ import org.jetbrains.jet.lang.PlatformToKotlinClassMap;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor;
import org.jetbrains.jet.lang.descriptors.ModuleDescriptorImpl;
import org.jetbrains.jet.lang.resolve.ImportPath;
import org.jetbrains.jet.lang.resolve.java.lazy.GlobalJavaResolverContext;
import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaClassResolver;
@@ -53,8 +52,6 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
}
public static final Name JAVA_ROOT = Name.special("<java_root>");
public static final ModuleDescriptor FAKE_JAVA_MODULE = new ModuleDescriptorImpl(Name.special("<java module>"), Collections.<ImportPath>emptyList(),
PlatformToKotlinClassMap.EMPTY);
private final LockBasedStorageManager storageManager = new LockBasedStorageManager();
@@ -139,11 +136,15 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
}
@Inject
public void setModule(ModuleDescriptor module) {
public void setModule(@NotNull ModuleDescriptor module) {
this.module = module;
}
@NotNull
public ModuleDescriptor getModule() {
return module;
}
private LazyJavaPackageFragmentProvider getLazyJavaPackageFragmentProvider() {
if (lazyJavaPackageFragmentProvider == null) {
lazyJavaPackageFragmentProvider = new LazyJavaPackageFragmentProvider(