From 4ab9751bea1e42755fe27ed436e1d28252685ef9 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sun, 13 Sep 2020 20:06:09 +0300 Subject: [PATCH] Commented fake overrides in Meta to work around KT-41765 --- .../src/commonMain/kotlin/hep/dataforge/meta/Meta.kt | 11 ++++++----- .../kotlin/hep/dataforge/workspace/SimpleWorkspace.kt | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/Meta.kt b/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/Meta.kt index 73ebbe66..138ff099 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/Meta.kt +++ b/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/Meta.kt @@ -132,11 +132,12 @@ public interface Meta : MetaRepr, ItemProvider { override fun toMeta(): Meta = seal() - override fun equals(other: Any?): Boolean - - override fun hashCode(): Int - - override fun toString(): String + //TODO to be restored on 1.4.30 after https://youtrack.jetbrains.com/issue/KT-41765 si fixed +// override fun equals(other: Any?): Boolean +// +// override fun hashCode(): Int +// +// override fun toString(): String public companion object { public const val TYPE: String = "meta" diff --git a/dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/SimpleWorkspace.kt b/dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/SimpleWorkspace.kt index 4159ea30..adec8bb9 100644 --- a/dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/SimpleWorkspace.kt +++ b/dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/SimpleWorkspace.kt @@ -1,7 +1,7 @@ package hep.dataforge.workspace import hep.dataforge.context.Context -import hep.dataforge.context.resolve +import hep.dataforge.context.gather import hep.dataforge.context.toMap import hep.dataforge.data.DataNode import hep.dataforge.meta.Meta @@ -19,7 +19,7 @@ public class SimpleWorkspace( ) : Workspace { override val tasks: Map> by lazy { - context.resolve>(Task.TYPE) + tasks.toMap() + context.gather>(Task.TYPE) + tasks.toMap() } public companion object {