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/06/13 11:27:06 UTC

git commit: ISIS-800: improvements to the wizard

Repository: isis
Updated Branches:
  refs/heads/master a2916d7c9 -> 73050278c


ISIS-800: improvements to the wizard

... sorted out that issue with drop-down choices not being disabled (was a bug in ValueSelect2ChoicesPanel, not in EntityPropertiesForm itself)

Also:
- extended the ToDoItemWizard to demonstrate
- refactored/improved/better documented the Wicket viewer's use of the Wicket event bus (even though it turns out that I didn't need to use it in order to fix the issue...).


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/73050278
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/73050278
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/73050278

Branch: refs/heads/master
Commit: 73050278c715cadaf1938f6a680c5cd562b96154
Parents: a2916d7
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Jun 13 10:10:38 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Jun 13 10:10:38 2014 +0100

----------------------------------------------------------------------
 .../model/hints/IsisActionCompletedEvent.java   | 45 +++++++++++++
 .../wicket/model/hints/IsisEnvelopeEvent.java   | 64 +++++++++++++++++++
 .../wicket/model/hints/IsisEventAbstract.java   | 53 ++++++++++++++++
 .../model/hints/IsisEventLetterAbstract.java    | 34 ++++++++++
 .../wicket/model/hints/IsisUiHintEvent.java     | 38 +++++++++++
 .../model/hints/UiHintsBroadcastEvent.java      | 30 ---------
 .../model/hints/UiHintsEventAbstract.java       | 44 -------------
 .../wicket/model/hints/UiHintsSetEvent.java     | 28 --------
 .../actions/ActionParametersFormPanel.java      |  5 ++
 .../ajaxtable/IsisAjaxFallbackDataTable.java    |  8 +--
 .../IsisAjaxFallbackOrderByBorder.java          |  3 -
 .../IsisAjaxPagingNavigationIncrementLink.java  |  2 -
 .../entity/properties/EntityPropertiesForm.java | 36 +++++++++++
 .../scalars/reference/ReferencePanel.java       |  1 +
 .../valuechoices/ValueChoicesSelect2Panel.java  |  3 +
 .../widgets/zclip/ZeroClipboardPanel.java       | 15 +++--
 .../viewer/wicket/ui/pages/PageAbstract.java    | 28 ++++----
 .../wicket/ui/pages/entity/EntityPage.java      | 14 ++--
 .../links/LinksSelectorPanelAbstract.java       |  6 +-
 .../dom/src/main/java/app/ToDoItemWizard.java   | 67 ++++++++++++++++----
 .../main/java/app/ToDoItemWizard.layout.json    | 40 +++++++++++-
 21 files changed, 409 insertions(+), 155 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/73050278/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisActionCompletedEvent.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisActionCompletedEvent.java b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisActionCompletedEvent.java
new file mode 100644
index 0000000..e020070
--- /dev/null
+++ b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisActionCompletedEvent.java
@@ -0,0 +1,45 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.isis.viewer.wicket.model.hints;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.isis.viewer.wicket.model.models.ActionModel;
+
+/**
+ *
+ */
+public class IsisActionCompletedEvent extends IsisEventLetterAbstract {
+
+    private final ActionModel actionModel;
+    private final Form<?> form;
+
+    public IsisActionCompletedEvent(ActionModel actionModel, AjaxRequestTarget target, Form<?> form) {
+        super(target);
+        this.actionModel = actionModel;
+        this.form = form;
+    }
+
+    public ActionModel getActionModel() {
+        return actionModel;
+    }
+
+    public Form<?> getForm() {
+        return form;
+    }
+}
+

