[isis] branch master updated: ISIS-2361: workaround a bug in wicket as it seems

[ahuber]

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 f73b164  ISIS-2361: workaround a bug in wicket as it seems
f73b164 is described below

commit f73b16471bedb24cb251ee3c695d24357f811e53
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Tue May 12 07:21:54 2020 +0200

    ISIS-2361: workaround a bug in wicket as it seems
---
 .../ui/components/widgets/select2/Select2.java      |  2 +-
 .../widgets/select2/Select2MultiChoiceExt.java      | 21 ++++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git 
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java
 
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java
index 17a6897..b0a907b 100644
--- 
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java
+++ 
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java
@@ -66,7 +66,7 @@ public class Select2 implements Serializable {
         this.select2MultiChoice = select2MultiChoice;
     }
 
-    public AbstractSelect2Choice component() {
+    public AbstractSelect2Choice<ObjectMemento, ?> component() {
         return select2Choice != null
                 ? select2Choice
                 : select2MultiChoice;
diff --git 
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java
 
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java
index eac3bf3..acbb693 100644
--- 
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java
+++ 
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java
@@ -24,6 +24,7 @@ import java.util.Collection;
 import org.apache.wicket.model.IModel;
 import org.wicketstuff.select2.Select2MultiChoice;
 
+import org.apache.isis.core.commons.internal.base._Casts;
 import org.apache.isis.core.metamodel.spec.ObjectSpecId;
 import org.apache.isis.core.webapp.context.memento.ObjectMemento;
 import org.apache.isis.viewer.wicket.model.models.ScalarModel;
@@ -39,11 +40,8 @@ implements ChoiceExt {
             final String id,
             final IModel<ArrayList<ObjectMemento>> modelObject,
             final ScalarModel scalarModel) {
-
-        // TODO: naughty..
-        final IModel<Collection<ObjectMemento>> modelObjectColl = (IModel) 
modelObject;
-
-        return new Select2MultiChoiceExt(id, modelObjectColl, scalarModel);
+        
+        return new Select2MultiChoiceExt(id, 
_Casts.uncheckedCast(modelObject), scalarModel);
     }
 
     private final ObjectSpecId specId;
@@ -52,6 +50,7 @@ implements ChoiceExt {
             final String id,
             final IModel<Collection<ObjectMemento>> model,
             final ScalarModel scalarModel) {
+        
         super(id, model, EmptyChoiceProvider.INSTANCE);
         specId = scalarModel.getTypeOfSpecification().getSpecId();
 
@@ -64,4 +63,16 @@ implements ChoiceExt {
     public ObjectSpecId getSpecId() {
         return specId;
     }
+    
+    
+    @Override
+    public void updateModel() {
+        super.updateModel();
+    }
+    
+    @Override
+    public Collection<ObjectMemento> getModelObject() {
+        return new ArrayList<>(super.getModelObject());
+    }
+    
 }