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 2008/04/21 22:05:29 UTC
svn commit: r650240 - in
/myfaces/core/trunk/api/src/main/java/javax/faces/component:
UIComponentBase.java UIData.java UIViewRoot.java
Author: lu4242
Date: Mon Apr 21 13:05:26 2008
New Revision: 650240
URL: http://svn.apache.org/viewvc?rev=650240&view=rev
Log:
MYFACES-1862 rollback changes on 1.1 branch since StringBuilder is from jdk 1.5
Modified:
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewRoot.java
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java?rev=650240&r1=650239&r2=650240&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java Mon Apr 21 13:05:26 2008
@@ -62,8 +62,6 @@
{
private static Log log = LogFactory.getLog(UIComponentBase.class);
- private static final ThreadLocal _STRING_BUILDER = new ThreadLocal();
-
private static final Iterator _EMPTY_UICOMPONENT_ITERATOR =
new _EmptyIterator();
@@ -225,9 +223,7 @@
UIComponent namingContainer = findParentNamingContainer(this, false);
if (namingContainer != null)
{
- StringBuilder bld = __getSharedStringBuilder();
- String containerClientId = namingContainer.getClientId(context);
- _clientId = bld.append(containerClientId).append(NamingContainer.SEPARATOR_CHAR).append(id).toString();
+ _clientId = namingContainer.getClientId(context) + NamingContainer.SEPARATOR_CHAR + id;
}
else
{
@@ -1274,55 +1270,6 @@
throw new IllegalArgumentException("Subsequent characters of component identifier must be a letter, a digit, an underscore ('_'), or a dash ('-')! But component identifier contains \""+chars[i]+"\"");
}
}
- }
-
- /**
- * <p>
- * This gets a single threadlocal shared stringbuilder instance, each time you call
- * __getSharedStringBuilder it sets the length of the stringBuilder instance to 0.
- * </p><p>
- * This allows you to use the same StringBuilder instance over and over.
- * You must call toString on the instance before calling __getSharedStringBuilder again.
- * </p>
- * Example that works
- * <pre><code>
- * StringBuilder sb1 = __getSharedStringBuilder();
- * sb1.append(a).append(b);
- * String c = sb1.toString();
- *
- * StringBuilder sb2 = __getSharedStringBuilder();
- * sb2.append(b).append(a);
- * String d = sb2.toString();
- * </code></pre>
- * <br><br>
- * Example that doesn't work, you must call toString on sb1 before
- * calling __getSharedStringBuilder again.
- * <pre><code>
- * StringBuilder sb1 = __getSharedStringBuilder();
- * StringBuilder sb2 = __getSharedStringBuilder();
- *
- * sb1.append(a).append(b);
- * String c = sb1.toString();
- *
- * sb2.append(b).append(a);
- * String d = sb2.toString();
- * </code></pre>
- *
- */
- static StringBuilder __getSharedStringBuilder()
- {
- StringBuilder sb = (StringBuilder) _STRING_BUILDER.get();
-
- if (sb == null)
- {
- sb = new StringBuilder();
- _STRING_BUILDER.set(sb);
- }
-
- // clear out the stringBuilder by setting the length to 0
- sb.setLength(0);
-
- return sb;
}
//------------------ GENERATED CODE BEGIN (do not modify!) --------------------
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java?rev=650240&r1=650239&r2=650240&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java Mon Apr 21 13:05:26 2008
@@ -470,9 +470,7 @@
{
return clientId;
}
-
- StringBuilder bld = __getSharedStringBuilder();
- return bld.append(clientId).append(NamingContainer.SEPARATOR_CHAR).append(rowIndex).toString();
+ return clientId + NamingContainer.SEPARATOR_CHAR + rowIndex;
}
/**
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewRoot.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewRoot.java?rev=650240&r1=650239&r2=650240&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewRoot.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewRoot.java Mon Apr 21 13:05:26 2008
@@ -187,8 +187,7 @@
public String createUniqueId()
{
ExternalContext extCtx = FacesContext.getCurrentInstance().getExternalContext();
- StringBuilder bld = __getSharedStringBuilder();
- return extCtx.encodeNamespace(bld.append(UNIQUE_ID_PREFIX).append(_uniqueIdCounter++).toString());
+ return extCtx.encodeNamespace(UNIQUE_ID_PREFIX + _uniqueIdCounter++);
}
public Locale getLocale()