Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added MessageKeyMatcher support for detecting uses of messages.getMessage function #10

Merged
merged 1 commit into from Jan 10, 2013
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 9 additions & 7 deletions src/play/modules/messages/MessageKeyMatcher.java
Expand Up @@ -12,12 +12,13 @@
*/ */
public class MessageKeyMatcher { public class MessageKeyMatcher {


String REGEXP1 = "\\QMessages.get(\"\\E([^\"]*)\""; final String REGEXP1 = "\\QMessages.get(\"\\E([^\"]*)\"";
String REGEXP2 = "\\QValidation\\E\\Q.addError(\\E[^,]*,[^\"]*[\"]([^\"]*)\""; final String REGEXP2 = "\\QValidation\\E\\Q.addError(\\E[^,]*,[^\"]*[\"]([^\"]*)\"";
String REGEXP3 = "\\Q&{\\E[']([^']*)[']"; final String REGEXP3 = "\\Q&{\\E[']([^']*)[']";
String REGEXP4 = "\\Qmessages\\E\\Q.get(\"\\E([^\"]*)\""; final String REGEXP4 = "\\Qmessages\\E\\Q.get(\"\\E([^\"]*)\"";
String REGEXP5 = "\\Qmessages\\E\\Q.get(\'\\E([^\']*)\'"; final String REGEXP5 = "\\Qmessages\\E\\Q.get(\'\\E([^\']*)\'";
String REGEXP6 = "\\Qi18n(\'\\E([^\']*)\'"; final String REGEXP6 = "\\Qi18n(\'\\E([^\']*)\'";
final String REGEXP7 = "\\Qmessages.getMessage(\\E[^,]*,[\\s]*'([^']*)'";


private List<Pattern> patterns = new ArrayList<Pattern>(); private List<Pattern> patterns = new ArrayList<Pattern>();


Expand All @@ -27,7 +28,8 @@ public MessageKeyMatcher() {
patterns.add(Pattern.compile(REGEXP3)); patterns.add(Pattern.compile(REGEXP3));
patterns.add(Pattern.compile(REGEXP4)); patterns.add(Pattern.compile(REGEXP4));
patterns.add(Pattern.compile(REGEXP5)); patterns.add(Pattern.compile(REGEXP5));
patterns.add(Pattern.compile(REGEXP6)); patterns.add(Pattern.compile(REGEXP6));
patterns.add(Pattern.compile(REGEXP7));
} }


/** /**
Expand Down