myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sobr...@apache.org
Subject svn commit: r1086353 - in /myfaces/trinidad/trunk/trinidad-api/src/main: java-templates/org/apache/myfaces/trinidad/component/ java/org/apache/myfaces/trinidad/component/
Date Mon, 28 Mar 2011 19:20:46 GMT
Author: sobryan
Date: Mon Mar 28 19:20:45 2011
New Revision: 1086353

URL: http://svn.apache.org/viewvc?rev=1086353&view=rev
Log:
TRINIDAD-2072

Patch submitted by Gary VanMatre.  Thanks Gary!

Modified:
    myfaces/trinidad/trunk/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXNavigationTreeTemplate.java
    myfaces/trinidad/trunk/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPageTemplate.java
    myfaces/trinidad/trunk/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java
    myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java

Modified: myfaces/trinidad/trunk/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXNavigationTreeTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXNavigationTreeTemplate.java?rev=1086353&r1=1086352&r2=1086353&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXNavigationTreeTemplate.java
(original)
+++ myfaces/trinidad/trunk/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXNavigationTreeTemplate.java
Mon Mar 28 19:20:45 2011
@@ -195,6 +195,7 @@ abstract public class UIXNavigationTreeT
           RowKeySet rowKeys = (RowKeySet) value;
           // row key sets need the most recent collection model, but there is no one common
entry
           // point to set this on the set besides when code asks for the value from the bean
+          __flushCachedModel();  //insist that we populate with the very lastest instance
of the collection model
           rowKeys.setCollectionModel(getCollectionModel());
         }
         finally

Modified: myfaces/trinidad/trunk/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPageTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPageTemplate.java?rev=1086353&r1=1086352&r2=1086353&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPageTemplate.java
(original)
+++ myfaces/trinidad/trunk/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPageTemplate.java
Mon Mar 28 19:20:45 2011
@@ -252,6 +252,7 @@ abstract public class UIXPageTemplate ex
           RowKeySet rowKeys = (RowKeySet) value;
           // row key sets need the most recent collection model, but there is no one common
entry
           // point to set this on the set besides when code asks for the value from the bean
+          __flushCachedModel();  //insist that we populate with the very lastest instance
of the collection model
           rowKeys.setCollectionModel(getCollectionModel());
         }
         finally

Modified: myfaces/trinidad/trunk/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java?rev=1086353&r1=1086352&r2=1086353&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java
(original)
+++ myfaces/trinidad/trunk/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java
Mon Mar 28 19:20:45 2011
@@ -550,6 +550,7 @@ abstract public class UIXTableTemplate e
             RowKeySet rowKeys = (RowKeySet) value;
             // row key sets need the most recent collection model, but there is no one common
entry
             // point to set this on the set besides when code asks for the value from the
bean
+            __flushCachedModel();  //insist that we populate with the very lastest instance
of the collection model
             rowKeys.setCollectionModel(getCollectionModel());
           }
           finally
@@ -571,6 +572,7 @@ abstract public class UIXTableTemplate e
             RowKeySet rowKeys = (RowKeySet) value;
             // row key sets need the most recent collection model, but there is no one common
entry
             // point to set this on the set besides when code asks for the value from the
bean
+            __flushCachedModel();  //insist that we populate with the very lastest instance
of the collection model
             rowKeys.setCollectionModel(getCollectionModel());
           }
           finally

Modified: myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java?rev=1086353&r1=1086352&r2=1086353&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java
(original)
+++ myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java
Mon Mar 28 19:20:45 2011
@@ -180,7 +180,7 @@ public abstract class UIXCollection exte
     if (!isRendered())
       return;
 
-    _flushCachedModel();
+    __flushCachedModel();
 
     // Make sure _hasEvent is false.
     iState._hasEvent = false;
@@ -598,7 +598,7 @@ public abstract class UIXCollection exte
       if (keyMgr instanceof DefaultClientKeyManager)
         ((DefaultClientKeyManager) keyMgr).clear();
     }
-    _flushCachedModel();
+    __flushCachedModel();
 
     Object assertKey = null;
     assert ((assertKey = getRowKey()) != null) || true;
@@ -1133,11 +1133,11 @@ public abstract class UIXCollection exte
       {
         if (!_getAndMarkFirstInvokeForRequest(context, clientId))
         {
-          // Call _init() since _flushCachedModel() assumes that
+          // Call _init() since __flushCachedModel() assumes that
           // selectedRowKeys and disclosedRowKeys are initialized to be non-null
           _init();
 
-          _flushCachedModel();
+          __flushCachedModel();
         }
 
         pushComponentToEL(context, null);
@@ -1163,11 +1163,11 @@ public abstract class UIXCollection exte
         {
           if (!_getAndMarkFirstInvokeForRequest(context, thisClientId))
           {
-            // Call _init() since _flushCachedModel() assumes that
+            // Call _init() since __flushCachedModel() assumes that
             // selectedRowKeys and disclosedRowKeys are initialized to be non-null
             _init();
 
-            _flushCachedModel();
+            __flushCachedModel();
           }
 
           String postId = clientId.substring(thisClientIdLength + 1);
@@ -1709,10 +1709,10 @@ public abstract class UIXCollection exte
    */
   void __processFlattenedChildrenBegin()
   {
-    // Call _init() since _flushCachedModel() assumes that
+    // Call _init() since __flushCachedModel() assumes that
     // selectedRowKeys and disclosedRowKeys are initialized to be non-null.
     _init();
-    _flushCachedModel();
+    __flushCachedModel();
   }
 
   private void _init()
@@ -1726,7 +1726,7 @@ public abstract class UIXCollection exte
     }
   }
 
-  private void _flushCachedModel()
+  void __flushCachedModel()
   {
     InternalState iState = _getInternalState(true);
     Object value = getValue();



Mime
View raw message