Menu
▾
▴
openutils-svn
|
From: <die...@us...> - 2011-08-25 17:31:29
|
Revision: 3633
http://openutils.svn.sourceforge.net/openutils/?rev=3633&view=rev
Author: diego_schivo
Date: 2011-08-25 17:31:23 +0000 (Thu, 25 Aug 2011)
Log Message:
-----------
MESSAGES-14 search
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-25 17:08:35 UTC (rev 3632)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2011-08-25 17:31:23 UTC (rev 3633)
@@ -38,6 +38,11 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
import net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager;
import net.sourceforge.openutils.mgnlmessages.lifecycle.MessagesModuleLifecycle;
@@ -149,8 +154,7 @@
+ ((MgnlContext.getMessages().get(key) != null) ? StringUtils.replace(
MgnlContext.getMessages().get(key),
"'",
- "\'") : "")
- + "'}";
+ "\'") : "") + "'}";
MgnlContext.setLocale(locBk);
@@ -225,7 +229,22 @@
public String search()
{
- json = "[ {id: '0', key: 'about.build'}, {id: '1', key: 'about.title'} ]";
+ Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(MessagesModuleLifecycle.REPO);
+ criteria.add(Restrictions.eq("@jcr:primaryType", ItemType.CONTENTNODE.getSystemName()));
+ criteria.add(Restrictions.contains(".", text));
+ int id = 0;
+ StringBuilder sb = new StringBuilder("[ ");
+ for (ResultIterator<AdvancedResultItem> items = criteria.execute().getItems(); items.hasNext();)
+ {
+ String key = StringUtils.replaceChars(StringUtils.removeStart(items.next().getHandle(), "/"), '/', '.');
+ sb.append("{ id: '").append(id++).append("', key: '").append(key).append("' }");
+ if (items.hasNext())
+ {
+ sb.append(", ");
+ }
+ }
+ sb.append(" ]");
+ json = sb.toString();
return JSON_VIEW;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-25 17:47:22
|
Revision: 3634
http://openutils.svn.sourceforge.net/openutils/?rev=3634&view=rev
Author: diego_schivo
Date: 2011-08-25 17:47:16 +0000 (Thu, 25 Aug 2011)
Log Message:
-----------
MESSAGES-14 search
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-25 17:31:23 UTC (rev 3633)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2011-08-25 17:47:16 UTC (rev 3634)
@@ -23,6 +23,7 @@
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.Path;
+import info.magnolia.cms.i18n.Messages;
import info.magnolia.context.MgnlContext;
import info.magnolia.module.admininterface.TemplatedMVCHandler;
@@ -38,11 +39,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
import net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager;
import net.sourceforge.openutils.mgnlmessages.lifecycle.MessagesModuleLifecycle;
@@ -227,24 +223,36 @@
return JSON_VIEW;
}
+ @SuppressWarnings("unchecked")
public String search()
{
- Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(MessagesModuleLifecycle.REPO);
- criteria.add(Restrictions.eq("@jcr:primaryType", ItemType.CONTENTNODE.getSystemName()));
- criteria.add(Restrictions.contains(".", text));
- int id = 0;
+ Messages messages = MgnlContext.getMessages();
+ Iterator<String> it = messages.keys();
+ keys = new ArrayList<String>();
+ while (it.hasNext())
+ {
+ String curKey = it.next();
+ String curText = messages.get(curKey);
+ if (StringUtils.contains(curText, text))
+ {
+ keys.add(curKey);
+ }
+ }
+ Collections.sort(keys);
+
StringBuilder sb = new StringBuilder("[ ");
- for (ResultIterator<AdvancedResultItem> items = criteria.execute().getItems(); items.hasNext();)
+ int i = 0;
+ for (String curKey : keys)
{
- String key = StringUtils.replaceChars(StringUtils.removeStart(items.next().getHandle(), "/"), '/', '.');
- sb.append("{ id: '").append(id++).append("', key: '").append(key).append("' }");
- if (items.hasNext())
+ if (i > 0)
{
sb.append(", ");
}
+ sb.append("{ id: '").append(i++).append("', key: '").append(curKey).append("' }");
}
sb.append(" ]");
json = sb.toString();
+
return JSON_VIEW;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-25 17:56:33
|
Revision: 3635
http://openutils.svn.sourceforge.net/openutils/?rev=3635&view=rev
Author: diego_schivo
Date: 2011-08-25 17:56:27 +0000 (Thu, 25 Aug 2011)
Log Message:
-----------
MESSAGES-14 avaiable locales
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-25 17:47:16 UTC (rev 3634)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2011-08-25 17:56:27 UTC (rev 3635)
@@ -30,9 +30,11 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
+import java.util.Set;
import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
@@ -226,18 +228,27 @@
@SuppressWarnings("unchecked")
public String search()
{
- Messages messages = MgnlContext.getMessages();
- Iterator<String> it = messages.keys();
- keys = new ArrayList<String>();
- while (it.hasNext())
+ Locale locBk = MgnlContext.getLocale();
+ Set<String> set = new HashSet<String>();
+ for (Locale newLoc : MessagesConfigurationManager.getAvaiableLocales())
{
- String curKey = it.next();
- String curText = messages.get(curKey);
- if (StringUtils.contains(curText, text))
+ MgnlContext.setLocale(newLoc);
+ Messages messages = MgnlContext.getMessages();
+ Iterator<String> it = messages.keys();
+ while (it.hasNext())
{
- keys.add(curKey);
+ String curKey = it.next();
+ String curText = messages.get(curKey);
+ if (StringUtils.contains(curText, text))
+ {
+ set.add(curKey);
+ }
}
}
+ MgnlContext.setLocale(locBk);
+
+ keys = new ArrayList<String>(set);
+
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.
|
|
From: <die...@us...> - 2011-08-26 07:12:05
|
Revision: 3639
http://openutils.svn.sourceforge.net/openutils/?rev=3639&view=rev
Author: diego_schivo
Date: 2011-08-26 07:11:59 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
MESSAGES-15 Single quote escape problem
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:02:18 UTC (rev 3638)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2011-08-26 07:11:59 UTC (rev 3639)
@@ -152,7 +152,7 @@
+ ((MgnlContext.getMessages().get(key) != null) ? StringUtils.replace(
MgnlContext.getMessages().get(key),
"'",
- "\'") : "") + "'}";
+ "\\'") : "") + "'}";
MgnlContext.setLocale(locBk);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-26 07:13:51
|
Revision: 3640
http://openutils.svn.sourceforge.net/openutils/?rev=3640&view=rev
Author: diego_schivo
Date: 2011-08-26 07:13:45 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
MESSAGES-15 refactoring
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:11:59 UTC (rev 3639)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2011-08-26 07:13:45 UTC (rev 3640)
@@ -149,10 +149,8 @@
MgnlContext.setLocale(newLoc);
json = "rootObj = {value: '"
- + ((MgnlContext.getMessages().get(key) != null) ? StringUtils.replace(
- MgnlContext.getMessages().get(key),
- "'",
- "\\'") : "") + "'}";
+ + StringUtils.defaultString(StringUtils.replace(MgnlContext.getMessages().get(key), "'", "\\'"))
+ + "'}";
MgnlContext.setLocale(locBk);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-26 07:19:58
|
Revision: 3641
http://openutils.svn.sourceforge.net/openutils/?rev=3641&view=rev
Author: diego_schivo
Date: 2011-08-26 07:19:52 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
MESSAGES-14 containsIgnoreCase
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:13:45 UTC (rev 3640)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2011-08-26 07:19:52 UTC (rev 3641)
@@ -237,7 +237,7 @@
{
String curKey = it.next();
String curText = messages.get(curKey);
- if (StringUtils.contains(curText, text))
+ if (StringUtils.containsIgnoreCase(curText, text))
{
set.add(curKey);
}
@@ -246,7 +246,6 @@
MgnlContext.setLocale(locBk);
keys = new ArrayList<String>(set);
-
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.
|
|
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.
|
|
From: <die...@us...> - 2011-08-26 08:11:23
|
Revision: 3654
http://openutils.svn.sourceforge.net/openutils/?rev=3654&view=rev
Author: diego_schivo
Date: 2011-08-26 08:11:17 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
MESSAGES-16 Newline in json response
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:59:18 UTC (rev 3653)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2011-08-26 08:11:17 UTC (rev 3654)
@@ -150,7 +150,9 @@
MgnlContext.setLocale(newLoc);
json = "rootObj = {value: '"
- + StringUtils.defaultString(StringUtils.replace(MgnlContext.getMessages().get(key), "'", "\\'"))
+ + StringUtils.defaultString(StringUtils.replaceEach(MgnlContext.getMessages().get(key), new String[]{
+ "'",
+ "\n" }, new String[]{"\\'", "\\n" }))
+ "'}";
MgnlContext.setLocale(locBk);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X