Merge pull request #75 from modelix/text-editor2

Several fixes for the usage of the model-client in modelix.text-editor

Author: slisson

build.gradle.kts

@@ -28,6 +28,13 @@ subprojects {
     version = rootProject.version
     group = rootProject.group
 
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
+        kotlinOptions {
+            jvmTarget = "11"
+            freeCompilerArgs += listOf("-Xjvm-default=all-compatibility")
+        }
+    }
+
     repositories {
         mavenLocal()
         maven { url = uri("https://artifacts.itemis.cloud/repository/maven-mps/") }

light-model-client/build.gradle.kts

@@ -10,12 +10,6 @@ val kotlinLoggingVersion: String by rootProject
 val kotlinxHtmlVersion: String by rootProject
 val modelixIncrementalVersion: String by rootProject
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
-    kotlinOptions {
-        jvmTarget = "11"
-    }
-}
-
 kotlin {
     jvm()
     js(IR) {

model-api/build.gradle.kts

@@ -12,13 +12,6 @@ configurations {
 
 description = "API to access models stored in Modelix"
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
-    kotlinOptions {
-        jvmTarget = "11"
-        freeCompilerArgs += listOf("-Xjvm-default=all-compatibility")
-    }
-}
-
 ktlint {
     disabledRules.add("no-wildcard-imports")
     outputToConsole.set(true)

model-api/src/commonMain/kotlin/org/modelix/model/api/ConceptReference.kt

@@ -29,4 +29,8 @@ data class ConceptReference(val uid: String) : IConceptReference {
     override fun serialize(): String {
         return uid
     }
+
+    override fun toString(): String {
+        return uid
+    }
 }

model-client/build.gradle.kts

@@ -11,12 +11,6 @@ configurations {
     ktlint
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    kotlinOptions {
-        jvmTarget = "11"
-    }
-}
-
 java {
     toolchain {
         languageVersion.set(JavaLanguageVersion.of(11))

model-client/src/commonMain/kotlin/org/modelix/model/lazy/CLVersion.kt

@@ -17,6 +17,8 @@ package org.modelix.model.lazy
 
 import kotlinx.datetime.Clock
 import kotlinx.datetime.Instant
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.toInstant
 import org.modelix.model.IVersion
 import org.modelix.model.api.INodeReference
 import org.modelix.model.api.LocalPNodeReference
@@ -103,9 +105,21 @@ class CLVersion : IVersion {
     val id: Long
         get() = data!!.id
 
+    @Deprecated("Use getTimestamp()")
     val time: String?
         get() = data!!.time
 
+    fun getTimestamp(): Instant? {
+        val dateTimeStr = data!!.time ?: return null
+        try {
+            return Instant.fromEpochSeconds(dateTimeStr.toLong())
+        } catch (ex: Exception) {}
+        try {
+            return kotlinx.datetime.LocalDateTime.parse(dateTimeStr).toInstant(TimeZone.currentSystemDefault())
+        } catch (ex: Exception) {}
+        return null
+    }
+
     @Deprecated("Use getContentHash()", ReplaceWith("getContentHash()"))
     val hash: String
         get() = data!!.hash

model-server/src/main/kotlin/org/modelix/model/server/Main.kt

@@ -132,9 +132,9 @@ object Main {
                 )
             }
 
-            val historyHandler = HistoryHandler(localModelClient)
             val jsonModelServer = DeprecatedLightModelServer(localModelClient)
             val repositoriesManager = RepositoriesManager(localModelClient)
+            val historyHandler = HistoryHandler(localModelClient, repositoriesManager)
             val modelReplicationServer = ModelReplicationServer(repositoriesManager)
             val ktorServer: NettyApplicationEngine = embeddedServer(Netty, port = port) {
                 install(Routing)