From 3600ba1491ff681a57ccc866ee133e3bfb47721c Mon Sep 17 00:00:00 2001 From: Alex Plate Date: Tue, 31 Mar 2020 13:15:31 +0300 Subject: [PATCH] [Workspace Model] Make all classes internal GitOrigin-RevId: a515b62bb4069f5e1ca3ed188bb760356b5c19c7 --- .../src/pstorage/Entities.kt | 34 +++++++++---------- .../src/pstorage/EntitiesBarrel.kt | 4 +-- .../src/pstorage/EntityFamily.kt | 4 +-- .../src/pstorage/PEntityStorage.kt | 4 +-- .../src/pstorage/References.kt | 8 ++--- .../src/pstorage/RefsTable.kt | 6 ++-- .../src/pstorage/containers/IntIntBiMap.kt | 2 +- .../pstorage/containers/IntIntBiMultiMap.kt | 2 +- .../src/pstorage/containers/IntIntMultiMap.kt | 2 +- 9 files changed, 33 insertions(+), 33 deletions(-) diff --git a/platform/workspaceModel-core/src/pstorage/Entities.kt b/platform/workspaceModel-core/src/pstorage/Entities.kt index 3deb0fcb1673..4a0b875240f9 100644 --- a/platform/workspaceModel-core/src/pstorage/Entities.kt +++ b/platform/workspaceModel-core/src/pstorage/Entities.kt @@ -11,15 +11,15 @@ import kotlin.reflect.KProperty import kotlin.reflect.KProperty1 import kotlin.reflect.full.memberProperties -interface PTypedEntity : TypedEntity { +internal interface PTypedEntity : TypedEntity { val id: PId fun asStr(): String = "${javaClass.simpleName}-:-$id" } -interface PModifiableTypedEntity> : PTypedEntity, ModifiableTypedEntity +internal interface PModifiableTypedEntity> : PTypedEntity, ModifiableTypedEntity -data class PId(val arrayId: Int, val clazz: KClass) { +internal data class PId(val arrayId: Int, val clazz: KClass) { init { if (arrayId < 0) error("ArrayId cannot be negative: $arrayId") } @@ -27,7 +27,7 @@ data class PId(val arrayId: Int, val clazz: KClass) { override fun toString(): String = arrayId.toString() } -interface PEntityData { +internal interface PEntityData { var entitySource: EntitySource var id: Int fun createEntity(snapshot: PEntityStorage): E @@ -35,7 +35,7 @@ interface PEntityData { fun clone(): PEntityData } -class PFolderEntityData : PEntityData { +internal class PFolderEntityData : PEntityData { override var id: Int = -1 override lateinit var entitySource: EntitySource lateinit var data: String @@ -51,7 +51,7 @@ class PFolderEntityData : PEntityData { } } -class PSoftSubFolderEntityData : PEntityData { +internal class PSoftSubFolderEntityData : PEntityData { override var id: Int = -1 override lateinit var entitySource: EntitySource @@ -67,7 +67,7 @@ class PSoftSubFolderEntityData : PEntityData { } } -class PSubFolderEntityData : PEntityData { +internal class PSubFolderEntityData : PEntityData { override var id: Int = -1 override lateinit var entitySource: EntitySource lateinit var data: String @@ -85,7 +85,7 @@ class PSubFolderEntityData : PEntityData { } } -class PFolderEntity( +internal class PFolderEntity( override val entitySource: EntitySource, arrayId: Int, val data: String, @@ -102,7 +102,7 @@ class PFolderEntity( override fun toString(): String = asStr() } -class PSoftSubFolder( +internal class PSoftSubFolder( override val entitySource: EntitySource, arrayId: Int, val snapshot: PEntityStorage @@ -119,7 +119,7 @@ class PSoftSubFolder( override fun toString(): String = asStr() } -class PSubFolderEntity( +internal class PSubFolderEntity( override val entitySource: EntitySource, arrayId: Int, val data: String, @@ -139,7 +139,7 @@ class PSubFolderEntity( @PEntityDataClass(PFolderEntityData::class) @PEntityClass(PFolderEntity::class) -class PFolderModifiableEntity(val original: PFolderEntityData, +internal class PFolderModifiableEntity(val original: PFolderEntityData, val diff: PEntityStorageBuilder) : PModifiableTypedEntity { override fun hasEqualProperties(e: TypedEntity): Boolean = TODO("Not yet implemented") @@ -155,7 +155,7 @@ class PFolderModifiableEntity(val original: PFolderEntityData, @PEntityDataClass(PSubFolderEntityData::class) @PEntityClass(PSubFolderEntity::class) -class PSubFolderModifiableEntity(val original: PSubFolderEntityData, +internal class PSubFolderModifiableEntity(val original: PSubFolderEntityData, val diff: PEntityStorageBuilder) : PModifiableTypedEntity { override val id: PId = PId(original.id, PSubFolderEntity::class) @@ -170,7 +170,7 @@ class PSubFolderModifiableEntity(val original: PSubFolderEntityData, } } -class Another(val original: Any) : ReadWriteProperty { +internal class Another(val original: Any) : ReadWriteProperty { override fun getValue(thisRef: A, property: KProperty<*>): B { return ((original::class.memberProperties.first { it.name == property.name }) as KProperty1).get(original) as B } @@ -182,7 +182,7 @@ class Another(val original: Any) : ReadWriteProperty { @PEntityDataClass(PSoftSubFolderEntityData::class) @PEntityClass(PSoftSubFolder::class) -class PSoftSubFolderModifiableEntity( +internal class PSoftSubFolderModifiableEntity( val original: PSoftSubFolderEntityData, val diff: PEntityStorageBuilder ) : PModifiableTypedEntity { @@ -198,7 +198,7 @@ class PSoftSubFolderModifiableEntity( } } -object MySource : EntitySource +internal object MySource : EntitySource -annotation class PEntityDataClass(val clazz: KClass>) -annotation class PEntityClass(val clazz: KClass>) +internal annotation class PEntityDataClass(val clazz: KClass>) +internal annotation class PEntityClass(val clazz: KClass>) diff --git a/platform/workspaceModel-core/src/pstorage/EntitiesBarrel.kt b/platform/workspaceModel-core/src/pstorage/EntitiesBarrel.kt index 76675bec3043..7b20e19eacfc 100644 --- a/platform/workspaceModel-core/src/pstorage/EntitiesBarrel.kt +++ b/platform/workspaceModel-core/src/pstorage/EntitiesBarrel.kt @@ -3,7 +3,7 @@ package com.intellij.workspace.api.pstorage import com.intellij.workspace.api.TypedEntity -open class EntitiesBarrel internal constructor( +internal open class EntitiesBarrel internal constructor( entities: Map, EntityFamily> ) : Iterable, EntityFamily>> { @@ -25,7 +25,7 @@ open class EntitiesBarrel internal constructor( fun join(other: EntitiesBarrel): EntitiesBarrel = EntitiesBarrel(entitiesByType + other.entitiesByType) } -class MutableEntitiesBarrel : EntitiesBarrel() { +internal class MutableEntitiesBarrel : EntitiesBarrel() { override val entitiesByType: MutableMap, EntityFamily> = mutableMapOf() override operator fun get(clazz: Class): EntityFamily? = entitiesByType[clazz] as EntityFamily? diff --git a/platform/workspaceModel-core/src/pstorage/EntityFamily.kt b/platform/workspaceModel-core/src/pstorage/EntityFamily.kt index 81819144a9cb..53454383af2a 100644 --- a/platform/workspaceModel-core/src/pstorage/EntityFamily.kt +++ b/platform/workspaceModel-core/src/pstorage/EntityFamily.kt @@ -4,7 +4,7 @@ package com.intellij.workspace.api.pstorage import com.intellij.workspace.api.TypedEntity import gnu.trove.TIntHashSet -open class EntityFamily internal constructor( +internal open class EntityFamily internal constructor( protected open val entities: List?>, protected val emptySlots: TIntHashSet ) { @@ -28,7 +28,7 @@ open class EntityFamily internal constructor( } } -class MutableEntityFamily( +internal class MutableEntityFamily( override val entities: MutableList?>, var familyCopiedToModify: Boolean ) : EntityFamily( diff --git a/platform/workspaceModel-core/src/pstorage/PEntityStorage.kt b/platform/workspaceModel-core/src/pstorage/PEntityStorage.kt index 5f390360bf5a..a9813b4f3ffd 100644 --- a/platform/workspaceModel-core/src/pstorage/PEntityStorage.kt +++ b/platform/workspaceModel-core/src/pstorage/PEntityStorage.kt @@ -11,7 +11,7 @@ import kotlin.reflect.KClass import kotlin.reflect.KProperty1 import kotlin.reflect.full.primaryConstructor -open class PEntityStorage constructor( +internal open class PEntityStorage constructor( open val entitiesByType: EntitiesBarrel, open val refs: RefsTable ) : TypedEntityStorage { @@ -67,7 +67,7 @@ open class PEntityStorage constructor( } } -class PEntityStorageBuilder( +internal class PEntityStorageBuilder( private val origStorage: PEntityStorage, override var entitiesByType: MutableEntitiesBarrel, override var refs: MutableRefsTable diff --git a/platform/workspaceModel-core/src/pstorage/References.kt b/platform/workspaceModel-core/src/pstorage/References.kt index 5be54d0b678c..278a3073aa68 100644 --- a/platform/workspaceModel-core/src/pstorage/References.kt +++ b/platform/workspaceModel-core/src/pstorage/References.kt @@ -6,7 +6,7 @@ import kotlin.properties.ReadWriteProperty import kotlin.reflect.KClass import kotlin.reflect.KProperty -sealed class OneToMany, SUBT : PTypedEntity>( +internal sealed class OneToMany, SUBT : PTypedEntity>( protected val snapshot: PEntityStorage ) : ReadOnlyProperty> { @@ -35,7 +35,7 @@ sealed class OneToMany, SUBT : PTypedEntity>( } } -sealed class ManyToOne, SUBT : PTypedEntity>( +internal sealed class ManyToOne, SUBT : PTypedEntity>( private val snapshot: PEntityStorage ) : ReadOnlyProperty { @@ -64,7 +64,7 @@ sealed class ManyToOne, SUBT : PTypedEntity>( override fun getValue(thisRef: SUBT, property: KProperty<*>): T? = snapshot.extractManyToOneRef(connectionId, thisRef.id) } -sealed class MutableOneToMany, SUBT : PTypedEntity, MODT : PModifiableTypedEntity>( +internal sealed class MutableOneToMany, SUBT : PTypedEntity, MODT : PModifiableTypedEntity>( protected val snapshot: PEntityStorageBuilder ) : ReadWriteProperty> { @@ -101,7 +101,7 @@ sealed class MutableOneToMany, SUBT : PTypedEntity, MO } } -sealed class MutableManyToOne, SUBT : PTypedEntity, MODSUBT : PModifiableTypedEntity>( +internal sealed class MutableManyToOne, SUBT : PTypedEntity, MODSUBT : PModifiableTypedEntity>( private val snapshot: PEntityStorageBuilder ) : ReadWriteProperty { diff --git a/platform/workspaceModel-core/src/pstorage/RefsTable.kt b/platform/workspaceModel-core/src/pstorage/RefsTable.kt index c5802cd5e36e..aff841ca7549 100644 --- a/platform/workspaceModel-core/src/pstorage/RefsTable.kt +++ b/platform/workspaceModel-core/src/pstorage/RefsTable.kt @@ -6,7 +6,7 @@ import com.intellij.workspace.api.pstorage.containers.IntIntBiMap import com.intellij.workspace.api.pstorage.containers.IntIntMultiMap import kotlin.reflect.KClass -data class ConnectionId private constructor( +internal data class ConnectionId private constructor( val toSingleClass: KClass, val toSequenceClass: KClass, var isHard: Boolean @@ -21,7 +21,7 @@ data class ConnectionId private constructor } } -open class RefsTable internal constructor( +internal open class RefsTable internal constructor( internal open val oneToManyContainer: Map, IntIntBiMap> ) { @@ -80,7 +80,7 @@ open class RefsTable internal constructor( } } -class MutableRefsTable : RefsTable() { +internal class MutableRefsTable : RefsTable() { override val oneToManyContainer: MutableMap, IntIntBiMap> = HashMap() private val copiedToModify: MutableSet> = HashSet() diff --git a/platform/workspaceModel-core/src/pstorage/containers/IntIntBiMap.kt b/platform/workspaceModel-core/src/pstorage/containers/IntIntBiMap.kt index 8c9bb559f4e9..5dc778ab665d 100644 --- a/platform/workspaceModel-core/src/pstorage/containers/IntIntBiMap.kt +++ b/platform/workspaceModel-core/src/pstorage/containers/IntIntBiMap.kt @@ -3,7 +3,7 @@ package com.intellij.workspace.api.pstorage.containers import com.intellij.util.containers.IntIntHashMap -class IntIntBiMap( +internal class IntIntBiMap( private var key2Value: IntIntHashMap, private var value2Keys: IntIntMultiMap.ByList ) { diff --git a/platform/workspaceModel-core/src/pstorage/containers/IntIntBiMultiMap.kt b/platform/workspaceModel-core/src/pstorage/containers/IntIntBiMultiMap.kt index 010fe07834d7..8bad10cc9ae1 100644 --- a/platform/workspaceModel-core/src/pstorage/containers/IntIntBiMultiMap.kt +++ b/platform/workspaceModel-core/src/pstorage/containers/IntIntBiMultiMap.kt @@ -1,7 +1,7 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.workspace.api.pstorage.containers -class IntIntBiMultiMap( +internal class IntIntBiMultiMap( private var key2Values: IntIntMultiMap.BySet, private var value2Keys: IntIntMultiMap.BySet ) { diff --git a/platform/workspaceModel-core/src/pstorage/containers/IntIntMultiMap.kt b/platform/workspaceModel-core/src/pstorage/containers/IntIntMultiMap.kt index fc80b77d1a85..1ece9e72c95c 100644 --- a/platform/workspaceModel-core/src/pstorage/containers/IntIntMultiMap.kt +++ b/platform/workspaceModel-core/src/pstorage/containers/IntIntMultiMap.kt @@ -7,7 +7,7 @@ import com.intellij.util.containers.IntIntHashMap * @author Alex Plate */ -sealed class IntIntMultiMap( +internal sealed class IntIntMultiMap( private var values: IntArray, private val links: IntIntHashMap, private val distinctValues: Boolean