You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/05/24 12:48:46 UTC
git commit: ISIS-431: allow (mandatory) boolean parameters to be left
unchecked (meaning false)
Repository: isis
Updated Branches:
refs/heads/master bf63ac195 -> e8d0ae95c
ISIS-431: allow (mandatory) boolean parameters to be left unchecked (meaning false)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e8d0ae95
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e8d0ae95
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e8d0ae95
Branch: refs/heads/master
Commit: e8d0ae95c4d06183f30ddc70ca318a792913bb16
Parents: bf63ac1
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat May 24 11:48:20 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat May 24 11:48:20 2014 +0100
----------------------------------------------------------------------
.../components/scalars/primitive/BooleanPanel.java | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e8d0ae95/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
index 520f56b..ceb47dd 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
@@ -19,20 +19,16 @@
package org.apache.isis.viewer.wicket.ui.components.scalars.primitive;
-import java.util.List;
-
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
-import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.FormComponentLabel;
import org.apache.wicket.model.Model;
-
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarModelSubscriber;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
@@ -117,6 +113,15 @@ public class BooleanPanel extends ScalarPanelAbstract {
checkBox.setOutputMarkupId(true);
checkBox.setEnabled(false); // will be enabled before rendering if
// required
+
+ // must prime the underlying model if this is a primitive boolean
+ final ObjectSpecification objectSpecification = getModel().getTypeOfSpecification();
+ if(objectSpecification.getFullIdentifier().equals("boolean")) {
+ if(getModel().getObject() == null) {
+ getModel().setObject(getAdapterManager().adapterFor(false));
+ }
+ }
+
return checkBox;
}