You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2012/11/07 10:54:26 UTC
[2/3] git commit: DELTASPIKE-277 JsfMessage will now return the
Message parameter directly
DELTASPIKE-277 JsfMessage will now return the Message parameter directly
Previously we always did toString() internally. But that prevents
people from using the Message return value
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/34c03c37
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/34c03c37
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/34c03c37
Branch: refs/heads/master
Commit: 34c03c374dd3a5497a154fc311958915f0d63b78
Parents: 426b094
Author: Mark Struberg <st...@apache.org>
Authored: Wed Nov 7 10:39:02 2012 +0100
Committer: Mark Struberg <st...@apache.org>
Committed: Wed Nov 7 10:39:02 2012 +0100
----------------------------------------------------------------------
.../message/JsfMessageBundleInvocationHandler.java | 5 +++++
.../test/jsf/impl/message/beans/UserMessage.java | 2 --
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/34c03c37/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfMessageBundleInvocationHandler.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfMessageBundleInvocationHandler.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfMessageBundleInvocationHandler.java
index b3a8e43..a75bf8e 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfMessageBundleInvocationHandler.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfMessageBundleInvocationHandler.java
@@ -47,6 +47,11 @@ public class JsfMessageBundleInvocationHandler extends MessageBundleInvocationHa
if (severity == null)
{
+ if (message instanceof Message)
+ {
+ return message;
+ }
+
return getMessageCategory(message, JsfMessage.CATEGORY_SUMMARY);
}
else
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/34c03c37/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/message/beans/UserMessage.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/message/beans/UserMessage.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/message/beans/UserMessage.java
index f4fd925..f7601fd 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/message/beans/UserMessage.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/message/beans/UserMessage.java
@@ -19,10 +19,8 @@
package org.apache.deltaspike.test.jsf.impl.message.beans;
import org.apache.deltaspike.core.api.message.Message;
-import org.apache.deltaspike.core.api.message.MessageContext;
import org.apache.deltaspike.core.api.message.annotation.MessageBundle;
import org.apache.deltaspike.core.api.message.annotation.MessageContextConfig;
-import org.apache.deltaspike.core.api.message.annotation.MessageTemplate;
@MessageBundle
@MessageContextConfig(messageSource = "jsfMessageTest.UserMessage")