You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by de...@apache.org on 2018/05/08 12:48:28 UTC
[myfaces] 25/28: merge revisions 1421641-1421655 from trunk
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch 2.1.x-client-window
in repository https://gitbox.apache.org/repos/asf/myfaces.git
commit 344c830c450c5017b4893dc85120711d6442cc54
Author: Leonardo Uribe <lu...@apache.org>
AuthorDate: Fri Dec 14 05:20:07 2012 +0000
merge revisions 1421641-1421655 from trunk
---
api/src/main/java/javax/faces/component/UIViewRoot.java | 2 +-
.../org/apache/myfaces/renderkit/html/HtmlSecretRendererTest.java | 2 +-
.../org/apache/myfaces/renderkit/html/HtmlTextareaRendererTest.java | 4 ++--
.../apache/myfaces/shared/renderkit/html/HtmlRendererUtilsTest.java | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/api/src/main/java/javax/faces/component/UIViewRoot.java b/api/src/main/java/javax/faces/component/UIViewRoot.java
index e9608ca..3e3a4b2 100644
--- a/api/src/main/java/javax/faces/component/UIViewRoot.java
+++ b/api/src/main/java/javax/faces/component/UIViewRoot.java
@@ -358,7 +358,7 @@ public class UIViewRoot extends UIComponentBase implements UniqueIdVendor
Long uniqueIdCounter = (Long) getStateHelper().get(PropertyKeys.uniqueIdCounter);
uniqueIdCounter = (uniqueIdCounter == null) ? 0 : uniqueIdCounter;
getStateHelper().put(PropertyKeys.uniqueIdCounter, (uniqueIdCounter+1L));
- return bld.append(UNIQUE_ID_PREFIX).append(uniqueIdCounter).toString();
+ return bld.append(UNIQUE_ID_PREFIX).append("__v_").append(uniqueIdCounter).toString();
}
}
// Optionally, a unique seed value can be supplied by component creators which
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlSecretRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlSecretRendererTest.java
index 550d9bd..197e8e8 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlSecretRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlSecretRendererTest.java
@@ -81,7 +81,7 @@ public class HtmlSecretRendererTest extends AbstractJsfTestCase
facesContext.renderResponse();
String output = writer.getWriter().toString();
- assertEquals("<input type=\"password\" name=\"j_id0\"/>", output);
+ assertEquals("<input type=\"password\" name=\"j_id__v_0\"/>", output);
}
public void testHtmlPropertyPassTru() throws Exception
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextareaRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextareaRendererTest.java
index 53d06eb..de74c63 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextareaRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextareaRendererTest.java
@@ -80,7 +80,7 @@ public class HtmlTextareaRendererTest extends AbstractJsfTestCase
facesContext.renderResponse();
String output = writer.getWriter().toString();
- assertEquals("<textarea name=\"j_id0\"></textarea>", output);
+ assertEquals("<textarea name=\"j_id__v_0\"></textarea>", output);
}
public void testRenderColsRows() throws Exception
@@ -91,7 +91,7 @@ public class HtmlTextareaRendererTest extends AbstractJsfTestCase
facesContext.renderResponse();
String output = writer.getWriter().toString();
- assertEquals("<textarea name=\"j_id0\" cols=\"5\" rows=\"10\"></textarea>", output);
+ assertEquals("<textarea name=\"j_id__v_0\" cols=\"5\" rows=\"10\"></textarea>", output);
}
public void testHtmlPropertyPassTru() throws Exception
diff --git a/shared/src/test/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtilsTest.java b/shared/src/test/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtilsTest.java
index 38f8c9d..9cea382 100644
--- a/shared/src/test/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtilsTest.java
+++ b/shared/src/test/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtilsTest.java
@@ -48,7 +48,7 @@ public class HtmlRendererUtilsTest extends AbstractJsfTestCase
ClientBehaviorEvents.CLICK, params, ClientBehaviorEvents.ACTION, params, behaviors, null,
null));
- Assert.assertEquals("return jsf.util.chain(document.getElementById('j_id0'), event,'huhn', 'suppe');",
+ Assert.assertEquals("return jsf.util.chain(document.getElementById('j_id__v_0'), event,'huhn', 'suppe');",
HtmlRendererUtils.buildBehaviorChain(facesContext,
component, ClientBehaviorEvents.CLICK, params, ClientBehaviorEvents.ACTION, params, behaviors, "huhn",
"suppe"));
@@ -70,7 +70,7 @@ public class HtmlRendererUtilsTest extends AbstractJsfTestCase
behaviors.put(ClientBehaviorEvents.CLICK, Arrays.asList(submittingBehavior));
- Assert.assertEquals("jsf.util.chain(document.getElementById('j_id0'), event,'huhn', 'script()', 'suppe'); return false;",
+ Assert.assertEquals("jsf.util.chain(document.getElementById('j_id__v_0'), event,'huhn', 'script()', 'suppe'); return false;",
HtmlRendererUtils.buildBehaviorChain(facesContext,
component,
ClientBehaviorEvents.CLICK, params, ClientBehaviorEvents.ACTION, params, behaviors, "huhn",
--
To stop receiving notification emails like this one, please contact
deki@apache.org.