http://git-wip-us.apache.org/repos/asf/isis/blob/73050278/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEnvelopeEvent.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEnvelopeEvent.java b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEnvelopeEvent.java
new file mode 100644
index 0000000..e072abe
--- /dev/null
+++ b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEnvelopeEvent.java
@@ -0,0 +1,64 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.isis.viewer.wicket.model.hints;
+
+
+import org.apache.wicket.event.IEvent;
+
+/**
+ * Broadcast down by <tt>PageAbstract</tt> to all child components
+ */
+public class IsisEnvelopeEvent extends IsisEventAbstract {
+
+    private final IsisEventLetterAbstract letter;
+
+    public IsisEnvelopeEvent(IsisEventLetterAbstract ev) {
+        super(ev.getTarget());
+        this.letter = ev;
+    }
+
+    public IsisEventLetterAbstract getLetter() {
+        return letter;
+    }
+
+    /**
+     * Opens the event, checks the event is an {@link org.apache.isis.viewer.wicket.model.hints.IsisEnvelopeEvent envelope} (event),
+     * fetches the {@link org.apache.isis.viewer.wicket.model.hints.IsisEventLetterAbstract letter} (event) inside, and
+     * returns if the letter is of the required type.
+     *
+     * <p>
+     * Otherwise returns <tt>null</tt>.
+     * </p>
+     */
+    public static <T> T openLetter(final IEvent<?> event, Class<T> letterEventClass) {
+        if(!(event.getPayload() instanceof IsisEnvelopeEvent)) {
+            return null;
+        }
+        final IsisEnvelopeEvent ev = (IsisEnvelopeEvent) event.getPayload();
+        final IsisEventLetterAbstract letter = ev.getLetter();
+        if(letter == null) {
+            return null;
+        }
+        if(!letterEventClass.isAssignableFrom(letter.getClass())) {
+            return null;
+        }
+        return letterEventClass.cast(letter);
+    }
+
+
+}
+

http://git-wip-us.apache.org/repos/asf/isis/blob/73050278/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEventAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEventAbstract.java b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEventAbstract.java
new file mode 100644
index 0000000..b27777b
--- /dev/null
+++ b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEventAbstract.java
@@ -0,0 +1,53 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.isis.viewer.wicket.model.hints;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+
+/**
+ * All Isis-related events subclass from this, and fall into two categories.
+ *
+ * <p>
+ * Components that are raising events should create a subclass of {@link org.apache.isis.viewer.wicket.model.hints.IsisEventLetterAbstract} (the letter)
+ * and then {@link org.apache.wicket.Component#send(org.apache.wicket.event.IEventSink, org.apache.wicket.event.Broadcast, Object) send} as a
+ * {@link org.apache.wicket.event.Broadcast#EXACT exact} message to <tt>PageAbstract</tt>.
+ * </p>
+ *
+ * <p>
+ * Then, <tt>PageAbstract</tt> will wrap the letter into the {@link org.apache.isis.viewer.wicket.model.hints.IsisEnvelopeEvent} (envelope) and
+ * send as a {@link org.apache.wicket.event.Broadcast#BREADTH down} to all its components.
+ * </p>
+ */
+public abstract class IsisEventAbstract {
+    
+    private final AjaxRequestTarget target;
+    
+    public IsisEventAbstract(AjaxRequestTarget target) {
+        this.target = target;
+    }
+
+    /**
+     * The {@link AjaxRequestTarget target}, if any, that caused this event to be generated.
+     * 
+     * <p>
+     * Typically populated, but not always...
+     */
+    public AjaxRequestTarget getTarget() {
+        return target;
+    }
+}
+

http://git-wip-us.apache.org/repos/asf/isis/blob/73050278/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEventLetterAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEventLetterAbstract.java b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEventLetterAbstract.java
new file mode 100644
index 0000000..2361ba2
--- /dev/null
+++ b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisEventLetterAbstract.java
@@ -0,0 +1,34 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.isis.viewer.wicket.model.hints;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+
+/**
+ * All events to be propogated should inherit from this.
+ *
+ * <p>
+ *
+ * </p>
+ */
+public abstract class IsisEventLetterAbstract extends IsisEventAbstract {
+
+    public IsisEventLetterAbstract(AjaxRequestTarget target) {
+        super(target);
+    }
+}
+

http://git-wip-us.apache.org/repos/asf/isis/blob/73050278/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisUiHintEvent.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisUiHintEvent.java b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisUiHintEvent.java
new file mode 100644
index 0000000..a5ddbe7
--- /dev/null
+++ b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/IsisUiHintEvent.java
@@ -0,0 +1,38 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.isis.viewer.wicket.model.hints;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+
+/**
+ *
+ */
+public class IsisUiHintEvent extends IsisEventLetterAbstract {
+    
+    private final UiHintContainer uiHintContainer;
+
+    public IsisUiHintEvent(UiHintContainer uiHintContainer, AjaxRequestTarget target) {
+        super(target);
+        this.uiHintContainer = uiHintContainer;
+    }
+
+    public UiHintContainer getUiHintContainer() {
+        return uiHintContainer;
+    }
+
+}
+

