Apply fix after https://github.com/Kotlin/kotlinx.serialization/issues/1602
This commit is contained in:
parent
6787ec85de
commit
a715c2660a
@ -29,11 +29,9 @@ internal data class MetaListener(
|
||||
@SerialName("vision")
|
||||
public open class VisionBase(
|
||||
@Transient override var parent: VisionGroup? = null,
|
||||
protected var properties: MutableMeta? = null
|
||||
) : Vision {
|
||||
|
||||
@Transient
|
||||
protected open var properties: MutableMeta? = null
|
||||
|
||||
@Synchronized
|
||||
protected fun getOrCreateProperties(): MutableMeta {
|
||||
if (properties == null) {
|
||||
|
@ -5,7 +5,6 @@ import kotlinx.serialization.Serializable
|
||||
import kotlinx.serialization.modules.SerializersModule
|
||||
import kotlinx.serialization.modules.polymorphic
|
||||
import kotlinx.serialization.modules.subclass
|
||||
import space.kscience.dataforge.meta.MutableMeta
|
||||
import space.kscience.dataforge.meta.string
|
||||
import space.kscience.dataforge.names.Name
|
||||
import space.kscience.dataforge.names.asName
|
||||
@ -18,9 +17,6 @@ public class VisionOfMarkup(
|
||||
public val format: String = COMMONMARK_FORMAT
|
||||
) : VisionBase() {
|
||||
|
||||
//FIXME to be removed after https://github.com/Kotlin/kotlinx.serialization/issues/1602 fix
|
||||
protected override var properties: MutableMeta? = null
|
||||
|
||||
//TODO add templates
|
||||
|
||||
public var content: String? by meta.string(CONTENT_PROPERTY_KEY)
|
||||
|
@ -2,7 +2,6 @@ package space.kscience.visionforge.plotly
|
||||
|
||||
import kotlinx.serialization.SerialName
|
||||
import kotlinx.serialization.Serializable
|
||||
import space.kscience.dataforge.meta.MutableMeta
|
||||
import space.kscience.dataforge.misc.DFExperimental
|
||||
import space.kscience.plotly.Plot
|
||||
import space.kscience.plotly.Plotly
|
||||
@ -12,8 +11,6 @@ import space.kscience.visionforge.html.VisionOutput
|
||||
@Serializable
|
||||
@SerialName("vision.plotly")
|
||||
public class VisionOfPlotly private constructor() : VisionBase() {
|
||||
//FIXME to be removed after https://github.com/Kotlin/kotlinx.serialization/issues/1602 fix
|
||||
override var properties: MutableMeta? = null
|
||||
|
||||
public constructor(plot: Plot) : this() {
|
||||
properties = plot.meta
|
||||
|
@ -2,15 +2,11 @@ package space.kscience.visionforge.solid
|
||||
|
||||
import kotlinx.serialization.SerialName
|
||||
import kotlinx.serialization.Serializable
|
||||
import space.kscience.dataforge.meta.MutableMeta
|
||||
import space.kscience.dataforge.meta.descriptors.MetaDescriptor
|
||||
import space.kscience.visionforge.VisionBase
|
||||
|
||||
@Serializable
|
||||
@SerialName("solid")
|
||||
public open class SolidBase : VisionBase(), Solid {
|
||||
//FIXME to be removed after https://github.com/Kotlin/kotlinx.serialization/issues/1602 fix
|
||||
override var properties: MutableMeta? = null
|
||||
|
||||
override val descriptor: MetaDescriptor get() = Solid.descriptor
|
||||
}
|
||||
|
@ -2,7 +2,6 @@ package space.kscience.visionforge.solid
|
||||
|
||||
import kotlinx.serialization.SerialName
|
||||
import kotlinx.serialization.Serializable
|
||||
import space.kscience.dataforge.meta.MutableMeta
|
||||
import space.kscience.dataforge.meta.descriptors.MetaDescriptor
|
||||
import space.kscience.dataforge.names.Name
|
||||
import space.kscience.dataforge.names.NameToken
|
||||
@ -32,9 +31,6 @@ public interface PrototypeHolder {
|
||||
@SerialName("group.solid")
|
||||
public class SolidGroup : VisionGroupBase(), Solid, PrototypeHolder {
|
||||
|
||||
//FIXME to be removed after https://github.com/Kotlin/kotlinx.serialization/issues/1602 fix
|
||||
override var properties: MutableMeta? = null
|
||||
|
||||
override val children: Map<NameToken, Vision> get() = super.childrenInternal.filter { it.key != PROTOTYPES_TOKEN }
|
||||
|
||||
private var prototypes: MutableVisionGroup?
|
||||
|
@ -2,7 +2,6 @@ package space.kscience.visionforge.solid
|
||||
|
||||
import kotlinx.serialization.SerialName
|
||||
import kotlinx.serialization.Serializable
|
||||
import space.kscience.dataforge.meta.MutableMeta
|
||||
import space.kscience.dataforge.meta.ObservableMutableMeta
|
||||
import space.kscience.dataforge.meta.descriptors.MetaDescriptor
|
||||
import space.kscience.dataforge.meta.get
|
||||
@ -62,8 +61,6 @@ public class SolidReferenceGroup(
|
||||
public val refName: Name,
|
||||
) : VisionBase(), SolidReference, VisionGroup, Solid {
|
||||
|
||||
override var properties: MutableMeta? = null
|
||||
|
||||
/**
|
||||
* Recursively search for defined template in the parent
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user