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 2013/08/01 09:58:51 UTC
[3/4] git commit: ISIS-485: applying patch from Oscar Bou
ISIS-485: applying patch from Oscar Bou
Author: o.bou@gesconsultor.com
Signed-off-by: Dan Haywood <da...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/5e57d824
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/5e57d824
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/5e57d824
Branch: refs/heads/master
Commit: 5e57d824ba80ab20226c3593390d7c6f2e5adc6d
Parents: 6126bb1
Author: Dan Haywood <da...@apache.org>
Authored: Thu Aug 1 08:28:26 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Thu Aug 1 08:28:26 2013 +0100
----------------------------------------------------------------------
.../isis/applib/events/ActionArgumentEvent.java | 7 ++++++-
.../isis/applib/events/InteractionEvent.java | 17 +++++++++++++++++
.../apache/isis/applib/events/ValidityEvent.java | 5 +++++
.../services/wrapper/InteractionException.java | 2 +-
4 files changed, 29 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/5e57d824/core/applib/src/main/java/org/apache/isis/applib/events/ActionArgumentEvent.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/ActionArgumentEvent.java b/core/applib/src/main/java/org/apache/isis/applib/events/ActionArgumentEvent.java
index ac161e0..e59ce18 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/ActionArgumentEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/events/ActionArgumentEvent.java
@@ -64,5 +64,10 @@ public class ActionArgumentEvent extends ValidityEvent {
public Object getProposed() {
return proposed;
}
-
+
+ @Override
+ public String getReasonMessage() {
+ return String.format("%s. Position: %s. Proposed: %s", super.getReasonMessage(), this.getPosition(), this.getProposed());
+ }
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/5e57d824/core/applib/src/main/java/org/apache/isis/applib/events/InteractionEvent.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/InteractionEvent.java b/core/applib/src/main/java/org/apache/isis/applib/events/InteractionEvent.java
index 65e44f6..dba1bb8 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/InteractionEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/events/InteractionEvent.java
@@ -131,6 +131,23 @@ public abstract class InteractionEvent extends EventObject {
public String getReason() {
return reason;
}
+
+ /**
+ * The reason message, if any, that this interaction may have been vetoed or
+ * otherwise disallowed.
+ *
+ * <p>
+ * This message should be overridden by subclasses for containing the Reason, the Identifier and any other relevant context information.
+ *
+ * @return
+ */
+ public String getReasonMessage() {
+ if (this.getIdentifier() != null) {
+ return String.format("Reason: %s. Identifier: %s", this.getReason(), this.getIdentifier());
+ } else {
+ return String.format("Reason: %s", this.getReason());
+ }
+ }
/**
* The class of the (first) advisor, if any, that provided the
http://git-wip-us.apache.org/repos/asf/isis/blob/5e57d824/core/applib/src/main/java/org/apache/isis/applib/events/ValidityEvent.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/ValidityEvent.java b/core/applib/src/main/java/org/apache/isis/applib/events/ValidityEvent.java
index 5680db7..d452400 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/ValidityEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/events/ValidityEvent.java
@@ -54,4 +54,9 @@ public abstract class ValidityEvent extends InteractionEvent implements Proposed
public Object getSource() {
return super.getSource();
}
+
+ @Override
+ public String getReasonMessage() {
+ return String.format("Source: %s. %s", this.getSource(), super.getReasonMessage());
+ }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/5e57d824/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/InteractionException.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/InteractionException.java b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/InteractionException.java
index f734b3f..cb8b643 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/InteractionException.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/wrapper/InteractionException.java
@@ -30,7 +30,7 @@ public abstract class InteractionException extends ApplicationException {
private final InteractionEvent interactionEvent;
public InteractionException(final InteractionEvent interactionEvent) {
- super(interactionEvent.getReason());
+ super(interactionEvent.getReasonMessage());
this.interactionEvent = interactionEvent;
}