MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[Workspace Model] Make all classes internal

Browse Source 
GitOrigin-RevId: a515b62bb4069f5e1ca3ed188bb760356b5c19c7
This commit is contained in:
Alex Plate
2020-03-31 11:04:26 +00:00
committed by intellij-monorepo-bot
parent ce25ba5275
commit 3600ba1491
9 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/workspaceModel-core/src/pstorage/Entities.kt
+17 -17
View File
@@ -11,15 +11,15 @@ import kotlin.reflect.KProperty
import kotlin.reflect.KProperty1
import kotlin.reflect.full.memberProperties
interface PTypedEntity<E : TypedEntity> : TypedEntity {
internal interface PTypedEntity<E : TypedEntity> : TypedEntity {
val id: PId<E>
fun asStr(): String = "${javaClass.simpleName}-:-$id"
}
interface PModifiableTypedEntity<T : PTypedEntity<T>> : PTypedEntity<T>, ModifiableTypedEntity<T>
internal interface PModifiableTypedEntity<T : PTypedEntity<T>> : PTypedEntity<T>, ModifiableTypedEntity<T>
data class PId<E : TypedEntity>(val arrayId: Int, val clazz: KClass<E>) {
internal data class PId<E : TypedEntity>(val arrayId: Int, val clazz: KClass<E>) {
init {
if (arrayId < 0) error("ArrayId cannot be negative: $arrayId")
}
@@ -27,7 +27,7 @@ data class PId<E : TypedEntity>(val arrayId: Int, val clazz: KClass<E>) {
override fun toString(): String = arrayId.toString()
}
interface PEntityData<E : TypedEntity> {
internal interface PEntityData<E : TypedEntity> {
var entitySource: EntitySource
var id: Int
fun createEntity(snapshot: PEntityStorage): E
@@ -35,7 +35,7 @@ interface PEntityData<E : TypedEntity> {
fun clone(): PEntityData<E>
}
class PFolderEntityData : PEntityData<PFolderEntity> {
internal class PFolderEntityData : PEntityData<PFolderEntity> {
override var id: Int = -1
override lateinit var entitySource: EntitySource
lateinit var data: String
@@ -51,7 +51,7 @@ class PFolderEntityData : PEntityData<PFolderEntity> {
}
}
class PSoftSubFolderEntityData : PEntityData<PSoftSubFolder> {
internal class PSoftSubFolderEntityData : PEntityData<PSoftSubFolder> {
override var id: Int = -1
override lateinit var entitySource: EntitySource
@@ -67,7 +67,7 @@ class PSoftSubFolderEntityData : PEntityData<PSoftSubFolder> {
}
}
class PSubFolderEntityData : PEntityData<PSubFolderEntity> {
internal class PSubFolderEntityData : PEntityData<PSubFolderEntity> {
override var id: Int = -1
override lateinit var entitySource: EntitySource
lateinit var data: String
@@ -85,7 +85,7 @@ class PSubFolderEntityData : PEntityData<PSubFolderEntity> {
}
}
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<PFolderEntity> {
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<PSubFolderEntity> {
override val id: PId<PSubFolderEntity> = PId(original.id, PSubFolderEntity::class)
@@ -170,7 +170,7 @@ class PSubFolderModifiableEntity(val original: PSubFolderEntityData,
}
}
class Another<A, B>(val original: Any) : ReadWriteProperty<A, B> {
internal class Another<A, B>(val original: Any) : ReadWriteProperty<A, B> {
override fun getValue(thisRef: A, property: KProperty<*>): B {
return ((original::class.memberProperties.first { it.name == property.name }) as KProperty1<Any, *>).get(original) as B
}
@@ -182,7 +182,7 @@ class Another<A, B>(val original: Any) : ReadWriteProperty<A, B> {
@PEntityDataClass(PSoftSubFolderEntityData::class)
@PEntityClass(PSoftSubFolder::class)
class PSoftSubFolderModifiableEntity(
internal class PSoftSubFolderModifiableEntity(
val original: PSoftSubFolderEntityData,
val diff: PEntityStorageBuilder
) : PModifiableTypedEntity<PSoftSubFolder> {
@@ -198,7 +198,7 @@ class PSoftSubFolderModifiableEntity(
}
}
object MySource : EntitySource
internal object MySource : EntitySource
annotation class PEntityDataClass(val clazz: KClass<out PEntityData<*>>)
annotation class PEntityClass(val clazz: KClass<out PTypedEntity<*>>)
internal annotation class PEntityDataClass(val clazz: KClass<out PEntityData<*>>)
internal annotation class PEntityClass(val clazz: KClass<out PTypedEntity<*>>)
platform/workspaceModel-core/src/pstorage/EntitiesBarrel.kt
+2 -2
View File
@@ -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<Class<out TypedEntity>, EntityFamily<out TypedEntity>>
) : Iterable<Map.Entry<Class<out TypedEntity>, EntityFamily<out TypedEntity>>> {
@@ -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<Class<out TypedEntity>, EntityFamily<out TypedEntity>> = mutableMapOf()
override operator fun <T : TypedEntity> get(clazz: Class<T>): EntityFamily<T>? = entitiesByType[clazz] as EntityFamily<T>?
platform/workspaceModel-core/src/pstorage/EntityFamily.kt
+2 -2
View File
@@ -4,7 +4,7 @@ package com.intellij.workspace.api.pstorage
import com.intellij.workspace.api.TypedEntity
import gnu.trove.TIntHashSet
open class EntityFamily<E : TypedEntity> internal constructor(
internal open class EntityFamily<E : TypedEntity> internal constructor(
protected open val entities: List<PEntityData<E>?>,
protected val emptySlots: TIntHashSet
) {
@@ -28,7 +28,7 @@ open class EntityFamily<E : TypedEntity> internal constructor(
}
}
class MutableEntityFamily<E : TypedEntity>(
internal class MutableEntityFamily<E : TypedEntity>(
override val entities: MutableList<PEntityData<E>?>,
var familyCopiedToModify: Boolean
) : EntityFamily<E>(
platform/workspaceModel-core/src/pstorage/PEntityStorage.kt
+2 -2
View File
@@ -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
platform/workspaceModel-core/src/pstorage/References.kt
+4 -4
View File
@@ -6,7 +6,7 @@ import kotlin.properties.ReadWriteProperty
import kotlin.reflect.KClass
import kotlin.reflect.KProperty
sealed class OneToMany<T : PTypedEntity<T>, SUBT : PTypedEntity<SUBT>>(
internal sealed class OneToMany<T : PTypedEntity<T>, SUBT : PTypedEntity<SUBT>>(
protected val snapshot: PEntityStorage
) : ReadOnlyProperty<T, Sequence<SUBT>> {
@@ -35,7 +35,7 @@ sealed class OneToMany<T : PTypedEntity<T>, SUBT : PTypedEntity<SUBT>>(
}
}
sealed class ManyToOne<T : PTypedEntity<T>, SUBT : PTypedEntity<SUBT>>(
internal sealed class ManyToOne<T : PTypedEntity<T>, SUBT : PTypedEntity<SUBT>>(
private val snapshot: PEntityStorage
) : ReadOnlyProperty<SUBT, T?> {
@@ -64,7 +64,7 @@ sealed class ManyToOne<T : PTypedEntity<T>, SUBT : PTypedEntity<SUBT>>(
override fun getValue(thisRef: SUBT, property: KProperty<*>): T? = snapshot.extractManyToOneRef(connectionId, thisRef.id)
}
sealed class MutableOneToMany<T : PTypedEntity<T>, SUBT : PTypedEntity<SUBT>, MODT : PModifiableTypedEntity<T>>(
internal sealed class MutableOneToMany<T : PTypedEntity<T>, SUBT : PTypedEntity<SUBT>, MODT : PModifiableTypedEntity<T>>(
protected val snapshot: PEntityStorageBuilder
) : ReadWriteProperty<MODT, Sequence<SUBT>> {
@@ -101,7 +101,7 @@ sealed class MutableOneToMany<T : PTypedEntity<T>, SUBT : PTypedEntity<SUBT>, MO
}
}
sealed class MutableManyToOne<T : PTypedEntity<T>, SUBT : PTypedEntity<SUBT>, MODSUBT : PModifiableTypedEntity<SUBT>>(
internal sealed class MutableManyToOne<T : PTypedEntity<T>, SUBT : PTypedEntity<SUBT>, MODSUBT : PModifiableTypedEntity<SUBT>>(
private val snapshot: PEntityStorageBuilder
) : ReadWriteProperty<MODSUBT, T?> {
platform/workspaceModel-core/src/pstorage/RefsTable.kt
+3 -3
View File
@@ -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<T : TypedEntity, SUBT : TypedEntity> private constructor(
internal data class ConnectionId<T : TypedEntity, SUBT : TypedEntity> private constructor(
val toSingleClass: KClass<T>,
val toSequenceClass: KClass<SUBT>,
var isHard: Boolean
@@ -21,7 +21,7 @@ data class ConnectionId<T : TypedEntity, SUBT : TypedEntity> private constructor
}
}
open class RefsTable internal constructor(
internal open class RefsTable internal constructor(
internal open val oneToManyContainer: Map<ConnectionId<out TypedEntity, out TypedEntity>, IntIntBiMap>
) {
@@ -80,7 +80,7 @@ open class RefsTable internal constructor(
}
}
class MutableRefsTable : RefsTable() {
internal class MutableRefsTable : RefsTable() {
override val oneToManyContainer: MutableMap<ConnectionId<out TypedEntity, out TypedEntity>, IntIntBiMap> = HashMap()
private val copiedToModify: MutableSet<ConnectionId<out TypedEntity, out TypedEntity>> = HashSet()
platform/workspaceModel-core/src/pstorage/containers/IntIntBiMap.kt
+1 -1
View File
@@ -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
) {
platform/workspaceModel-core/src/pstorage/containers/IntIntBiMultiMap.kt
+1 -1
View File
@@ -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
) {
platform/workspaceModel-core/src/pstorage/containers/IntIntMultiMap.kt
+1 -1
View File
@@ -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