[portal-commits] JBoss Portal SVN: r13118 - modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168.
Author: chris.laprun(a)jboss.com
Date: 2009-04-02 13:43:28 -0400 (Thu, 02 Apr 2009)
New Revision: 13118
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletUtils.java
Log:
- JBPORTAL-2366: Removed bracketing of id by jbpns / snpbj when creating a namespace. This
was used to allow re-writing of markup but a better alternative should be implemented
now.
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletUtils.java
===================================================================
---
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletUtils.java 2009-04-02
14:38:44 UTC (rev 13117)
+++
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletUtils.java 2009-04-02
17:43:28 UTC (rev 13118)
@@ -102,33 +102,23 @@
*/
public static String generateNamespaceFrom(String windowId)
{
- if (windowId.startsWith(PREFIX) && windowId.endsWith(SUFFIX))
+ int length = windowId.length();
+ StringBuffer tmp = new StringBuffer(length + 10);
+ for (int i = windowId.lastIndexOf(SLASH) + 1; i < length; i++)
{
- // we already have a namespaced window id
- return windowId;
- }
- else
- {
- int length = windowId.length();
- StringBuffer tmp = new StringBuffer(PREFIX.length() + SUFFIX.length() + length +
5);
- tmp.append(PREFIX);
- for (int i = windowId.lastIndexOf(SLASH) + 1; i < length; i++)
+ char c = windowId.charAt(i);
+ if (((int)c >= 65 && (int)c <= 90) || ((int)c >= 97 &&
(int)c <= 122) || ((int)c >= 48 && (int)c <= 57) || ((int)c == 95) ||
(int)c == 36)
{
- char c = windowId.charAt(i);
- if (((int)c >= 65 && (int)c <= 90) || ((int)c >= 97
&& (int)c <= 122) || ((int)c >= 48 && (int)c <= 57) || ((int)c ==
95) || (int)c == 36)
- {
- tmp.append(c);
- }
- else
- {
- tmp.append('_');
- tmp.append(Character.forDigit((((int)c) & 0XF0) >> 4, 16));
- tmp.append(Character.forDigit((((int)c) & 0X0F), 16));
- }
+ tmp.append(c);
}
- tmp.append(SUFFIX);
- return tmp.toString();
+ else
+ {
+ tmp.append('_');
+ tmp.append(Character.forDigit((((int)c) & 0XF0) >> 4, 16));
+ tmp.append(Character.forDigit((((int)c) & 0X0F), 16));
+ }
}
+ return tmp.toString();
}
public static <U extends PortletRequest> U unwrap(PortletRequest wrapped,
Class<U> unwrapped)