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/07 07:31:42 UTC
[isis] 01/05: 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
commit 5e59d51aa8ea634db088e3015cc052e4f7216243
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Sun Apr 5 11:50:46 2020 +0200
ISIS-2324 code cleanup
---
.../isis/client/kroviz/core/model/DisplayModelWithLayout.kt | 10 +++++-----
.../org/apache/isis/client/kroviz/core/model/ObjectDM.kt | 11 ++++++-----
.../kotlin/org/apache/isis/client/kroviz/ui/kv/RoDisplay.kt | 5 +++--
.../kotlin/org/apache/isis/client/kroviz/ui/kv/UiManager.kt | 6 +++---
4 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/model/DisplayModelWithLayout.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/model/DisplayModelWithLayout.kt
index a1402da..0b2b2da 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/model/DisplayModelWithLayout.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/model/DisplayModelWithLayout.kt
@@ -16,15 +16,15 @@ abstract class DisplayModelWithLayout : DisplayModel() {
var propertyLayoutList = mutableListOf<PropertyLt>()
override fun canBeDisplayed(): Boolean {
- when {
- isRendered -> return false
- layout == null -> return false
- grid == null -> return false
+ return when {
+ isRendered -> false
+ layout == null -> false
+ grid == null -> false
else -> {
val pls = propertyLayoutList.size
val pds = propertyDescriptionList.size
val descriptionsComplete = pds >= pls
- return descriptionsComplete
+ descriptionsComplete
}
}
}
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 73144b2..bb4cca3 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
@@ -12,15 +12,16 @@ class ObjectDM(override val title: String) : DisplayModelWithLayout() {
private var dirty: Boolean = false
override fun canBeDisplayed(): Boolean {
- when {
- isRendered -> return false
- layout == null -> return false
- grid == null -> return false
+ return when {
+ isRendered -> false
+ layout == null -> false
+ grid == null -> false
else -> {
- return true
+ true
}
}
}
+
fun setDirty(value: Boolean) {
console.log("[ObjectDM.setDirty] $value")
dirty = value
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/RoDisplay.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/RoDisplay.kt
index b167b4c..3ed89e8 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/RoDisplay.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/RoDisplay.kt
@@ -1,6 +1,7 @@
package org.apache.isis.client.kroviz.ui.kv
import org.apache.isis.client.kroviz.core.model.ObjectDM
+import org.apache.isis.client.kroviz.to.TObject
import org.apache.isis.client.kroviz.ui.Displayable
import org.apache.isis.client.kroviz.ui.builder.LayoutBuilder
import pl.treksoft.kvision.core.CssSize
@@ -13,13 +14,13 @@ import pl.treksoft.kvision.panel.VPanel
class RoDisplay(val displayModel: ObjectDM) : Displayable, VPanel() {
var menu: DropDown? = null
- lateinit private var objectPanel: VPanel
+ private lateinit var objectPanel: VPanel
init {
val ol = displayModel.layout
if (ol != null) {
val model = displayModel.data!!
- val tObject = model.delegate
+ val tObject: TObject = model.delegate
val grid = displayModel.grid!!
objectPanel = LayoutBuilder().create(ol, grid, tObject, this)
objectPanel.width = CssSize(100, UNIT.perc)
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/UiManager.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/UiManager.kt
index b377cc6..3a54419 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/UiManager.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/UiManager.kt
@@ -88,12 +88,12 @@ object UiManager {
}
fun openObjectView(aggregator: ObjectAggregator) {
- val dm = aggregator.dsp
+ val dm = aggregator.dsp as ObjectDM
var title: String = dm.extractTitle()
if (title.isEmpty()) {
title = aggregator.actionTitle
}
- val panel = RoDisplay(dm as ObjectDM)
+ val panel = RoDisplay(dm)
add(title, panel, aggregator)
dm.isRendered = true
}
@@ -148,7 +148,7 @@ object UiManager {
}
private fun pop() {
- val len = UiManager.popups.size
+ val len = popups.size
if (len > 0) {
when (val widget = popups[len - 1]) {
is RoDialog -> widget.close()