From: <die...@us...> - 2011-08-26 07:58:27
|
Revision: 3652 http://openutils.svn.sourceforge.net/openutils/?rev=3652&view=rev Author: diego_schivo Date: 2011-08-26 07:58:21 +0000 (Fri, 26 Aug 2011) Log Message: ----------- MESSAGES-14 isBlank Modified Paths: -------------- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java Modified: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java =================================================================== --- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2011-08-26 07:55:43 UTC (rev 3651) +++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2011-08-26 07:58:21 UTC (rev 3652) @@ -227,26 +227,29 @@ @SuppressWarnings("unchecked") public String search() { - Locale locBk = MgnlContext.getLocale(); - Set<String> set = new HashSet<String>(); - for (Locale newLoc : MessagesConfigurationManager.getAvaiableLocales()) + Set<String> keySet = new HashSet<String>(); + if (!StringUtils.isBlank(text)) { - MgnlContext.setLocale(newLoc); - Messages messages = MgnlContext.getMessages(); - Iterator<String> it = messages.keys(); - while (it.hasNext()) + Locale locBk = MgnlContext.getLocale(); + for (Locale newLoc : MessagesConfigurationManager.getAvaiableLocales()) { - String curKey = it.next(); - String curText = messages.get(curKey); - if (MessagesEl.messageTextContains(curText, text)) + MgnlContext.setLocale(newLoc); + Messages messages = MgnlContext.getMessages(); + Iterator<String> it = messages.keys(); + while (it.hasNext()) { - set.add(curKey); + String curKey = it.next(); + String curText = messages.get(curKey); + if (MessagesEl.messageTextContains(curText, text)) + { + keySet.add(curKey); + } } } + MgnlContext.setLocale(locBk); } - MgnlContext.setLocale(locBk); - keys = new ArrayList<String>(set); + keys = new ArrayList<String>(keySet); Collections.sort(keys); StringBuilder sb = new StringBuilder("[ "); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |