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

Rename StandardConfiguration into DefaultModuleConfiguration

Browse Source
This commit is contained in:
Andrey Breslav
2012-03-11 19:12:51 +04:00
parent d469710c7c
commit 6bc3bbb53d
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java
+2 -2
View File
@@ -28,7 +28,7 @@ import com.intellij.psi.util.CachedValuesManager;
import com.intellij.psi.util.PsiModificationTracker;
import com.intellij.util.Function;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.StandardConfiguration;
import org.jetbrains.jet.lang.DefaultModuleConfiguration;
import org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory;
import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils;
import org.jetbrains.jet.lang.diagnostics.Errors;
@@ -142,7 +142,7 @@ public class AnalyzerFacadeForJVM {
BindingTraceContext bindingTraceContext = new BindingTraceContext();
return AnalyzingUtils.analyzeFilesWithGivenTrace(
project,
JavaBridgeConfiguration.createJavaBridgeConfiguration(project, bindingTraceContext, StandardConfiguration.createStandardConfiguration(project)),
JavaBridgeConfiguration.createJavaBridgeConfiguration(project, bindingTraceContext, DefaultModuleConfiguration.createStandardConfiguration(project)),
files,
filesToAnalyzeCompletely,
flowDataTraceFactory,
compiler/frontend/src/org/jetbrains/jet/lang/StandardConfiguration.java → compiler/frontend/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java
+4 -4
View File
@@ -29,16 +29,16 @@ import java.util.Collection;
/**
* @author svtk
*/
public class StandardConfiguration implements ModuleConfiguration {
public class DefaultModuleConfiguration implements ModuleConfiguration {
public static final String[] DEFAULT_JET_IMPORTS = new String[] { "kotlin.*", "kotlin.io.*" };
private Project project;
public static StandardConfiguration createStandardConfiguration(Project project) {
return new StandardConfiguration(project);
public static DefaultModuleConfiguration createStandardConfiguration(Project project) {
return new DefaultModuleConfiguration(project);
}
private StandardConfiguration(Project project) {
private DefaultModuleConfiguration(Project project) {
this.project = project;
}
idea/src/org/jetbrains/jet/plugin/quickfix/ImportClassHelper.java
+2 -2
View File
@@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.quickfix;
import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.StandardConfiguration;
import org.jetbrains.jet.lang.DefaultModuleConfiguration;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
@@ -108,7 +108,7 @@ public class ImportClassHelper {
return true;
}
for (String defaultJetImport : StandardConfiguration.DEFAULT_JET_IMPORTS) {
for (String defaultJetImport : DefaultModuleConfiguration.DEFAULT_JET_IMPORTS) {
if (QualifiedNamesUtil.isImported(defaultJetImport, importString)) {
return true;
}