You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ar...@apache.org on 2009/07/16 01:24:35 UTC
svn commit: r794456 - in /myfaces/trinidad/branches/1.2.11.4-branch: ./
trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/
trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component/
trinidad-sandb...
Author: arobinson74
Date: Wed Jul 15 23:24:35 2009
New Revision: 794456
URL: http://svn.apache.org/viewvc?rev=794456&view=rev
Log:
TRINIDAD-1514
Reset the IDs in the restore method when there is no stamp state
Modified:
myfaces/trinidad/branches/1.2.11.4-branch/ (props changed)
myfaces/trinidad/branches/1.2.11.4-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java
myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component/ (props changed)
myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event/ (props changed)
Propchange: myfaces/trinidad/branches/1.2.11.4-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 15 23:24:35 2009
@@ -1,4 +1,4 @@
/myfaces/trinidad/branches/1.2.9.1-branch:697924,699406,699496
/myfaces/trinidad/branches/TRINIDAD-1402:745675
/myfaces/trinidad/branches/jwaldman_StyleMap:754977-770778
-/myfaces/trinidad/trunk:745151,755794,758112,758415-758416,765711,765745,766910,767634,787368
+/myfaces/trinidad/trunk:745151,755794,758112,758415-758416,765711,765745,766910,767634,787368,794455
Modified: myfaces/trinidad/branches/1.2.11.4-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.4-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java?rev=794456&r1=794455&r2=794456&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.4-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java (original)
+++ myfaces/trinidad/branches/1.2.11.4-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java Wed Jul 15 23:24:35 2009
@@ -886,7 +886,14 @@
{
// Just a transient component - return
if ((stampState == Transient.TRUE) || (stampState == null))
+ {
+ // ensure the client IDs are reset on the component, otherwise they will not get the
+ // proper stamped IDs. This mirrors the behavior in UIData and follows the JSF specification
+ // on when client IDs are allowed to be cached and when they must be reset
+ String id = stamp.getId();
+ stamp.setId(id);
return;
+ }
// If this isn't an Object array, then it's a component with state
// of its own, but no child/facet state - so restore and be done
@@ -1031,7 +1038,7 @@
(clientId.charAt(thisClientIdLength) == NamingContainer.SEPARATOR_CHAR))
{
setupVisitingContext(context);
-
+
try
{
if (!_getAndMarkFirstInvokeForRequest(context, thisClientId))
@@ -1039,10 +1046,10 @@
// Call _init() since _flushCachedModel() assumes that
// selectedRowKeys and disclosedRowKeys are initialized to be non-null
_init();
-
+
_flushCachedModel();
}
-
+
String postId = clientId.substring(thisClientIdLength + 1);
int sepIndex = postId.indexOf(NamingContainer.SEPARATOR_CHAR);
// If there's no separator character afterwards, then this
@@ -1053,15 +1060,15 @@
{
String currencyString = postId.substring(0, sepIndex);
Object rowKey = getClientRowKeyManager().getRowKey(context, this, currencyString);
-
- // A non-null rowKey here means we are on a row and we should set currency, otherwise
+
+ // A non-null rowKey here means we are on a row and we should set currency, otherwise
// the client id is for a non-stamped child component in the table/column header/footer.
if (rowKey != null)
{
Object oldRowKey = getRowKey();
try
{
- setRowKey(rowKey);
+ setRowKey(rowKey);
return invokeOnChildrenComponents(context, clientId, callback);
}
finally
@@ -1071,7 +1078,7 @@
}
}
else
- return invokeOnChildrenComponents(context, clientId, callback);
+ return invokeOnChildrenComponents(context, clientId, callback);
}
}
finally
Propchange: myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 15 23:24:35 2009
@@ -1,3 +1,3 @@
/myfaces/trinidad/branches/1.2.9.1-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:699406,699496
/myfaces/trinidad/branches/TRINIDAD-1402/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:745675
-/myfaces/trinidad/trunk/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:745151,755794,758112,758415-758416,787368
+/myfaces/trinidad/trunk/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:745151,755794,758112,758415-758416,787368,794455
Propchange: myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 15 23:24:35 2009
@@ -1,3 +1,3 @@
/myfaces/trinidad/branches/1.2.9.1-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:699406,699496
/myfaces/trinidad/branches/TRINIDAD-1402/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:745675
-/myfaces/trinidad/trunk/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:745151,755794,758112,758415-758416,787368
+/myfaces/trinidad/trunk/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:745151,755794,758112,758415-758416,787368,794455