You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2011/03/11 01:34:59 UTC
svn commit: r1080410 - in
/myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom:
inputHtml/InputHtml.java tree2/UITreeData.java
Author: lu4242
Date: Fri Mar 11 00:34:59 2011
New Revision: 1080410
URL: http://svn.apache.org/viewvc?rev=1080410&view=rev
Log:
TOMAHAWK-1565 CLONE - UIView.createUniqueId shouldn't call encodeNameSpace to build the id. (tomahawk 2.0.x)
Modified:
myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/inputHtml/InputHtml.java
myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/tree2/UITreeData.java
Modified: myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/inputHtml/InputHtml.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/inputHtml/InputHtml.java?rev=1080410&r1=1080409&r2=1080410&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/inputHtml/InputHtml.java (original)
+++ myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/inputHtml/InputHtml.java Fri Mar 11 00:34:59 2011
@@ -370,7 +370,6 @@ public class InputHtml extends HtmlInput
*/
public String createUniqueId(FacesContext context, String seed)
{
- ExternalContext extCtx = context.getExternalContext();
StringBuilder bld = new StringBuilder();
Long uniqueIdCounter = (Long) getStateHelper().get(PropertyKeys.uniqueIdCounter);
@@ -379,12 +378,12 @@ public class InputHtml extends HtmlInput
// Generate an identifier for a component. The identifier will be prefixed with UNIQUE_ID_PREFIX, and will be unique within this UIViewRoot.
if(seed==null)
{
- return extCtx.encodeNamespace(bld.append(UIViewRoot.UNIQUE_ID_PREFIX).append(uniqueIdCounter).toString());
+ return bld.append(UIViewRoot.UNIQUE_ID_PREFIX).append(uniqueIdCounter).toString();
}
// Optionally, a unique seed value can be supplied by component creators which should be included in the generated unique id.
else
{
- return extCtx.encodeNamespace(bld.append(UIViewRoot.UNIQUE_ID_PREFIX).append(seed).toString());
+ return bld.append(UIViewRoot.UNIQUE_ID_PREFIX).append(seed).toString();
}
}
Modified: myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/tree2/UITreeData.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/tree2/UITreeData.java?rev=1080410&r1=1080409&r2=1080410&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/tree2/UITreeData.java (original)
+++ myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/tree2/UITreeData.java Fri Mar 11 00:34:59 2011
@@ -1084,7 +1084,6 @@ public class UITreeData extends UICompon
*/
public String createUniqueId(FacesContext context, String seed)
{
- ExternalContext extCtx = context.getExternalContext();
StringBuilder bld = new StringBuilder();
Long uniqueIdCounter = (Long) getStateHelper().get(PropertyKeys.uniqueIdCounter);
@@ -1093,12 +1092,12 @@ public class UITreeData extends UICompon
// Generate an identifier for a component. The identifier will be prefixed with UNIQUE_ID_PREFIX, and will be unique within this UIViewRoot.
if(seed==null)
{
- return extCtx.encodeNamespace(bld.append(UIViewRoot.UNIQUE_ID_PREFIX).append(uniqueIdCounter).toString());
+ return bld.append(UIViewRoot.UNIQUE_ID_PREFIX).append(uniqueIdCounter).toString();
}
// Optionally, a unique seed value can be supplied by component creators which should be included in the generated unique id.
else
{
- return extCtx.encodeNamespace(bld.append(UIViewRoot.UNIQUE_ID_PREFIX).append(seed).toString());
+ return bld.append(UIViewRoot.UNIQUE_ID_PREFIX).append(seed).toString();
}
}