http://git-wip-us.apache.org/repos/asf/isis/blob/73050278/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintsBroadcastEvent.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintsBroadcastEvent.java b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintsBroadcastEvent.java
deleted file mode 100644
index 45d70cb..0000000
--- a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintsBroadcastEvent.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.isis.viewer.wicket.model.hints;
-
-
-public class UiHintsBroadcastEvent extends UiHintsEventAbstract {
-    
-    public UiHintsBroadcastEvent(UiHintsEventAbstract ev) {
-        super(ev.getUiHintContainer(), ev.getTarget());
-    }
-    public UiHintsBroadcastEvent(UiHintContainer uiHintContainer) {
-        super(uiHintContainer, null);
-    }
-    
-}
-

http://git-wip-us.apache.org/repos/asf/isis/blob/73050278/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintsEventAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintsEventAbstract.java b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintsEventAbstract.java
deleted file mode 100644
index cd32772..0000000
--- a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintsEventAbstract.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.isis.viewer.wicket.model.hints;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-
-public abstract class UiHintsEventAbstract {
-    
-    private final UiHintContainer uiHintContainer;
-    private final AjaxRequestTarget target;
-    
-    public UiHintsEventAbstract(UiHintContainer uiHintContainer, AjaxRequestTarget target) {
-        this.uiHintContainer = uiHintContainer;
-        this.target = target;
-    }
-
-    public UiHintContainer getUiHintContainer() {
-        return uiHintContainer;
-    }
-    /**
-     * The {@link AjaxRequestTarget target}, if any, that caused this event to be generated.
-     * 
-     * <p>
-     * Typically populated, but not always...
-     */
-    public AjaxRequestTarget getTarget() {
-        return target;
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/isis/blob/73050278/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintsSetEvent.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintsSetEvent.java b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintsSetEvent.java
deleted file mode 100644
index cc216f2..0000000
--- a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/hints/UiHintsSetEvent.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.isis.viewer.wicket.model.hints;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-
-public class UiHintsSetEvent extends UiHintsEventAbstract {
-    
-    public UiHintsSetEvent(UiHintContainer uiHintContainer, AjaxRequestTarget target) {
-        super(uiHintContainer, target);
-    }
-    
-}
-

http://git-wip-us.apache.org/repos/asf/isis/blob/73050278/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
index 8b2b6fd..e72a87e 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
@@ -24,6 +24,7 @@ import com.google.common.collect.Lists;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.event.Broadcast;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.repeater.RepeatingView;
@@ -32,6 +33,7 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.viewer.wicket.model.hints.IsisActionCompletedEvent;
 import org.apache.isis.viewer.wicket.model.mementos.ActionParameterMemento;
 import org.apache.isis.viewer.wicket.model.models.ActionExecutor;
 import org.apache.isis.viewer.wicket.model.models.ActionModel;
@@ -153,6 +155,9 @@ public class ActionParametersFormPanel extends PanelAbstract<ActionModel> {
                         // we now show it once more, so that a veil continues to be shown until the
                         // new page is rendered.
                         target.appendJavaScript("isisShowVeil();\n");
+
+                        send(getPage(), Broadcast.EXACT, new IsisActionCompletedEvent(getActionModel(), target, form));
+
                         target.add(form);
                     } else {
                         if (actionPromptIfAny != null) {

http://git-wip-us.apache.org/repos/asf/isis/blob/73050278/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackDataTable.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackDataTable.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackDataTable.java
index b08d498..da11850 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackDataTable.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackDataTable.java
@@ -24,7 +24,6 @@ import java.util.Map;
 
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.event.Broadcast;
-import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxNavigationToolbar;
 import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
@@ -34,13 +33,12 @@ import org.apache.wicket.markup.repeater.IItemFactory;
 import org.apache.wicket.markup.repeater.IItemReuseStrategy;
 import org.apache.wicket.markup.repeater.Item;
 import org.apache.wicket.markup.repeater.OddEvenItem;
-import org.apache.wicket.markup.repeater.ReuseIfModelsEqualStrategy;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.util.lang.Generics;
 
+import org.apache.isis.viewer.wicket.model.hints.IsisUiHintEvent;
 import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
 import org.apache.isis.viewer.wicket.model.hints.UiHintPathSignificant;
-import org.apache.isis.viewer.wicket.model.hints.UiHintsSetEvent;
 
 public class IsisAjaxFallbackDataTable<T, S> extends DataTable<T, S> implements UiHintPathSignificant {
     
@@ -174,7 +172,7 @@ public class IsisAjaxFallbackDataTable<T, S> extends DataTable<T, S> implements
             return;
         } 
         uiHintContainer.setHint(this, IsisAjaxFallbackDataTable.UIHINT_PAGE_NUMBER, ""+getCurrentPage());
-        send(getPage(), Broadcast.EXACT, new UiHintsSetEvent(uiHintContainer, target));
+        send(getPage(), Broadcast.EXACT, new IsisUiHintEvent(uiHintContainer, target));
     }
 
     public void setSortOrderHintAndBroadcast(SortOrder order, String property, AjaxRequestTarget target) {
@@ -189,7 +187,7 @@ public class IsisAjaxFallbackDataTable<T, S> extends DataTable<T, S> implements
         }
         // .. then set this one
         uiHintContainer.setHint(this, order.name(), property);
-        send(getPage(), Broadcast.EXACT, new UiHintsSetEvent(uiHintContainer, target));
+        send(getPage(), Broadcast.EXACT, new IsisUiHintEvent(uiHintContainer, target));
     }
 
     private UiHintContainer getUiHintContainer() {

http://git-wip-us.apache.org/repos/asf/isis/blob/73050278/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackOrderByBorder.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackOrderByBorder.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackOrderByBorder.java
index 6b4c8fb..596788a 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackOrderByBorder.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackOrderByBorder.java
@@ -18,15 +18,12 @@ package org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable
 
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.attributes.IAjaxCallListener;
-import org.apache.wicket.event.Broadcast;
 import org.apache.wicket.extensions.ajax.markup.html.repeater.data.sort.AjaxFallbackOrderByBorder;
 import org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortState;
 import org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortStateLocator;
 import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
 
 import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
-import org.apache.isis.viewer.wicket.model.hints.UiHintsSetEvent;
 
 public class IsisAjaxFallbackOrderByBorder<T> extends AjaxFallbackOrderByBorder<T> {
 

http://git-wip-us.apache.org/repos/asf/isis/blob/73050278/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigationIncrementLink.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigationIncrementLink.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigationIncrementLink.java
index 0a94eff..ca00833 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigationIncrementLink.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxPagingNavigationIncrementLink.java
@@ -19,11 +19,9 @@ package org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigationIncrementLink;
-import org.apache.wicket.event.Broadcast;
 import org.apache.wicket.markup.html.navigation.paging.IPageable;
 
 import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
-import org.apache.isis.viewer.wicket.model.hints.UiHintsSetEvent;
 
 public class IsisAjaxPagingNavigationIncrementLink extends AjaxPagingNavigationIncrementLink {
 

http://git-wip-us.apache.org/repos/asf/isis/blob/73050278/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java
index f1e8cdd..7d4461f 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java
@@ -27,6 +27,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
 import org.apache.wicket.ajax.markup.html.form.AjaxButton;
 import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.event.IEvent;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.Button;
@@ -61,6 +62,8 @@ import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.core.runtime.memento.Memento;
 import org.apache.isis.core.runtime.system.context.IsisContext;
 import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
+import org.apache.isis.viewer.wicket.model.hints.IsisActionCompletedEvent;
+import org.apache.isis.viewer.wicket.model.hints.IsisEnvelopeEvent;
 import org.apache.isis.viewer.wicket.model.mementos.PropertyMemento;
 import org.apache.isis.viewer.wicket.model.models.EntityModel;
 import org.apache.isis.viewer.wicket.model.models.ScalarModel;
@@ -819,6 +822,39 @@ public class EntityPropertiesForm extends FormAbstract<ObjectAdapter> {
         component.add(new CssClassAppender("span"+numGridCols));
     }
 
+
+
+    @Override
+    public void onEvent(IEvent<?> event) {
+        super.onEvent(event);
+        final IsisActionCompletedEvent ev = IsisEnvelopeEvent.openLetter(event, IsisActionCompletedEvent.class);
+        if(ev == null) {
+            return;
+        }
+
+        // hmm, it turns out that there is no need to do anything here;
+        // was trying to force a redraw but the redraw was fine (just a bug in ValueChoicesSelect2Panel).
+        // even though this callback is now redundant, gonna leave it in for future reference of how to
+        // propogage and handle events
+        return;
+
+//        final AjaxRequestTarget target = ev.getTarget();
+//        if(target == null) {
+//            // just in case...
+//            return;
+//        }
+//
+//        if(getEntityModel().isEditMode()) {
+//            toEditMode(target);
+//        } else {
+//            toViewMode(target);
+//        }
+//
+//        // force a redraw...
+//        onBeforeRender();
+    }
+
+
     ///////////////////////////////////////////////////////
     // Dependencies (from context)
     ///////////////////////////////////////////////////////

http://git-wip-us.apache.org/repos/asf/isis/blob/73050278/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
index d5c52a2..d3cdcf3 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
@@ -203,6 +203,7 @@ public class ReferencePanel extends ScalarPanelAbstract {
     // syncWithInput
     // //////////////////////////////////////
 
+
     // called from onBeforeRender*
     // (was previous called by EntityLinkSelect2Panel in onBeforeRender, this responsibility now moved)
     private void syncWithInput() {

http://git-wip-us.apache.org/repos/asf/isis/blob/73050278/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
index 61e8cf2..b0c7079 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
@@ -177,12 +177,15 @@ public class ValueChoicesSelect2Panel extends ScalarPanelAbstract implements Sca
     protected void onBeforeRenderWhenEnabled() { 
         // Edit: read/write
         select2Field.setEnabled(true);
+
+        // TODO: should the title AttributeModifier installed in onBeforeWhenDisabled be removed here?
     }
 
     @Override
     protected void onBeforeRenderWhenDisabled(final String disableReason) {
         super.onBeforeRenderWhenDisabled(disableReason);
         setTitleAttribute(disableReason);
+        select2Field.setEnabled(false);
     }
 
     private void setTitleAttribute(final String titleAttribute) {

http://git-wip-us.apache.org/repos/asf/isis/blob/73050278/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
index d83351b..1d022dd 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
@@ -26,10 +26,10 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 import org.apache.wicket.model.LoadableDetachableModel;
 import org.apache.wicket.request.Url;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
-
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.viewer.wicket.model.hints.IsisEnvelopeEvent;
+import org.apache.isis.viewer.wicket.model.hints.IsisUiHintEvent;
 import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
-import org.apache.isis.viewer.wicket.model.hints.UiHintsBroadcastEvent;
 import org.apache.isis.viewer.wicket.model.models.EntityModel;
 import org.apache.isis.viewer.wicket.model.models.PageType;
 import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
@@ -146,17 +146,18 @@ public class ZeroClipboardPanel extends PanelAbstract<EntityModel> {
     @Override
     public void onEvent(IEvent<?> event) {
         super.onEvent(event);
-        if(!(event.getPayload() instanceof UiHintsBroadcastEvent)) {
+
+        final IsisUiHintEvent uiHintEvent = IsisEnvelopeEvent.openLetter(event, IsisUiHintEvent.class);
+        if(uiHintEvent == null) {
             return;
         } 
-        final UiHintsBroadcastEvent ev = (UiHintsBroadcastEvent) event.getPayload();
-        addSubscribingLink(ev.getUiHintContainer());
-        AjaxRequestTarget target = ev.getTarget();
+        addSubscribingLink(uiHintEvent.getUiHintContainer());
+        final AjaxRequestTarget target = uiHintEvent.getTarget();
         if(target != null) {
             target.add(subscribingLink);
         }
     }
-    
+
     // //////////////////////////////////////
 
     protected PageClassRegistry getPageClassRegistry() {

http://git-wip-us.apache.org/repos/asf/isis/blob/73050278/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index 45bfacd..bc9c8ef 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -61,8 +61,9 @@ import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
 import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
 import org.apache.isis.core.runtime.system.context.IsisContext;
 import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
-import org.apache.isis.viewer.wicket.model.hints.UiHintsBroadcastEvent;
-import org.apache.isis.viewer.wicket.model.hints.UiHintsSetEvent;
+import org.apache.isis.viewer.wicket.model.hints.IsisEnvelopeEvent;
+import org.apache.isis.viewer.wicket.model.hints.IsisEventLetterAbstract;
+import org.apache.isis.viewer.wicket.model.hints.IsisUiHintEvent;
 import org.apache.isis.viewer.wicket.model.models.ActionPrompt;
 import org.apache.isis.viewer.wicket.model.models.ActionPromptProvider;
 import org.apache.isis.viewer.wicket.model.models.ApplicationActionsModel;
@@ -98,7 +99,7 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
     private static final String REGULAR_CASE_KEY = "isis.viewer.wicket.regularCase";
 
     /**
-     * @see https://github.com/brandonaaron/livequery
+     * @see  http://github.com/brandonaaron/livequery
      */
     private static final JavaScriptResourceReference JQUERY_LIVEQUERY_JS = new JavaScriptResourceReference(PageAbstract.class, "jquery.livequery.js");
     private static final JavaScriptResourceReference JQUERY_ISIS_WICKET_VIEWER_JS = new JavaScriptResourceReference(PageAbstract.class, "jquery.isis.wicket.viewer.js");
@@ -163,7 +164,11 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
         EXCLUDE
     }
     
-    public PageAbstract(final PageParameters pageParameters, ApplicationActions applicationActions, final String title, final ComponentType... childComponentIds) {
+    public PageAbstract(
+            final PageParameters pageParameters,
+            final ApplicationActions applicationActions,
+            final String title,
+            final ComponentType... childComponentIds) {
         try {
             // for breadcrumbs support
             getSession().bind();
@@ -219,12 +224,10 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
         return pageClassRegistry.getPageClass(PageType.SIGN_IN);
     }
 
-
     private static String asCssStyle(final String str) {
         return StringExtensions.asLowerDashed(str);
     }
 
-
     protected ExceptionModel recognizeException(Exception ex) {
         List<ExceptionRecognizer> exceptionRecognizers;
         try {
@@ -237,8 +240,6 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
         return ExceptionModel.create(recognizedMessageIfAny, ex);
     }
 
-    
-
     @Override
     public void renderHead(IHeaderResponse response) {
         
@@ -327,7 +328,7 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
     
 
     /**
-     * As provided in the {@link #PageAbstract(ComponentType) constructor}.
+     * As provided in the {@link #PageAbstract(org.apache.wicket.request.mapper.parameter.PageParameters, org.apache.isis.viewer.wicket.ui.pages.PageAbstract.ApplicationActions, String, org.apache.isis.viewer.wicket.ui.ComponentType...)} constructor}.
      * 
      * <p>
      * This superclass doesn't do anything with this property directly, but
@@ -424,13 +425,14 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
     // ///////////////////////////////////////////////////////////////////
 
     /**
-     * Propogate any received events down to all child components.
+     * Propogates all {@link org.apache.isis.viewer.wicket.model.hints.IsisEventLetterAbstract letter} events down to
+     * all child components, wrapped in an {@link org.apache.isis.viewer.wicket.model.hints.IsisEnvelopeEvent envelope} event.
      */
     public void onEvent(org.apache.wicket.event.IEvent<?> event) {
         Object payload = event.getPayload();
-        if(payload instanceof UiHintsSetEvent) {
-            UiHintsSetEvent setEv = (UiHintsSetEvent)payload;
-            UiHintsBroadcastEvent broadcastEv = new UiHintsBroadcastEvent(setEv);
+        if(payload instanceof IsisEventLetterAbstract) {
+            IsisEventLetterAbstract letter = (IsisEventLetterAbstract)payload;
+            IsisEnvelopeEvent broadcastEv = new IsisEnvelopeEvent(letter);
             send(this, Broadcast.BREADTH, broadcastEv);
         }
     }

http://git-wip-us.apache.org/repos/asf/isis/blob/73050278/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
index 8c1018f..0ec7fa6 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
@@ -23,13 +23,12 @@ import org.apache.wicket.authroles.authorization.strategies.role.annotations.Aut
 import org.apache.wicket.event.Broadcast;
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
-
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
 import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
 import org.apache.isis.core.runtime.system.DeploymentType;
 import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.viewer.wicket.model.hints.UiHintsBroadcastEvent;
+import org.apache.isis.viewer.wicket.model.hints.IsisUiHintEvent;
 import org.apache.isis.viewer.wicket.model.models.EntityModel;
 import org.apache.isis.viewer.wicket.ui.ComponentType;
 import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModel;
@@ -70,13 +69,18 @@ public class EntityPage extends PageAbstract {
         this(new PageParameters(), newEntityModel(adapter, exIfAny));
     }
 
-    private static EntityModel newEntityModel(ObjectAdapter adapter, ConcurrencyException exIfAny) {
+    private static EntityModel newEntityModel(
+            final ObjectAdapter adapter,
+            final ConcurrencyException exIfAny) {
         EntityModel model = new EntityModel(adapter);
         model.setException(exIfAny);
         return model;
     }
 
-    private EntityPage(PageParameters pageParameters, EntityModel entityModel, String titleString) {
+    private EntityPage(
+            final PageParameters pageParameters,
+            final EntityModel entityModel,
+            final String titleString) {
         super(pageParameters, ApplicationActions.INCLUDE, titleString, ComponentType.ENTITY);
 
         this.model = entityModel;
@@ -115,7 +119,7 @@ public class EntityPage extends PageAbstract {
         addBookmarkedPages();
 
         // ensure the copy link holds this page.
-        send(this, Broadcast.BREADTH, new UiHintsBroadcastEvent(entityModel));
+        send(this, Broadcast.BREADTH, new IsisUiHintEvent(entityModel, null));
     }
 
     private void addBreadcrumb(EntityModel entityModel) {

http://git-wip-us.apache.org/repos/asf/isis/blob/73050278/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.java
index 82f0e72..7e2d935 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.java
@@ -19,7 +19,6 @@
 
 package org.apache.isis.viewer.wicket.ui.selector.links;
 
-import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -44,15 +43,14 @@ import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 
 import org.apache.isis.core.commons.lang.StringExtensions;
+import org.apache.isis.viewer.wicket.model.hints.IsisUiHintEvent;
 import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
 import org.apache.isis.viewer.wicket.model.hints.UiHintPathSignificant;
-import org.apache.isis.viewer.wicket.model.hints.UiHintsSetEvent;
 import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
 import org.apache.isis.viewer.wicket.model.links.LinksProvider;
 import org.apache.isis.viewer.wicket.ui.ComponentFactory;
 import org.apache.isis.viewer.wicket.ui.ComponentType;
 import org.apache.isis.viewer.wicket.ui.components.additionallinks.AdditionalLinksPanel;
-import org.apache.isis.viewer.wicket.ui.components.collection.CollectionCountProvider;
 import org.apache.isis.viewer.wicket.ui.components.collectioncontents.unresolved.CollectionContentsAsUnresolvedPanelFactory;
 import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
 import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
@@ -244,7 +242,7 @@ public abstract class LinksSelectorPanelAbstract<T extends IModel<?>> extends Pa
             return;
         }
         uiHintContainer.setHint(LinksSelectorPanelAbstract.this, UIHINT_VIEW, ""+viewNum);
-        send(getPage(), Broadcast.EXACT, new UiHintsSetEvent(uiHintContainer, target));
+        send(getPage(), Broadcast.EXACT, new IsisUiHintEvent(uiHintContainer, target));
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/isis/blob/73050278/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/app/ToDoItemWizard.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/app/ToDoItemWizard.java b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/app/ToDoItemWizard.java
index aa67232..99c6aaf 100644
--- a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/app/ToDoItemWizard.java
+++ b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/app/ToDoItemWizard.java
@@ -72,20 +72,19 @@ public class ToDoItemWizard
         DESCRIPTION,
         CATEGORIES,
         DUE_BY,
-        CONFIRMATION_PAGE;
+        SUMMARY_PAGE;
 
         public boolean hideDescription() {
-            return this != DESCRIPTION && this != CONFIRMATION_PAGE;
+            return this != DESCRIPTION;
         }
         public boolean hideCategories() {
-            return this != CATEGORIES && this != CONFIRMATION_PAGE;
+            return this != CATEGORIES;
         }
         public boolean hideDueBy() {
-            return this != DUE_BY && this != CONFIRMATION_PAGE;
+            return this != DUE_BY;
         }
-
-        public String disableFinish(ToDoItemWizard toDoItemWizard) {
-            return Strings.isNullOrEmpty(toDoItemWizard.getDescription())? "Must enter a description": null;
+        public boolean hideSummary() {
+            return this != SUMMARY_PAGE;
         }
 
         @Override
@@ -93,8 +92,8 @@ public class ToDoItemWizard
             switch (this) {
                 case DESCRIPTION: return CATEGORIES;
                 case CATEGORIES: return DUE_BY;
-                case DUE_BY: return CONFIRMATION_PAGE;
-                default: return CONFIRMATION_PAGE;
+                case DUE_BY: return SUMMARY_PAGE;
+                default: return null;
             }
         }
         @Override
@@ -105,7 +104,7 @@ public class ToDoItemWizard
         @Override
         public State previous() {
             switch (this) {
-                case CONFIRMATION_PAGE: return DUE_BY;
+                case SUMMARY_PAGE: return DUE_BY;
                 case DUE_BY: return CATEGORIES;
                 case CATEGORIES: return DESCRIPTION;
                 default: return null;
@@ -115,6 +114,7 @@ public class ToDoItemWizard
         public String disablePrevious(ToDoItemWizard w) {
             return w.getState().previous() == null? "No more pages": null;
         }
+
     }
     //endregion
 
@@ -155,12 +155,16 @@ public class ToDoItemWizard
     public boolean hideCategory() {
         return getState().hideCategories();
     }
+
+    public String disableCategory() {
+        return subcategory != null? "Use the update action to change both category and subcategory": null;
+    }
     //endregion
 
     //region > subcategory (hidden property)
     private ToDoItem.Subcategory subcategory;
 
-    @Hidden
+    @Disabled(reason = "Use the update action to change both category and subcategory")
     @Optional
     public ToDoItem.Subcategory getSubcategory() {
         return subcategory;
@@ -168,6 +172,10 @@ public class ToDoItemWizard
     public void setSubcategory(final ToDoItem.Subcategory subcategory) {
         this.subcategory = subcategory;
     }
+
+    public boolean hideSubcategory() {
+        return subcategory == null || getState().hideCategories();
+    }
     //endregion
 
     //region > dueBy (property)
@@ -196,6 +204,39 @@ public class ToDoItemWizard
     }
     //endregion
 
+    //region > summary propertyies
+    // ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    public String getDescriptionOnSummary() {
+        return getDescription();
+    }
+    public boolean hideDescriptionOnSummary() {
+        return getState().hideSummary();
+    }
+
+    public Category getCategoryOnSummary() {
+        return getCategory();
+    }
+    public boolean hideCategoryOnSummary() {
+        return getState().hideSummary();
+    }
+
+    public ToDoItem.Subcategory getSubcategoryOnSummary() {
+        return getSubcategory();
+    }
+    public boolean hideSubcategoryOnSummary() {
+        return getState().hideSummary() || getSubcategory() == null;
+    }
+
+    public LocalDate getDueByOnSummary() {
+        return getDueBy();
+    }
+    public boolean hideDueByOnSummary() {
+        return getState().hideSummary();
+    }
+    //endregion
+
+
     //region > finish (action)
     // ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     @MemberOrder(sequence = "1")
@@ -203,8 +244,10 @@ public class ToDoItemWizard
         return toDoItems.newToDo(getDescription(), getCategory(), getSubcategory(), getDueBy(), null);
     }
 
+    @Override
     public String disableFinish() {
-        return getState().disableFinish(this);
+        // no additional rules
+        return null;
     }
     //endregion
 

http://git-wip-us.apache.org/repos/asf/isis/blob/73050278/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/app/ToDoItemWizard.layout.json
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/app/ToDoItemWizard.layout.json b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/app/ToDoItemWizard.layout.json
index 87dad72..1c64423 100644
--- a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/app/ToDoItemWizard.layout.json
+++ b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/app/ToDoItemWizard.layout.json
@@ -3,20 +3,56 @@
         {
             "span": 12,
             "memberGroups": {
-                "General": {
+                "What task do you need to do?": {
                     "members": {
                         "description": {
                             "typicalLength": {
                                 "value": 50
                             }
-                        },
+                        }
+                    }
+                },
+                "Is it similar to other todo items?": {
+                    "members": {
                         "category": { },
+                        "subcategory": { }
+                    }
+                },
+                "Does it need to be done by a particular date?": {
+                    "members": {
                         "dueBy": {
                             "typicalLength": {
                                 "value": 12
                             }
                         }
                     }
+                },
+                "Confirm details are correct": {
+                    "members": {
+                        "descriptionOnSummary": {
+                            "named": {
+                                "value": "Description"
+                            },
+                            "typicalLength": {
+                                "value": 50
+                            }
+                        },
+                        "categoryOnSummary": {
+                            "named": {
+                                "value": "Category"
+                            }
+                        },
+                        "subcategoryOnSummary": {
+                            "named": {
+                                "value": "Subcategory"
+                            }
+                        },
+                        "dueByOnSummary": {
+                            "named": {
+                                "value": "Due by"
+                            }
+                        }
+                    }
                 }
             }
         },