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/15 11:27:48 UTC

[08/49] isis git commit: ISIS-1003: further tiny improvements to "veto" convenience method.

ISIS-1003: further tiny improvements to "veto" convenience method.


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

Branch: refs/heads/ISIS-970
Commit: c251ac410d630f795718ec40eaa6c40549ce0975
Parents: aecba01
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Jan 13 07:26:34 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Jan 13 07:27:08 2015 +0000

----------------------------------------------------------------------
 .../applib/services/eventbus/AbstractInteractionEvent.java  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/c251ac41/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractInteractionEvent.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractInteractionEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractInteractionEvent.java
index 0810661..d52d9ef 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractInteractionEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractInteractionEvent.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 AbstractInteractionEvent<S> extends java.util.EventObject {
@@ -141,15 +142,17 @@ public abstract class AbstractInteractionEvent<S> extends java.util.EventObject
      * </p>
      *
      * @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