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/causeway.git
commit 90ac2fd195c526a41d48a3a048460d3339bde612 Author: Jörg Rade <[email protected]> AuthorDate: Thu Feb 16 23:03:06 2023 +0100 ISIS-3171 cleanup --- .../client/kroviz/core/aggregator/CollectionAggregator.kt | 2 +- .../client/kroviz/core/aggregator/DomainTypesAggregator.kt | 4 ++-- .../causeway/client/kroviz/core/model/BaseDisplayModel.kt | 3 +-- .../apache/causeway/client/kroviz/core/model/CollectionDM.kt | 11 +++-------- .../org/apache/causeway/client/kroviz/core/model/DiagramDM.kt | 4 +--- 5 files changed, 8 insertions(+), 16 deletions(-) diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/aggregator/CollectionAggregator.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/aggregator/CollectionAggregator.kt index d1cbfafcf9..c1c4efa53f 100644 --- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/aggregator/CollectionAggregator.kt +++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/aggregator/CollectionAggregator.kt @@ -148,7 +148,7 @@ class CollectionAggregator(actionTitle: String, private val parent: ObjectAggreg property.isPropertyDescription() -> { val pd = PropertyDescription(property) - getDisplayModel().addPropertyDescription(pd, this, referrer) + getDisplayModel().addPropertyDescription(pd) } else -> { diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/aggregator/DomainTypesAggregator.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/aggregator/DomainTypesAggregator.kt index 2182089c98..06b74a3a24 100644 --- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/aggregator/DomainTypesAggregator.kt +++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/aggregator/DomainTypesAggregator.kt @@ -45,7 +45,7 @@ class DomainTypesAggregator(val url: String) : BaseAggregator() { } private fun handleProperty(obj: Property) { - displayModel.addData(obj, null, null) + displayModel.addData(obj) } private fun handleAction(obj: Action) { @@ -57,7 +57,7 @@ class DomainTypesAggregator(val url: String) : BaseAggregator() { if (obj.isPrimitiveOrService()) { (displayModel as DiagramDM).decNumberOfClasses() } else { - displayModel.addData(obj, null, null) + displayModel.addData(obj) val propertyList = obj.members.filter { it.value.isProperty() } diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/model/BaseDisplayModel.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/model/BaseDisplayModel.kt index 7dfe61e907..f036440e4a 100644 --- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/model/BaseDisplayModel.kt +++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/model/BaseDisplayModel.kt @@ -18,7 +18,6 @@ */ package org.apache.causeway.client.kroviz.core.model -import org.apache.causeway.client.kroviz.core.aggregator.AggregatorWithLayout import org.apache.causeway.client.kroviz.to.TObject import org.apache.causeway.client.kroviz.to.TransferObject @@ -30,7 +29,7 @@ abstract class BaseDisplayModel { abstract fun readyToRender(): Boolean - abstract fun addData(obj: TransferObject, aggregator: AggregatorWithLayout? = null, referrer: String? = null) + abstract fun addData(obj: TransferObject) open fun getObject(): TObject? { // subclass responsibility diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/model/CollectionDM.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/model/CollectionDM.kt index 25279300ac..881ffd0a63 100644 --- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/model/CollectionDM.kt +++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/model/CollectionDM.kt @@ -19,7 +19,6 @@ package org.apache.causeway.client.kroviz.core.model import io.kvision.state.observableListOf -import org.apache.causeway.client.kroviz.core.aggregator.AggregatorWithLayout import org.apache.causeway.client.kroviz.core.aggregator.CollectionAggregator import org.apache.causeway.client.kroviz.core.event.ResourceProxy import org.apache.causeway.client.kroviz.to.PropertyDescription @@ -57,23 +56,19 @@ class CollectionDM(override val title: String) : DisplayModelWithLayout() { members.forEach { m -> propertySpecificationHolder.addMember(m) val l = m.getInvokeLink()!! + //TODO pull up to Aggregator ResourceProxy().fetch(l, aggregator, referrer = referrer) } } } - private fun addPropertyDetails(propertyBs: PropertyBs) { val id = propertyBs.id val ps: PropertySpecification = propertySpecificationHolder.getPropertySpecification(id) ps.amendWith(propertyBs) } - fun addPropertyDescription( - propertyDescription: PropertyDescription, - aggregator: AggregatorWithLayout, - referrer: String - ) { + fun addPropertyDescription(propertyDescription: PropertyDescription) { val id = propertyDescription.id val ps: PropertySpecification = propertySpecificationHolder.getPropertySpecification(id) ps.amendWith(propertyDescription) @@ -96,7 +91,7 @@ class CollectionDM(override val title: String) : DisplayModelWithLayout() { return StringUtils.extractTitle(title) } - override fun addData(obj: TransferObject, aggregator: AggregatorWithLayout?, referrer: String?) { + override fun addData(obj: TransferObject) { //TODO is checking rawdata really needed? if (!rawData.contains(obj)) { rawData.add(obj) diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/model/DiagramDM.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/model/DiagramDM.kt index 815892ca5f..fa83b82f0b 100644 --- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/model/DiagramDM.kt +++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/model/DiagramDM.kt @@ -18,11 +18,9 @@ */ package org.apache.causeway.client.kroviz.core.model -import org.apache.causeway.client.kroviz.core.aggregator.AggregatorWithLayout import org.apache.causeway.client.kroviz.to.DomainType import org.apache.causeway.client.kroviz.to.Property import org.apache.causeway.client.kroviz.to.TransferObject -import react.dom.html.ReferrerPolicy class DiagramDM(override val title: String) : BaseDisplayModel() { @@ -45,7 +43,7 @@ class DiagramDM(override val title: String) : BaseDisplayModel() { //TODO && numberOfProperties == properties.size } - override fun addData(obj: TransferObject, aggregator: AggregatorWithLayout?, referrer: String?) { + override fun addData(obj: TransferObject) { when (obj) { is DomainType -> classes.add(obj) is Property -> properties.add(obj)
