kscience/dataforge-core
8
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases 12 Wiki Activity

Commented fake overrides in Meta to work around KT-41765

Browse Source
This commit is contained in:
Alexander Nozik 2020-09-13 20:06:09 +03:00
parent b229de3eb7
commit 4ab9751bea
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/Meta.kt
View File

@ -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"

4
dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/SimpleWorkspace.kt
View File

@ -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<Name, Task<*>> by lazy {
context.resolve<Task<*>>(Task.TYPE) + tasks.toMap()
context.gather<Task<*>>(Task.TYPE) + tasks.toMap()
}
public companion object {