From 7ac8d05ceab64dd433cce8482cb06358b840c389 Mon Sep 17 00:00:00 2001 From: Oskari Porkka Date: Thu, 26 Apr 2012 11:31:53 +0300 Subject: [PATCH] Added MessageKeyMatcher support for detecting uses of messages.getMessage function --- src/play/modules/messages/MessageKeyMatcher.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/play/modules/messages/MessageKeyMatcher.java b/src/play/modules/messages/MessageKeyMatcher.java index 2938c74..740a821 100644 --- a/src/play/modules/messages/MessageKeyMatcher.java +++ b/src/play/modules/messages/MessageKeyMatcher.java @@ -12,12 +12,13 @@ */ public class MessageKeyMatcher { - String REGEXP1 = "\\QMessages.get(\"\\E([^\"]*)\""; - String REGEXP2 = "\\QValidation\\E\\Q.addError(\\E[^,]*,[^\"]*[\"]([^\"]*)\""; - String REGEXP3 = "\\Q&{\\E[']([^']*)[']"; - String REGEXP4 = "\\Qmessages\\E\\Q.get(\"\\E([^\"]*)\""; - String REGEXP5 = "\\Qmessages\\E\\Q.get(\'\\E([^\']*)\'"; - String REGEXP6 = "\\Qi18n(\'\\E([^\']*)\'"; + final String REGEXP1 = "\\QMessages.get(\"\\E([^\"]*)\""; + final String REGEXP2 = "\\QValidation\\E\\Q.addError(\\E[^,]*,[^\"]*[\"]([^\"]*)\""; + final String REGEXP3 = "\\Q&{\\E[']([^']*)[']"; + final String REGEXP4 = "\\Qmessages\\E\\Q.get(\"\\E([^\"]*)\""; + final String REGEXP5 = "\\Qmessages\\E\\Q.get(\'\\E([^\']*)\'"; + final String REGEXP6 = "\\Qi18n(\'\\E([^\']*)\'"; + final String REGEXP7 = "\\Qmessages.getMessage(\\E[^,]*,[\\s]*'([^']*)'"; private List patterns = new ArrayList(); @@ -27,7 +28,8 @@ public MessageKeyMatcher() { patterns.add(Pattern.compile(REGEXP3)); patterns.add(Pattern.compile(REGEXP4)); patterns.add(Pattern.compile(REGEXP5)); - patterns.add(Pattern.compile(REGEXP6)); + patterns.add(Pattern.compile(REGEXP6)); + patterns.add(Pattern.compile(REGEXP7)); } /**