This is an automated email from the ASF dual-hosted git repository. joergrade pushed a commit to branch ISIS-3171 in repository https://gitbox.apache.org/repos/asf/isis.git
commit 79c7f0927f7f1a95f3a7e689f9e5307638f191ae Author: Joerg Rade <[email protected]> AuthorDate: Wed Oct 26 09:06:54 2022 +0200 ISIS-3171 log statements changed --- .../isis/client/kroviz/core/aggregator/ObjectAggregator.kt | 11 +++++------ .../isis/client/kroviz/core/model/DisplayModelWithLayout.kt | 2 ++ 2 files changed, 7 insertions(+), 6 deletions(-) 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 a0ad82c6df..b8d7a9cccd 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 @@ -110,27 +110,26 @@ class ObjectAggregator(val actionTitle: String) : AggregatorWithLayout() { } private fun handleCollections(obj: TObject, referrer: String) { + console.log("[OA.handleCollections]") + console.log(obj) obj.getCollections().forEach { + console.log(it) val key = it.id val aggregator = CollectionAggregator(key, this) collectionMap[key] = aggregator val link = it.links.first() + console.log(link) ResourceProxy().fetch(link, aggregator, referrer = referrer) } } private fun handleProperty(p: Property, referrer: String) { - console.log("[OA.handleProperty]") val dm = dpm as ObjectDM if (p.isPropertyDescription()) { - console.log("isPropertyDescription") dm.addPropertyDescription(p) } else { dm.addProperty(p) - console.log(p) - val pdl = p.getDescriptionLink() - console.log(pdl) - if (pdl == null) return + val pdl = p.getDescriptionLink() ?: return invoke(pdl, this, referrer = referrer) } } 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 0696ff4d71..a09301c91f 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 @@ -34,6 +34,8 @@ abstract class DisplayModelWithLayout : BaseDisplayModel() { var icon: Icon? = null override fun canBeDisplayed(): Boolean { +// console.log("[DMWL.canBeDisplayed]") +// console.log(this) return when { isRendered -> false layout != null -> true
