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 2017/07/24 17:07:16 UTC

[3/4] isis git commit: ISIS-1667: add guard in ComponentFactory for action parameters panel, ensure has parameters. Also...

ISIS-1667: add guard in ComponentFactory for action parameters panel, ensure has parameters.  Also...

Also, flip the if statement in the panel itself and make more obvious failing fast.


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

Branch: refs/heads/master
Commit: ebe678f62d44af37b614c27e90fb311472ded710
Parents: 4283fb6
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Jul 24 18:02:08 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Jul 24 18:02:08 2017 +0100

----------------------------------------------------------------------
 .../ui/components/actions/ActionParametersPanel.java      | 10 +++++-----
 .../components/actions/ActionParametersPanelFactory.java  |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/ebe678f6/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.java
index f79415e..a962370 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.java
@@ -93,7 +93,11 @@ public class ActionParametersPanel extends PanelAbstract<ActionModel> {
         // buildGui(getModel());
         final ActionModel actionModel = getModel();
 
-        if (actionModel.hasParameters()) {
+        if (!actionModel.hasParameters()) {
+            // buildGuiForNoParameters(actionModel);
+
+            throw new IllegalStateException("model has no parameters!");
+        } else {
 
             // buildGuiForParameters(getActionModel());
 
@@ -132,10 +136,6 @@ public class ActionParametersPanel extends PanelAbstract<ActionModel> {
                 final MessageService messageService = getServicesInjector().lookupService(MessageService.class);
                 messageService.warnUser(ex.getMessage());
             }
-        } else {
-            // buildGuiForNoParameters(actionModel);
-
-            throw new IllegalStateException("model has no parameters!");
         }
     }
 

http://git-wip-us.apache.org/repos/asf/isis/blob/ebe678f6/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanelFactory.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanelFactory.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanelFactory.java
index 5d92915..6bad3c7 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanelFactory.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanelFactory.java
@@ -40,7 +40,7 @@ public class ActionParametersPanelFactory extends ComponentFactoryAbstract {
 
     @Override
     public ApplicationAdvice appliesTo(final IModel<?> model) {
-        return appliesIf(model instanceof ActionModel);
+        return appliesIf(model instanceof ActionModel && ((ActionModel)model).hasParameters());
     }
 
     @Override