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/06/19 20:37:04 UTC

git commit: DELTASPIKE-205 allign parameters with MessageInterpolator from JSR-303

Updated Branches:
  refs/heads/master 2f923937d -> 8aeccd5b9


DELTASPIKE-205 allign parameters with MessageInterpolator from JSR-303


Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/8aeccd5b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/8aeccd5b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/8aeccd5b

Branch: refs/heads/master
Commit: 8aeccd5b95901c739d36113d62a1c8976af85965
Parents: 2f92393
Author: Mark Struberg <st...@apache.org>
Authored: Tue Jun 19 20:36:07 2012 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Tue Jun 19 20:36:37 2012 +0200

----------------------------------------------------------------------
 .../core/api/message/MessageInterpolator.java      |    4 ++--
 .../impl/message/DefaultMessageInterpolator.java   |    2 +-
 .../core/api/message/TestMessageInterpolator.java  |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8aeccd5b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/message/MessageInterpolator.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/message/MessageInterpolator.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/message/MessageInterpolator.java
index 29ff877..8ac7444 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/message/MessageInterpolator.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/message/MessageInterpolator.java
@@ -42,12 +42,12 @@ public interface MessageInterpolator extends Serializable, DeltaSpikeConfig
      * replaces the arguments of the given message with the given arguments
      *
      * instead of a MessageContextAware interface. we need it to avoid expensive operations like locking or deep cloning
-     * @param locale to use for the formatting
      * @param messageText the message text which has to be interpolated
      * @param arguments a list of numbered and/or named arguments for the current message
+     * @param locale to use for the formatting
      * @return the final (interpolated) message text
      *         if it was possible to replace the parameters with the given arguments
      *         the unmodified messageText otherwise
      */
-    String interpolate(Locale locale, String messageText, Object[] arguments);
+    String interpolate(String messageText, Object[] arguments, Locale locale);
 }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8aeccd5b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageInterpolator.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageInterpolator.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageInterpolator.java
index 85f756e..8085ee8 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageInterpolator.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageInterpolator.java
@@ -35,7 +35,7 @@ public class DefaultMessageInterpolator implements MessageInterpolator, Serializ
     private static final long serialVersionUID = -8854087197813424812L;
 
     @Override
-    public String interpolate(Locale locale, String messageTemplate, Object... arguments)
+    public String interpolate(String messageTemplate, Object[] arguments, Locale locale)
     {
         if (arguments == null || arguments.length == 0)
         {

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8aeccd5b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestMessageInterpolator.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestMessageInterpolator.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestMessageInterpolator.java
index f56f9bc..bee9034 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestMessageInterpolator.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestMessageInterpolator.java
@@ -29,8 +29,8 @@ public class TestMessageInterpolator implements MessageInterpolator
     private static final long serialVersionUID = 5636914399691923602L;
 
     @Override
-    public String interpolate(Locale locale, String messageText, Object[] arguments)
+    public String interpolate(String messageTemplate, Object[] arguments, Locale locale)
     {
-        return String.format(locale, messageText, arguments);
+        return String.format(locale, messageTemplate, arguments);
     }
 }