From 301423818925b45270816be809aec96a2559e994 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 16 Apr 2015 20:27:01 +0300 Subject: [PATCH] Drop unused MutablePackageFragmentProvider --- .../resolve/MutablePackageFragmentProvider.kt | 56 ------------------- .../generators/injectors/GenerateInjectors.kt | 2 - 2 files changed, 58 deletions(-) delete mode 100644 compiler/frontend/src/org/jetbrains/kotlin/resolve/MutablePackageFragmentProvider.kt diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/MutablePackageFragmentProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/MutablePackageFragmentProvider.kt deleted file mode 100644 index 36178acf58f..00000000000 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/MutablePackageFragmentProvider.kt +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.resolve - -import com.intellij.util.containers.ContainerUtil -import com.intellij.util.containers.MultiMap -import org.jetbrains.kotlin.descriptors.ModuleDescriptor -import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor -import org.jetbrains.kotlin.descriptors.PackageFragmentProvider -import org.jetbrains.kotlin.descriptors.impl.MutablePackageFragmentDescriptor -import org.jetbrains.kotlin.name.FqName -import java.util.HashMap -import org.jetbrains.kotlin.name.Name - -public class MutablePackageFragmentProvider(public val module: ModuleDescriptor) : PackageFragmentProvider { - - private val fqNameToPackage = HashMap() - private val subPackages = MultiMap.create() - - init { - fqNameToPackage.put(FqName.ROOT, MutablePackageFragmentDescriptor(module, FqName.ROOT)) - } - - override fun getPackageFragments(fqName: FqName) - = ContainerUtil.createMaybeSingletonList(fqNameToPackage.get(fqName)) - - override fun getSubPackagesOf(fqName: FqName, nameFilter: (Name) -> Boolean) = subPackages[fqName] - - public fun getOrCreateFragment(fqName: FqName): MutablePackageFragmentDescriptor { - if (!fqNameToPackage.containsKey(fqName)) { - val parent = fqName.parent() - getOrCreateFragment(parent) // assure that parent exists - - fqNameToPackage.put(fqName, MutablePackageFragmentDescriptor(module, fqName)) - subPackages.putValue(parent, fqName) - } - - return fqNameToPackage[fqName] - } - - public fun getAllFragments(): Collection = fqNameToPackage.values() -} diff --git a/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt b/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt index 43bc9b84c3b..0fcb03add9a 100644 --- a/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt +++ b/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt @@ -128,7 +128,6 @@ private fun generatorForTopDownAnalyzerForJs() = publicField() - field() field() field() } @@ -294,7 +293,6 @@ private fun DependencyInjectorGenerator.commonForJavaTopDownAnalyzer() { field() field() field() - field() field() field() field()