You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/05/14 17:55:06 UTC

[isis] branch master updated: ISIS-2340: simplify ScalarPropertyModel (also fixes regression)

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

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new 1f1b832  ISIS-2340: simplify ScalarPropertyModel (also fixes regression)
1f1b832 is described below

commit 1f1b832aa5222caf16ae19bbf50a1a88729e38d0
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu May 14 19:54:51 2020 +0200

    ISIS-2340: simplify ScalarPropertyModel (also fixes regression)
---
 .../main/java/demoapp/dom/types/text/TextDemo.java   |  2 ++
 .../wicket/model/models/ScalarPropertyModel.java     | 20 +++++++++-----------
 .../property/PropertyFormExecutorStrategy.java       | 13 ++-----------
 3 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/examples/demo/src/main/java/demoapp/dom/types/text/TextDemo.java b/examples/demo/src/main/java/demoapp/dom/types/text/TextDemo.java
index 1e78b70..76adfcb 100644
--- a/examples/demo/src/main/java/demoapp/dom/types/text/TextDemo.java
+++ b/examples/demo/src/main/java/demoapp/dom/types/text/TextDemo.java
@@ -34,6 +34,7 @@ import org.apache.isis.applib.value.Password;
 
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 import lombok.extern.log4j.Log4j2;
 
 import demoapp.utils.DemoStub;
@@ -42,6 +43,7 @@ import demoapp.utils.DemoStub;
 @XmlType
 @XmlAccessorType(XmlAccessType.FIELD)
 @DomainObject(nature=Nature.VIEW_MODEL, objectType="demo.Text", editing=Editing.ENABLED)
+@ToString
 @Log4j2
 public class TextDemo extends DemoStub {
 
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarPropertyModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarPropertyModel.java
index 7186f5b..f38db89 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarPropertyModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarPropertyModel.java
@@ -20,7 +20,6 @@ package org.apache.isis.viewer.wicket.model.models;
 
 import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.core.commons.collections.Can;
-import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
 import org.apache.isis.core.metamodel.interactions.managed.InteractionVeto;
 import org.apache.isis.core.metamodel.interactions.managed.ManagedProperty;
@@ -56,7 +55,6 @@ implements PropertyUiModel {
         super(parentEntityModel, propertyMemento, mode, renderingHint);
         this.propertyMemento = propertyMemento;
         reset();
-        //getAndStore(parentEntityModel);
     }
     
     public ScalarPropertyModel copyHaving(
@@ -83,8 +81,8 @@ implements PropertyUiModel {
     
     public ManagedProperty getManagedProperty() {
         if(managedProperty==null) {
-            val parentAdapter = getParentUiModel().load();
-            managedProperty = ManagedProperty.of(parentAdapter, getMetaModel()); 
+            val owner = getParentUiModel().getObject();
+            managedProperty = ManagedProperty.of(owner, getMetaModel()); 
         }
         return managedProperty;  
     } 
@@ -165,13 +163,13 @@ implements PropertyUiModel {
      * @return adapter, which may be different from the original
      *  (if a {@link ViewModelFacet#isCloneable(Object) cloneable} view model, for example.
      */
-    public ManagedObject applyValue(ManagedObject adapter) {
-        val property = getMetaModel();
-
-        val associate = getObject();
-        property.set(adapter, associate, InteractionInitiatedBy.USER);
-
-        return ManagedObjects.copyIfClonable(adapter);
+    public ManagedObject applyValue() {
+        
+        val proposedNewValue = getObject();
+        getManagedProperty().modifyProperty(proposedNewValue);
+        val owner = getManagedProperty().getOwner();
+        val result = ManagedObjects.copyIfClonable(owner); //XXX I don't understand, why do we need this?
+        return result;
 
     }
     
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyFormExecutorStrategy.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyFormExecutorStrategy.java
index a88af1e..964a40e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyFormExecutorStrategy.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyFormExecutorStrategy.java
@@ -26,8 +26,6 @@ import org.apache.isis.viewer.wicket.model.models.ScalarPropertyModel;
 import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
 import org.apache.isis.viewer.wicket.ui.panels.FormExecutorStrategy;
 
-import lombok.val;
-
 public class PropertyFormExecutorStrategy implements FormExecutorStrategy<ScalarPropertyModel> {
 
     private final ScalarPropertyModel model;
@@ -44,7 +42,7 @@ public class PropertyFormExecutorStrategy implements FormExecutorStrategy<Scalar
 
     @Override
     public ManagedObject obtainTargetAdapter() {
-        return model.getParentUiModel().load();
+        return model.getManagedProperty().getOwner();
     }
 
     @Override
@@ -60,14 +58,7 @@ public class PropertyFormExecutorStrategy implements FormExecutorStrategy<Scalar
 
     @Override
     public ManagedObject obtainResultAdapter() {
-        val targetAdapter = obtainTargetAdapter();
-
-        val resultAdapter = this.model.applyValue(targetAdapter);
-
-        if (resultAdapter != targetAdapter) {
-            this.model.getParentUiModel().setObject(targetAdapter);
-        }
-        return resultAdapter;
+        return this.model.applyValue();
     }