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

Interface of 'addDefaultImports' in StandardConfiguration simplified

Browse Source
This commit is contained in:
Svetlana Isakova
2012-03-06 16:02:24 +04:00
parent d03d695979
commit d5da6e8c23
7 changed files with 50 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaBridgeConfiguration.java
+9 -9
View File
@@ -22,12 +22,13 @@ import org.jetbrains.jet.lang.Configuration;
import org.jetbrains.jet.lang.JetSemanticServices;
import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
import org.jetbrains.jet.lang.psi.JetImportDirective;
import org.jetbrains.jet.lang.psi.JetPsiFactory;
import org.jetbrains.jet.lang.resolve.BindingTrace;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.Importer;
import org.jetbrains.jet.lang.resolve.scopes.WritableScope;
import org.jetbrains.jet.util.QualifiedNamesUtil;
import java.util.Collection;
import java.util.Collections;
/**
@@ -35,30 +36,29 @@ import java.util.Collections;
*/
public class JavaBridgeConfiguration implements Configuration {
public static final String[] DEFAULT_JAVA_IMPORTS = new String[] { "java.lang" };
public static final String[] DEFAULT_JAVA_IMPORTS = new String[] { "java.lang.*" };
public static Configuration createJavaBridgeConfiguration(@NotNull Project project, @NotNull BindingTrace trace, Configuration delegateConfiguration) {
return new JavaBridgeConfiguration(project, trace, delegateConfiguration);
}
private final Project project;
private final JavaSemanticServices javaSemanticServices;
private final Configuration delegateConfiguration;
private JavaBridgeConfiguration(Project project, BindingTrace trace, Configuration delegateConfiguration) {
this.project = project;
this.javaSemanticServices = new JavaSemanticServices(project, JetSemanticServices.createSemanticServices(project), trace);
this.delegateConfiguration = delegateConfiguration;
}
@Override
public void addDefaultImports(@NotNull BindingTrace trace, @NotNull WritableScope rootScope, @NotNull Importer importer) {
public void addDefaultImports(@NotNull WritableScope rootScope, @NotNull Collection<JetImportDirective> directives) {
rootScope.importScope(new JavaPackageScope("", createNamespaceDescriptor(JavaDescriptorResolver.JAVA_ROOT, ""), javaSemanticServices));
for (String importFQN : DEFAULT_JAVA_IMPORTS) {
NamespaceDescriptor namespaceDescriptor = javaSemanticServices.getDescriptorResolver().resolveNamespace(importFQN);
if (namespaceDescriptor != null) {
importer.addScopeImport(namespaceDescriptor.getMemberScope());
}
directives.add(JetPsiFactory.createImportDirective(project, importFQN));
}
delegateConfiguration.addDefaultImports(trace, rootScope, importer);
delegateConfiguration.addDefaultImports(rootScope, directives);
}
public static JavaNamespaceDescriptor createNamespaceDescriptor(String name, String qualifiedName) {