You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by jo...@apache.org on 2021/05/10 07:11:39 UTC

[isis] 02/12: fix import

This is an automated email from the ASF dual-hosted git repository.

joergrade pushed a commit to branch ISIS-2505_Catch_Up_With_Demo_Examples
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 4e913a435279e038e1ca60dd2b7994116a07f6b6
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Sat Apr 24 13:45:44 2021 +0200

    fix import
---
 .../kotlin/org/apache/isis/client/kroviz/ui/DiagramDialog.kt |  1 +
 .../org/apache/isis/client/kroviz/ui/kv/FormPanelFactory.kt  | 12 +++++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/DiagramDialog.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/DiagramDialog.kt
index 8f94f15..4ca34fb 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/DiagramDialog.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/DiagramDialog.kt
@@ -60,6 +60,7 @@ class DiagramDialog(
         newFormItems.add(newFi)
         val panel = FormPanelFactory(newFormItems)
         UiManager.add("Diagram", panel)
+        // Timing critical: Panel has to be added first, then extract from old location.
         val uuid = callBack as UUID
         val oldElement = DomUtil.getById(uuid.value)!!
         val oldStr = oldElement.innerHTML
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/FormPanelFactory.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/FormPanelFactory.kt
index 19bf7ed..fac5df6 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/FormPanelFactory.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/FormPanelFactory.kt
@@ -18,10 +18,6 @@
  */
 package org.apache.isis.client.kroviz.ui.kv
 
-import org.apache.isis.client.kroviz.to.ValueType
-import org.apache.isis.client.kroviz.ui.FormItem
-import org.apache.isis.client.kroviz.utils.DateHelper
-import org.apache.isis.client.kroviz.utils.UUID
 import io.kvision.core.Component
 import io.kvision.core.Overflow
 import io.kvision.core.StringPair
@@ -43,10 +39,13 @@ import io.kvision.html.Image
 import io.kvision.html.image
 import io.kvision.panel.VPanel
 import io.kvision.panel.vPanel
-import io.kvision.require
 import io.kvision.utils.auto
 import io.kvision.utils.perc
 import io.kvision.utils.px
+import org.apache.isis.client.kroviz.to.ValueType
+import org.apache.isis.client.kroviz.ui.FormItem
+import org.apache.isis.client.kroviz.utils.DateHelper
+import org.apache.isis.client.kroviz.utils.UUID
 
 class FormPanelFactory(items: List<FormItem>) : VPanel() {
 
@@ -166,8 +165,7 @@ class FormPanelFactory(items: List<FormItem>) : VPanel() {
                     // TODO passing url as string does not work:
                     // require resolves string to url and `compiles` it into the binary
                     // working with remote resources allows to me more dynamic
-                    image(
-                            require("img/kroviz-logo.svg"))
+                    //image(require("img/kroviz-logo.svg"))
                 }
                 else -> {
                 }