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 2020/04/08 15:19:54 UTC
[isis] branch ISIS-2324-Merge-kroviz updated: ISIS-2324 code cleanup
This is an automated email from the ASF dual-hosted git repository.
joergrade pushed a commit to branch ISIS-2324-Merge-kroviz
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/ISIS-2324-Merge-kroviz by this push:
new 93da190 ISIS-2324 code cleanup
93da190 is described below
commit 93da190e61762ebfabc3e2fd80ef49634502ed39
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Wed Apr 8 16:12:54 2020 +0200
ISIS-2324 code cleanup
---
.../client/kroviz/core/aggregator/BaseAggregator.kt | 19 +++++++------------
.../kroviz/core/aggregator/DomainTypesAggregator.kt | 18 +++++++++---------
.../client/kroviz/core/aggregator/ObjectAggregator.kt | 7 ++-----
.../kroviz/core/aggregator/RestfulDispatcher.kt | 4 ++--
.../apache/isis/client/kroviz/core/model/ObjectDM.kt | 3 ---
.../isis/client/kroviz/core/model/meta/MetaClass.kt | 3 +--
.../isis/client/kroviz/handler/DefaultHandler.kt | 2 --
.../apache/isis/client/kroviz/ui/kv/ColumnFactory.kt | 3 +--
.../org/apache/isis/client/kroviz/ui/kv/ToolButton.kt | 13 +++++--------
.../org/apache/isis/client/kroviz/utils/DomHelper.kt | 1 -
10 files changed, 27 insertions(+), 46 deletions(-)
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/aggregator/BaseAggregator.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/aggregator/BaseAggregator.kt
index 7aa8340..6d6a4d7 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/aggregator/BaseAggregator.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/aggregator/BaseAggregator.kt
@@ -2,6 +2,7 @@ package org.apache.isis.client.kroviz.core.aggregator
import org.apache.isis.client.kroviz.core.event.LogEntry
import org.apache.isis.client.kroviz.core.event.RoXmlHttpRequest
+import org.apache.isis.client.kroviz.core.model.DisplayModel
import org.apache.isis.client.kroviz.to.Link
import org.apache.isis.client.kroviz.to.TObject
@@ -20,7 +21,7 @@ import org.apache.isis.client.kroviz.to.TObject
*/
abstract class BaseAggregator {
- open lateinit var dsp: org.apache.isis.client.kroviz.core.model.DisplayModel
+ open lateinit var dsp: DisplayModel
open fun update(logEntry: LogEntry, subType: String) {}
@@ -34,8 +35,7 @@ abstract class BaseAggregator {
protected fun log(logEntry: LogEntry) {
logEntry.setUndefined("no handler found")
- console.log("[BaseAggregator.log] no handler found: ${this::class.simpleName}")
- console.log(logEntry.response)
+ throw Throwable("[BaseAggregator.log] no handler found: ${this::class.simpleName}")
}
@Deprecated("use extension function")
@@ -44,18 +44,13 @@ abstract class BaseAggregator {
}
fun TObject.getLayoutLink(): Link? {
- var href: String?
- for (l in links) {
- href = l.href
- if (href.isNotEmpty() && href.contains("layout")) {
- return l
- }
+ return links.firstOrNull { l ->
+ l.isLayout()
}
- return null
}
- fun noop() {
- // save a line break in when formatting
+ private fun Link.isLayout(): Boolean {
+ return href.isNotEmpty() && href.contains("layout")
}
fun Link.invokeWith(aggregator: BaseAggregator, subType: String = "json") {
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/aggregator/DomainTypesAggregator.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/aggregator/DomainTypesAggregator.kt
index d7b35c4..e9714a8 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/aggregator/DomainTypesAggregator.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/aggregator/DomainTypesAggregator.kt
@@ -51,15 +51,15 @@ class DomainTypesAggregator(val url: String) : BaseAggregator() {
val domainTypeLinkList = mutableListOf<Link>()
obj.values.forEach { link ->
when {
- link.href.contains("/org.apache.isis") -> noop()
- link.href.contains("/isisApplib") -> noop()
- link.href.contains("/java") -> noop()
- link.href.contains("/void") -> noop()
- link.href.contains("/boolean") -> noop()
- link.href.contains("fixture") -> noop()
- link.href.contains("service") -> noop()
- link.href.contains("/homepage") -> noop()
- link.href.endsWith("Menu") -> noop()
+ link.href.contains("/org.apache.isis") -> {}
+ link.href.contains("/isisApplib") -> {}
+ link.href.contains("/java") -> {}
+ link.href.contains("/void") -> {}
+ link.href.contains("/boolean") -> {}
+ link.href.contains("fixture") -> {}
+ link.href.contains("service") -> {}
+ link.href.contains("/homepage") -> {}
+ link.href.endsWith("Menu") -> {}
else -> {
domainTypeLinkList.add(link)
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/aggregator/ObjectAggregator.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/aggregator/ObjectAggregator.kt
index 966a257..28a4cc2 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/aggregator/ObjectAggregator.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/aggregator/ObjectAggregator.kt
@@ -44,9 +44,7 @@ class ObjectAggregator(val actionTitle: String) : BaseAggregator() {
}
fun handleResultObject(obj: ResultObject) {
- console.log("[OA.handleResultObject]")
- console.log(obj)
- // dsp.addData(obj)
+ // TODO dsp.addData(obj)
}
override fun getObject(): TObject? {
@@ -54,8 +52,7 @@ class ObjectAggregator(val actionTitle: String) : BaseAggregator() {
}
private fun handleProperty(property: Property) {
- console.log("[ObjectAggregator.handleProperty] yet to be implemented")
- console.log(property)
+ //TODO yet to be implemented
}
private fun handleLayout(layout: Layout) {
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/aggregator/RestfulDispatcher.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/aggregator/RestfulDispatcher.kt
index c1f9fb8..251106d 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/aggregator/RestfulDispatcher.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/aggregator/RestfulDispatcher.kt
@@ -12,8 +12,8 @@ class RestfulDispatcher() : BaseAggregator() {
restful.links.forEach {
when {
it.rel.endsWith("/menuBars") -> invokeNavigation(it)
- it.rel == "self" -> noop()
- it.rel.endsWith("/services") -> noop()
+ it.rel == "self" -> {}
+ it.rel.endsWith("/services") -> {}
else -> invokeSystem(it)
}
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/model/ObjectDM.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/model/ObjectDM.kt
index bb4cca3..88fbef3 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/model/ObjectDM.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/model/ObjectDM.kt
@@ -23,7 +23,6 @@ class ObjectDM(override val title: String) : DisplayModelWithLayout() {
}
fun setDirty(value: Boolean) {
- console.log("[ObjectDM.setDirty] $value")
dirty = value
}
@@ -37,7 +36,6 @@ class ObjectDM(override val title: String) : DisplayModelWithLayout() {
}
fun save() {
- console.log("[ObjectDM.save]")
if (dirty) {
val tObject = data!!.delegate
val getLink = tObject.links.first()
@@ -59,7 +57,6 @@ class ObjectDM(override val title: String) : DisplayModelWithLayout() {
}
fun undo() {
- console.log("[displayModel.undo]")
if (dirty) {
//TODO reset()
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/model/meta/MetaClass.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/model/meta/MetaClass.kt
index c0da35a..d05c9dc 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/model/meta/MetaClass.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/model/meta/MetaClass.kt
@@ -20,8 +20,7 @@ class MetaClass(val domainType: DomainType) {
m.isProperty() -> properties.add(MetaProperty(memberName))
m.isAction() -> actions.add(MetaAction(memberName))
else -> {
- console.log("[MetaClass.init] unexpected member type")
- console.log(memberName)
+ throw Throwable("tertium non datur")
}
}
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/handler/DefaultHandler.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/handler/DefaultHandler.kt
index 2cdd2b7..907723d 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/handler/DefaultHandler.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/handler/DefaultHandler.kt
@@ -7,8 +7,6 @@ class DefaultHandler : BaseHandler() {
}
override fun doHandle() {
- console.log("[DefaultHandler.doHandle]")
- console.log(logEntry)
update()
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/ColumnFactory.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/ColumnFactory.kt
index 38d10b5..9e9e37f 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/ColumnFactory.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/ColumnFactory.kt
@@ -86,8 +86,7 @@ class ColumnFactory {
headerFilter = Editor.INPUT,
formatterComponentFunction = { _, _, data ->
Button(text = data["object"].title as String, icon = "fas fa-star-o", style = ButtonStyle.LINK).onClick {
- console.log("[ColumnFactory.buildLink]")
- console.log(data)
+ console.log(data)
}
})
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/ToolButton.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/ToolButton.kt
index 131bfc6..74071b1 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/ToolButton.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/ToolButton.kt
@@ -7,23 +7,20 @@ class ToolButton(text: String) : Div(text) {
init {
//style = ButtonStyle.LINK
- // onEvent { DragEvent. }
+ // onEvent { DragEvent. }
}
- fun ondragover(ev:DragEvent) {
+ fun ondragover(ev: DragEvent) {
ev.preventDefault();
- console.log("[ToolButton.ondragover]")
- console.log(ev)
}
- fun allowDrop(ev:DragEvent) {
+ fun allowDrop(ev: DragEvent) {
ev.preventDefault();
}
- fun drop(ev:DragEvent) {
+ fun drop(ev: DragEvent) {
ev.preventDefault();
- console.log("[ToolButton.drop]")
- console.log(ev)
+ //TODO
//var data = ev.dataTransfer.getData("text");
//ev.target.appendChild(document.getElementById(data));
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/utils/DomHelper.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/utils/DomHelper.kt
index 9b2dd0f..e06145b 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/utils/DomHelper.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/utils/DomHelper.kt
@@ -22,7 +22,6 @@ object DomHelper {
element.setAttribute("href", "data:text/plain;charset=utf-8," + encodeURIComponent(text))
element.setAttribute("download", filename)
document.body?.appendChild(element)
- console.log(document)
element.asDynamic().click()
document.body?.removeChild(element)
}