From 3a833617809e7fc143f0af4f1f7c86a630b8fee4 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 17 Apr 2013 13:19:00 +0400 Subject: [PATCH] Factory method removed from DefaultModuleConfiguration --- .../org/jetbrains/jet/lang/DefaultModuleConfiguration.java | 4 ---- .../jet/plugin/libraries/JetSourceNavigationHelper.java | 2 +- .../src/org/jetbrains/k2js/analyze/JsConfiguration.java | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java b/compiler/frontend/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java index 017c3bf6831..7d0eaa6ef65 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java @@ -35,10 +35,6 @@ public class DefaultModuleConfiguration implements ModuleConfiguration { public static final ModuleConfiguration INSTANCE = new DefaultModuleConfiguration(); - public static ModuleConfiguration createStandardConfiguration() { - return INSTANCE; - } - private DefaultModuleConfiguration() { } diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java b/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java index 8ab351ac6d5..36593693a47 100644 --- a/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java +++ b/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java @@ -225,7 +225,7 @@ public class JetSourceNavigationHelper { ModuleDescriptorImpl moduleDescriptor = new ModuleDescriptorImpl(Name.special(""), DefaultModuleConfiguration.DEFAULT_JET_IMPORTS, PlatformToKotlinClassMap.EMPTY); - moduleDescriptor.setModuleConfiguration(DefaultModuleConfiguration.createStandardConfiguration()); + moduleDescriptor.setModuleConfiguration(DefaultModuleConfiguration.INSTANCE); KotlinCodeAnalyzer analyzer = new ResolveSession( project, storageManager, diff --git a/js/js.translator/src/org/jetbrains/k2js/analyze/JsConfiguration.java b/js/js.translator/src/org/jetbrains/k2js/analyze/JsConfiguration.java index 2665a7b9c9b..4a81fbee89e 100644 --- a/js/js.translator/src/org/jetbrains/k2js/analyze/JsConfiguration.java +++ b/js/js.translator/src/org/jetbrains/k2js/analyze/JsConfiguration.java @@ -57,7 +57,7 @@ public class JsConfiguration implements ModuleConfiguration { @Override public void extendNamespaceScope(@NotNull BindingTrace trace, @NotNull NamespaceDescriptor namespaceDescriptor, @NotNull WritableScope namespaceMemberScope) { - DefaultModuleConfiguration.createStandardConfiguration() + DefaultModuleConfiguration.INSTANCE .extendNamespaceScope(trace, namespaceDescriptor, namespaceMemberScope); // Extend root namespace with standard classes