svn commit: r432757 - /shale/framework/trunk/shale-core/src/main/java/org/apache/shale/component/Subview.java

[cr...@apache.org]

Author: craigmcc
Date: Fri Aug 18 15:34:10 2006
New Revision: 432757

URL: http://svn.apache.org/viewvc?rev=432757&view=rev
Log:
Make Subview.encodeBegin delegate to the correct superclass method after
performing the preprocess callback.  Thanks to Andrew Gilette for the
patch.

SHALE-255

Modified:
    shale/framework/trunk/shale-core/src/main/java/org/apache/shale/component/Subview.java

Modified: shale/framework/trunk/shale-core/src/main/java/org/apache/shale/component/Subview.java
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-core/src/main/java/org/apache/shale/component/Subview.java?rev=432757&r1=432756&r2=432757&view=diff
==============================================================================
--- shale/framework/trunk/shale-core/src/main/java/org/apache/shale/component/Subview.java (original)
+++ shale/framework/trunk/shale-core/src/main/java/org/apache/shale/component/Subview.java Fri Aug 18 15:34:10 2006
@@ -16,6 +16,7 @@
 
 package org.apache.shale.component;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -69,7 +70,7 @@
      *
      * @param context <code>FacesContext</code> for the current request
      */
-    public void encodeBegin(FacesContext context) {
+    public void encodeBegin(FacesContext context) throws IOException {
 
         Object vc = getViewController(context, false);
         if (vc != null) {
@@ -79,7 +80,7 @@
                 handleException(context, e);
             }
         }
-        super.processDecodes(context);
+        super.encodeBegin(context);
 
     }
 
@@ -179,9 +180,10 @@
      */
     private ViewControllerCallbacks getViewControllerCallbacks(FacesContext context) {
 
-        ValueBinding vb = context.getApplication().createValueBinding
-          ("#{" + FacesConstants.VIEW_CALLBACKS + "}");
-        return (ViewControllerCallbacks) vb.getValue(context);
+        ViewControllerCallbacks vcb = (ViewControllerCallbacks)
+          context.getApplication().getVariableResolver().resolveVariable
+                (context, FacesConstants.VIEW_CALLBACKS);
+        return vcb;
 
     }