diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/MutablePackageFragmentProvider.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/MutablePackageFragmentProvider.java deleted file mode 100644 index 39935192d34..00000000000 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/MutablePackageFragmentProvider.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright 2010-2014 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.jet.lang.resolve; - -import com.google.common.collect.Maps; -import com.intellij.util.containers.ContainerUtil; -import com.intellij.util.containers.MultiMap; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; -import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider; -import org.jetbrains.jet.lang.descriptors.impl.MutablePackageFragmentDescriptor; -import org.jetbrains.jet.lang.resolve.name.FqName; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -public class MutablePackageFragmentProvider implements PackageFragmentProvider { - private final ModuleDescriptor module; - - private final Map fqNameToPackage = Maps.newHashMap(); - private final MultiMap subPackages = MultiMap.create(); - - public MutablePackageFragmentProvider(@NotNull ModuleDescriptor module) { - this.module = module; - fqNameToPackage.put(FqName.ROOT, new MutablePackageFragmentDescriptor(module, FqName.ROOT)); - } - - @NotNull - @Override - public List getPackageFragments(@NotNull FqName fqName) { - return ContainerUtil.createMaybeSingletonList(fqNameToPackage.get(fqName)); - } - - @NotNull - @Override - public Collection getSubPackagesOf(@NotNull FqName fqName) { - return subPackages.get(fqName); - } - - @NotNull - public MutablePackageFragmentDescriptor getOrCreateFragment(@NotNull FqName fqName) { - if (!fqNameToPackage.containsKey(fqName)) { - FqName parent = fqName.parent(); - getOrCreateFragment(parent); // assure that parent exists - - fqNameToPackage.put(fqName, new MutablePackageFragmentDescriptor(module, fqName)); - subPackages.putValue(parent, fqName); - } - - return fqNameToPackage.get(fqName); - } - - @NotNull - public ModuleDescriptor getModule() { - return module; - } - - @NotNull - public Collection getAllFragments() { - return fqNameToPackage.values(); - } -} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/MutablePackageFragmentProvider.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/MutablePackageFragmentProvider.kt new file mode 100644 index 00000000000..f32fb70a30e --- /dev/null +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/MutablePackageFragmentProvider.kt @@ -0,0 +1,55 @@ +/* + * Copyright 2010-2014 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.jet.lang.resolve + +import com.intellij.util.containers.ContainerUtil +import com.intellij.util.containers.MultiMap +import org.jetbrains.jet.lang.descriptors.ModuleDescriptor +import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor +import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider +import org.jetbrains.jet.lang.descriptors.impl.MutablePackageFragmentDescriptor +import org.jetbrains.jet.lang.resolve.name.FqName +import java.util.HashMap + +public class MutablePackageFragmentProvider(public val module: ModuleDescriptor) : PackageFragmentProvider { + + private val fqNameToPackage = HashMap() + private val subPackages = MultiMap.create() + + ;{ + fqNameToPackage.put(FqName.ROOT, MutablePackageFragmentDescriptor(module, FqName.ROOT)) + } + + override fun getPackageFragments(fqName: FqName) + = ContainerUtil.createMaybeSingletonList(fqNameToPackage.get(fqName)) + + override fun getSubPackagesOf(fqName: FqName) = 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/core/descriptors/src/org/jetbrains/jet/lang/descriptors/PackageFragmentProvider.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/PackageFragmentProvider.kt similarity index 55% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/PackageFragmentProvider.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/PackageFragmentProvider.kt index 11104a3041a..c660cce4235 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/PackageFragmentProvider.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/PackageFragmentProvider.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2014 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. @@ -14,24 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors; +package org.jetbrains.jet.lang.descriptors -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.ReadOnly; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.annotations.ReadOnly +import org.jetbrains.jet.lang.resolve.name.FqName -import java.util.Collection; -import java.util.List; - -public interface PackageFragmentProvider { - @NotNull - @ReadOnly - List getPackageFragments(@NotNull FqName fqName); +public trait PackageFragmentProvider { + public fun getPackageFragments(fqName: FqName): List /** * @return declared subpackages of {@code fqName} */ - @NotNull - @ReadOnly - Collection getSubPackagesOf(@NotNull FqName fqName); + public fun getSubPackagesOf(fqName: FqName): Collection } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/CompositePackageFragmentProvider.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/CompositePackageFragmentProvider.java deleted file mode 100644 index bfe36cff053..00000000000 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/CompositePackageFragmentProvider.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2010-2013 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.jet.lang.descriptors.impl; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; -import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider; -import org.jetbrains.jet.lang.resolve.name.FqName; - -import java.util.*; - -public class CompositePackageFragmentProvider implements PackageFragmentProvider { - // can be modified from outside - private final List providers; - - public CompositePackageFragmentProvider(@NotNull List providers) { - this.providers = providers; - } - - @NotNull - @Override - public List getPackageFragments(@NotNull FqName fqName) { - ArrayList result = new ArrayList(); - for (PackageFragmentProvider provider : providers) { - result.addAll(provider.getPackageFragments(fqName)); - } - result.trimToSize(); - return result; - } - - @NotNull - @Override - public Collection getSubPackagesOf(@NotNull FqName fqName) { - Set result = new HashSet(); - for (PackageFragmentProvider provider : providers) { - result.addAll(provider.getSubPackagesOf(fqName)); - } - return result; - } -} diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/CompositePackageFragmentProvider.kt b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/CompositePackageFragmentProvider.kt new file mode 100644 index 00000000000..a56ef625da7 --- /dev/null +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/CompositePackageFragmentProvider.kt @@ -0,0 +1,46 @@ +/* + * Copyright 2010-2014 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.jet.lang.descriptors.impl + +import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor +import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider +import org.jetbrains.jet.lang.resolve.name.FqName + +import java.util.* +import kotlin.List +import kotlin.Collection + +public class CompositePackageFragmentProvider(// can be modified from outside + private val providers: List) : PackageFragmentProvider { + + override fun getPackageFragments(fqName: FqName): List { + val result = ArrayList() + for (provider in providers) { + result.addAll(provider.getPackageFragments(fqName)) + } + result.trimToSize() + return result + } + + override fun getSubPackagesOf(fqName: FqName): Collection { + val result = HashSet() + for (provider in providers) { + result.addAll(provider.getSubPackagesOf(fqName)) + } + return result + } +}