From 6bc3bbb53d060690a490783fd72356b3c27629e0 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Sun, 11 Mar 2012 19:12:51 +0400
Subject: [PATCH] Rename StandardConfiguration into DefaultModuleConfiguration

---
 .../jet/lang/resolve/java/AnalyzerFacadeForJVM.java       | 4 ++--
 ...Configuration.java => DefaultModuleConfiguration.java} | 8 ++++----
 .../jetbrains/jet/plugin/quickfix/ImportClassHelper.java  | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename compiler/frontend/src/org/jetbrains/jet/lang/{StandardConfiguration.java => DefaultModuleConfiguration.java} (86%)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java
index 8a0440aa127..e0da9845bfc 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java
@@ -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,
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/StandardConfiguration.java b/compiler/frontend/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java
similarity index 86%
rename from compiler/frontend/src/org/jetbrains/jet/lang/StandardConfiguration.java
rename to compiler/frontend/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java
index 2b4ddc848d6..82bf46581b5 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/StandardConfiguration.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java
@@ -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;
     }
 
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportClassHelper.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportClassHelper.java
index decfd218e27..de691695983 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportClassHelper.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportClassHelper.java
@@ -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;
             }