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 2015/01/20 07:48:52 UTC

[36/38] isis git commit: ISIS-970, ISIS-1003: Reapply veto(...) change to AbstractDomainEvent.

ISIS-970, ISIS-1003: Reapply veto(...) change to AbstractDomainEvent.

Trivial fix for ToDoItemContributions


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

Branch: refs/heads/ISIS-970
Commit: 9124c9955aa835b8f8913552f388ddcd204596c7
Parents: a4408c8
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jan 14 17:03:54 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Jan 19 08:34:08 2015 +0000

----------------------------------------------------------------------
 .../applib/services/eventbus/AbstractDomainEvent.java   | 12 +++++++-----
 .../src/main/java/dom/todo/ToDoItemContributions.java   |  3 ++-
 2 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/9124c995/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractDomainEvent.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractDomainEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractDomainEvent.java
index 836272c..e843cbe 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractDomainEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractDomainEvent.java
@@ -21,6 +21,7 @@ package org.apache.isis.applib.services.eventbus;
 import java.util.Map;
 import com.google.common.collect.Maps;
 import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.util.ObjectContracts;
 
 public abstract class AbstractDomainEvent<S> extends java.util.EventObject {
@@ -131,7 +132,6 @@ public abstract class AbstractDomainEvent<S> extends java.util.EventObject {
     //endregion
 
     //region > veto
-
     /**
      * Use instead of {@link #hide()}, {@link #disable(String)} and {@link #invalidate(String)}; just delegates to
      * appropriate vetoing method based upon the {@link #getPhase()}.
@@ -140,16 +140,18 @@ public abstract class AbstractDomainEvent<S> extends java.util.EventObject {
      *     If hiding, just pass <tt>null</tt> for the parameter.
      * </p>
      *
-     * @param reason - reason why the interaction is being invalidated (ignored if in {@link org.apache.isis.applib.services.eventbus.AbstractDomainEvent.Phase#HIDE hide} phase).
+     * @param reason - reason why the interaction is being invalidated (ignored if in {@link org.apache.isis.applib.services.eventbus.AbstractInteractionEvent.Phase#HIDE hide} phase).
+     * @param args
      */
-    public void veto(final String reason) {
+    @Programmatic
+    public void veto(final String reason, final Object... args) {
         switch (getPhase()) {
             case HIDE:
                 hide();
             case DISABLE:
-                disable(reason);
+                disable(String.format(reason, args));
             case VALIDATE:
-                invalidate(reason);
+                invalidate(String.format(reason, args));
         }
     }
     //endregion

http://git-wip-us.apache.org/repos/asf/isis/blob/9124c995/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItemContributions.java
----------------------------------------------------------------------
diff --git a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItemContributions.java b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItemContributions.java
index 369f743..3a9b6a9 100644
--- a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItemContributions.java
+++ b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItemContributions.java
@@ -32,6 +32,7 @@ import org.joda.time.LocalDate;
 import org.apache.isis.applib.AbstractFactoryAndRepository;
 import org.apache.isis.applib.annotation.Action;
 import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.ActionSemantics;
 import org.apache.isis.applib.annotation.Disabled;
 import org.apache.isis.applib.annotation.DomainService;
 import org.apache.isis.applib.annotation.NotContributed;
@@ -235,7 +236,7 @@ public class ToDoItemContributions extends AbstractFactoryAndRepository {
     /**
      * Demonstrates functionality of streaming back Clob/Blob result within an action with a prompt, i.e. Ajax request
      */
-    @ActionSemantics(Of.SAFE)
+    @ActionSemantics(ActionSemantics.Of.SAFE)
     @NotInServiceMenu
     public Clob exportAsJson(
             final ToDoItem toDoItem,