incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mat...@apache.org
Subject svn commit: r425978 [2/9] - in /incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal: renderkit/core/skin/ renderkit/html/layout/ renderkit/htmlBasic/ skin/ ui/ ui/action/...
Date Thu, 27 Jul 2006 06:45:19 GMT
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RootRenderingContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RootRenderingContext.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RootRenderingContext.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RootRenderingContext.java Wed Jul 26 23:44:58 2006
@@ -300,7 +300,7 @@
    * @since 2.0.12
    */
   public DataObject getDataObject(
-    RenderingContext context,
+    UIXRenderingContext context,
     String namespaceURI,
     String name
     )
@@ -356,7 +356,7 @@
   /**
    * This implementation returns an encoder that does no special encoding,
    * and returns an empty string as the default URL.
-   * @see RenderingContext#getURLEncoder()
+   * @see UIXRenderingContext#getURLEncoder()
    */
   public URLEncoder getURLEncoder()
   {
@@ -371,7 +371,7 @@
   /**
    * This implementation returns an encoder that does no special encoding,
    * and returns an empty string as the default URL.
-   * @see RenderingContext#getURLEncoder()
+   * @see UIXRenderingContext#getURLEncoder()
    */
   public void setURLEncoder(URLEncoder urlEncoder)
   {
@@ -389,7 +389,7 @@
 
   /**
    * This implementation returns an encoder that does no special encoding.
-   * @see RenderingContext#getFormEncoder()
+   * @see UIXRenderingContext#getFormEncoder()
    */
   public FormEncoder getFormEncoder()
   {
@@ -398,7 +398,7 @@
 
   /**
    * This implementation returns an encoder that does no special encoding.
-   * @see RenderingContext#getFormEncoder()
+   * @see UIXRenderingContext#getFormEncoder()
    */
   public void setFormEncoder(FormEncoder formEncoder)
   {
@@ -544,7 +544,7 @@
   */
   }
 
-  public final RenderingContext getParentContext()
+  public final UIXRenderingContext getParentContext()
   {
     return null;
   }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/TextNode.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/TextNode.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/TextNode.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/TextNode.java Wed Jul 26 23:44:58 2006
@@ -51,7 +51,7 @@
    * For this class, just returns the value passed to the constructor.
    */
   protected Object getTextObject(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     return _text;

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UINode.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UINode.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UINode.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UINode.java Wed Jul 26 23:44:58 2006
@@ -92,7 +92,7 @@
    * <p>
    * @see #getIndexedChild
    */
-  public int getIndexedChildCount(RenderingContext context);
+  public int getIndexedChildCount(UIXRenderingContext context);
 
 
   /**
@@ -106,7 +106,7 @@
    * <p>
    * @see #getIndexedChildCount
    */
-  public UINode getIndexedChild(RenderingContext context, int childIndex);
+  public UINode getIndexedChild(UIXRenderingContext context, int childIndex);
 
 
   /**
@@ -125,7 +125,7 @@
    * @see #getChildNames
    * @see org.apache.myfaces.trinidadinternal.ui.UIConstants
    */
-  public UINode getNamedChild(RenderingContext context, String childName);
+  public UINode getNamedChild(UIXRenderingContext context, String childName);
 
 
   /**
@@ -141,7 +141,7 @@
    * <p>
    * @see #getNamedChild
    */
-  public Iterator getChildNames(RenderingContext context);
+  public Iterator getChildNames(UIXRenderingContext context);
 
 
   /**
@@ -157,7 +157,7 @@
    * <p>
    * @see #getAttributeValue
    */
-  public Iterator getAttributeNames(RenderingContext context);
+  public Iterator getAttributeNames(UIXRenderingContext context);
 
   /**
    * Returns the value of the attribute with the specified name in the
@@ -177,7 +177,7 @@
    * <p>
    * @see #getAttributeNames
    */
-  public Object getAttributeValue(RenderingContext context, AttributeKey attrKey);
+  public Object getAttributeValue(UIXRenderingContext context, AttributeKey attrKey);
 
 
   /**
@@ -187,12 +187,12 @@
    * <p>
    * @see org.apache.myfaces.trinidadinternal.ui.data.BoundValue
    */
-  public Object getRawAttributeValue(RenderingContext context, AttributeKey attrKey);
+  public Object getRawAttributeValue(UIXRenderingContext context, AttributeKey attrKey);
 
   /**
    * Returns the role that this node occupies.
    */
-  public NodeRole getNodeRole(RenderingContext context);
+  public NodeRole getNodeRole(UIXRenderingContext context);
 
   /**
    * Renders this UINode.  Clients can implements this
@@ -200,9 +200,9 @@
    * will get a RendererManager from the RenderingContext,
    * get a Renderer, and defer rendering to that Renderer.
    */
-  public void render(RenderingContext context)
+  public void render(UIXRenderingContext context)
     throws IOException;
 
-  public void render(RenderingContext context, UINode node)
+  public void render(UIXRenderingContext context, UINode node)
     throws IOException;
 }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UINodeProxy.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UINodeProxy.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UINodeProxy.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UINodeProxy.java Wed Jul 26 23:44:58 2006
@@ -85,7 +85,7 @@
    * @see #getIndexedChild
    */
   public int getIndexedChildCount(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     context = getRenderingContext(context);
@@ -104,7 +104,7 @@
    * @see #getIndexedChildCount
    */
   public UINode getIndexedChild(
-    RenderingContext context,
+    UIXRenderingContext context,
     int              childIndex
     )
   {
@@ -129,7 +129,7 @@
    * @see org.apache.myfaces.trinidadinternal.ui.UIConstants
    */
   public UINode getNamedChild(
-    RenderingContext context,
+    UIXRenderingContext context,
     String           childName
     )
   {
@@ -152,7 +152,7 @@
    * @see #getNamedChild
    */
   public Iterator getChildNames(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     context = getRenderingContext(context);
@@ -173,7 +173,7 @@
    * @see #getAttributeValue
    */
   public Iterator getAttributeNames(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     context = getRenderingContext(context);
@@ -200,7 +200,7 @@
    * @see #getAttributeNames
    */
   public Object getAttributeValue(
-    RenderingContext context,
+    UIXRenderingContext context,
     AttributeKey     attrKey
     )
   {
@@ -210,7 +210,7 @@
 
 
   public Object getRawAttributeValue(
-    RenderingContext context,
+    UIXRenderingContext context,
     AttributeKey     attrKey
     )
   {
@@ -218,8 +218,8 @@
     return getUINode().getRawAttributeValue(context, attrKey);
   }
 
-  public RenderingContext getRenderingContext(
-    RenderingContext context
+  public UIXRenderingContext getRenderingContext(
+    UIXRenderingContext context
     )
   {
     return context;
@@ -230,7 +230,7 @@
   /**
    * Returns the role that this node occupies.
    */
-  public NodeRole getNodeRole(RenderingContext context)
+  public NodeRole getNodeRole(UIXRenderingContext context)
   {
     context = getRenderingContext(context);
     return getUINode().getNodeRole(context);
@@ -243,7 +243,7 @@
    * get a Renderer, and defer rendering to that Renderer.
    */
   public final void render(
-    RenderingContext context
+    UIXRenderingContext context
     )
     throws IOException
   {
@@ -252,7 +252,7 @@
   }
 
   public void render(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
     throws IOException

Copied: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIXRenderingContext.java (from r425955, incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RenderingContext.java)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIXRenderingContext.java?p2=incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIXRenderingContext.java&p1=incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RenderingContext.java&r1=425955&r2=425978&rev=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RenderingContext.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIXRenderingContext.java Wed Jul 26 23:44:58 2006
@@ -47,7 +47,7 @@
  * @version $Name:  $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/ui/RenderingContext.java#0 $) $Date: 10-nov-2005.18:50:20 $
  * @author The Oracle ADF Faces Team
  */
-public interface RenderingContext extends Cloneable
+public interface UIXRenderingContext extends Cloneable
 {
   /**
    * This property is used to retrieve the file system path
@@ -258,7 +258,7 @@
    * @see #getRenderedAncestorNodeCount
    */
   public void pushRenderedChild(
-    RenderingContext currentContext,
+    UIXRenderingContext currentContext,
     UINode renderedChild
     );
 
@@ -277,7 +277,7 @@
    * @see #getRenderedAncestorNode
    * @see #getRenderedAncestorNodeCount
    */
-  public void popRenderedChild(RenderingContext currentContext);
+  public void popRenderedChild(UIXRenderingContext currentContext);
 
 
   /**
@@ -402,7 +402,7 @@
    * Typically, only composite UINode implementors ever need to call this
    * method.
    */
-  public RenderingContext getParentContext();
+  public UIXRenderingContext getParentContext();
 
 
   public PartialPageContext getPartialPageContext();
@@ -412,7 +412,7 @@
    * function</em> unless you are yourself a RenderingContext.
    */
   public DataObject getDataObject(
-    RenderingContext outerContext,
+    UIXRenderingContext outerContext,
     String namespaceURI,
     String name);
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/ActionUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/ActionUtils.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/ActionUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/ActionUtils.java Wed Jul 26 23:44:58 2006
@@ -21,7 +21,7 @@
 import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 
 import org.apache.myfaces.trinidadinternal.share.url.FormEncoder;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 import org.apache.myfaces.trinidadinternal.ui.collection.Parameter;
@@ -106,7 +106,7 @@
    * Appends client-defined parameters to the buffer
    */
   public static void appendClientParameters(
-    RenderingContext context,
+    UIXRenderingContext context,
     StringBuffer     buffer,
     Parameter[]      parameters
     )
@@ -119,7 +119,7 @@
    * Appends client-defined parameters to the submit buffer including an event
    */
   public static void appendClientParameters(
-    RenderingContext context,
+    UIXRenderingContext context,
     StringBuffer     buffer,
     Parameter[]      parameters,
     String           event,
@@ -133,7 +133,7 @@
    * Appends client-defined parameters to the submit buffer including an event
    */
   public static void appendClientParameters(
-    RenderingContext context,
+    UIXRenderingContext context,
     StringBuffer     buffer,
     Parameter[]      parameters,
     String           event,
@@ -239,7 +239,7 @@
   }
 
   static String appendURLParameters(
-    RenderingContext context,
+    UIXRenderingContext context,
     String       base,
     Parameter[]  params
     )
@@ -299,7 +299,7 @@
    * Computes the buffer size for client-defined parameters
    */
   public static final int getClientParametersSize(
-    RenderingContext context,
+    UIXRenderingContext context,
     Parameter[]      parameters
     )
   {
@@ -334,7 +334,7 @@
   /**
    * Returns the current form name
    */
-  public static String getFormName(RenderingContext context)
+  public static String getFormName(UIXRenderingContext context)
   {
     Object formName = context.getProperty(UIConstants.MARLIN_NAMESPACE,
                                           UIConstants.FORM_NAME_PROPERTY);
@@ -353,7 +353,7 @@
 
   // get the source parameter, and if null, then get the id as the source
   public static String getSource(
-     RenderingContext context,
+     UIXRenderingContext context,
      UINode node,
      BoundValue binding,
      String actionSource)
@@ -385,7 +385,7 @@
   }
 
   static Parameter buildParameter(
-     RenderingContext context,
+     UIXRenderingContext context,
      UINode node,
      BoundValue binding,
      String param,
@@ -400,7 +400,7 @@
 
   // Gets a value from a bound value
   public static Object getValue(
-    RenderingContext context,
+    UIXRenderingContext context,
     BoundValue       boundValue,
     Object           defaultValue
     )

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/ClientAction.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/ClientAction.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/ClientAction.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/ClientAction.java Wed Jul 26 23:44:58 2006
@@ -17,7 +17,7 @@
 
 import java.io.IOException;
 
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 
 import org.apache.myfaces.trinidadinternal.ui.collection.Parameter;
@@ -48,7 +48,7 @@
    *                  true or false.
    */
   abstract public String getScript
-    (RenderingContext context,
+    (UIXRenderingContext context,
      UINode node,
      Boolean returnVal);
 
@@ -62,7 +62,7 @@
    * @param node      The target UINode.
    */
   public void writeDependencies(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode node
     ) throws IOException
   {
@@ -108,7 +108,7 @@
    * @param node      The target UINode.
    */
   public boolean isTriggerRequired(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -136,7 +136,7 @@
    * @param node      The target UINode.
    */
   public void renderTrigger(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -163,7 +163,7 @@
    * @param node      The target UINode.
    */
   public void renderTrigger(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     Object           text
     ) throws IOException
@@ -180,7 +180,7 @@
    * @param node      The target UINode.
    */
   public Parameter[] getParameters(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node)
   {
     return null;
@@ -203,7 +203,7 @@
    * @param node      The target UINode.
    */
   public boolean renderAsEvent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node)
   {
     return true;

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/ClientActionUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/ClientActionUtils.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/ClientActionUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/ClientActionUtils.java Wed Jul 26 23:44:58 2006
@@ -16,7 +16,7 @@
 
 package org.apache.myfaces.trinidadinternal.ui.action;
 
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 
@@ -35,7 +35,7 @@
    * Gets the ClientAction associated with this UINode if there is one.
    */
   public static ClientAction getPrimaryClientAction(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -44,7 +44,7 @@
   }
 
   public static String appendURLParameters(
-    RenderingContext context,
+    UIXRenderingContext context,
     String       base,
     Parameter[]  params
     )

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FireAction.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FireAction.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FireAction.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FireAction.java Wed Jul 26 23:44:58 2006
@@ -19,7 +19,7 @@
 import java.io.IOException;
 
 import org.apache.myfaces.trinidadinternal.share.url.URLEncoder;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 import org.apache.myfaces.trinidadinternal.ui.collection.Parameter;
@@ -97,7 +97,7 @@
    * Implementation of ClientAction.getScript().
    */
   public String getScript
-    (RenderingContext context,
+    (UIXRenderingContext context,
      UINode node,
      Boolean returnVal)
   {
@@ -118,7 +118,7 @@
    * Override of ClientAction.writeDependencies().
    */
   public void writeDependencies(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode node
     ) throws IOException
   {
@@ -172,7 +172,7 @@
   }
 
   protected String getSubmitScript
-    (RenderingContext context,
+    (UIXRenderingContext context,
      UINode node,
      String returnScript)
   {
@@ -225,7 +225,7 @@
   }
 
   protected String getChangeScript
-    (RenderingContext context,
+    (UIXRenderingContext context,
      UINode node,
      String returnScript)
   {
@@ -234,7 +234,7 @@
   }
 
   protected String getChangeScript
-    (RenderingContext context,
+    (UIXRenderingContext context,
      UINode node,
      String returnScript,
      String startScript,
@@ -307,7 +307,7 @@
   }
 
   public Parameter[] getParameters(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node)
   {
     // Get the encoded names for our event parameters
@@ -386,7 +386,7 @@
    * Override of ClientAction.renderAsEvent().
    */
   public boolean renderAsEvent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node)
   {
     // If this action is formSubmitted, we have to render on an event handler.
@@ -489,13 +489,13 @@
   }
 
   // Gets the event value
-  protected String getEventValue(RenderingContext context)
+  protected String getEventValue(UIXRenderingContext context)
   {
     return (String) ActionUtils.getValue(context, _eventBinding, getEvent());
   }
 
   // Gets the unvalidated value
-  protected boolean isUnvalidated(RenderingContext context)
+  protected boolean isUnvalidated(UIXRenderingContext context)
   {
     Boolean unvalidated = (Boolean) ActionUtils.getValue(context,
                                                          _unvalidatedBinding,
@@ -541,7 +541,7 @@
 
 
   protected static void appendClientParameters(
-    RenderingContext context,
+    UIXRenderingContext context,
     StringBuffer     buffer,
     Parameter[]      parameters
     )
@@ -560,7 +560,7 @@
    * Computes the buffer size for client-defined parameters
    */
   protected static int getClientParametersSize(
-    RenderingContext context,
+    UIXRenderingContext context,
     Parameter[]      parameters
     )
   {
@@ -594,7 +594,7 @@
 
   // Computes the size of the buffer that is needed to build up the script
   protected static int getBufferSize(
-    RenderingContext context,
+    UIXRenderingContext context,
     String  startScript,
     String  endScript,
     String  destination,
@@ -653,7 +653,7 @@
   }
 
   // Gets the destination attribute of the specified UINode
-  protected static String getDestination(RenderingContext context, UINode node)
+  protected static String getDestination(UIXRenderingContext context, UINode node)
   {
     Object destination = node.getAttributeValue(context,
                                                 UIConstants.DESTINATION_ATTR);
@@ -677,12 +677,12 @@
     return encoder.encodeParameter(UIConstants.SOURCE_PARAM);
   }
 
-  protected String getSource(RenderingContext context, UINode node)
+  protected String getSource(UIXRenderingContext context, UINode node)
   {
     return ActionUtils.getSource(context, node, _sourceBinding, _source);
   }
 
-  protected String getFormName(RenderingContext context, UINode node)
+  protected String getFormName(UIXRenderingContext context, UINode node)
   {
     String formName = null;
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FirePartialAction.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FirePartialAction.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FirePartialAction.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FirePartialAction.java Wed Jul 26 23:44:58 2006
@@ -24,7 +24,7 @@
 import org.apache.myfaces.trinidadinternal.share.url.FormEncoder;
 import org.apache.myfaces.trinidadinternal.share.url.URLEncoder;
 
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 
@@ -161,7 +161,7 @@
    * Implementation of FireAction.getSubmitScript().
    */
   protected String getSubmitScript
-    (RenderingContext context,
+    (UIXRenderingContext context,
      UINode node,
      String returnScript)
   {
@@ -250,7 +250,7 @@
   }
 
   protected String getChangeScript
-    (RenderingContext context,
+    (UIXRenderingContext context,
      UINode node,
      String returnScript)
   {
@@ -302,7 +302,7 @@
    * Override of FireAction.renderAsEvent().
    */
   public boolean renderAsEvent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node)
   {
     return true;
@@ -339,7 +339,7 @@
    * Override of ClientAction.writeDependencies().
    */
   public void writeDependencies(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode node
     ) throws IOException
   {
@@ -377,7 +377,7 @@
    * Override of ClientAction.isTriggerRequired()
    */
   public boolean isTriggerRequired(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -392,7 +392,7 @@
    * Override of ClientAction.renderTrigger().
    */
   public void renderTrigger(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -418,7 +418,7 @@
    * Override of ClientAction.renderTrigger().
    */
   public void renderTrigger(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     Object           text,
     Object           accessKey
@@ -451,7 +451,7 @@
   }
 
   public Parameter[] getParameters(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node)
   {
 
@@ -481,7 +481,7 @@
   }
 
   // Returns the set of partial targets encoded as a string
-  private String _getPartialTargets(RenderingContext context)
+  private String _getPartialTargets(UIXRenderingContext context)
   {
     // Get the partial targets
     String[] targets = (String[])ActionUtils.getValue(context,

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/ArrayAttributeMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/ArrayAttributeMap.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/ArrayAttributeMap.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/ArrayAttributeMap.java Wed Jul 26 23:44:58 2006
@@ -22,7 +22,7 @@
 
 
 import org.apache.myfaces.trinidadinternal.ui.AttributeKey;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 
 /**
  * AttributeMap implementation that stores AttributeKey value pairs in
@@ -74,7 +74,7 @@
 
 
   public Object getAttribute(
-    RenderingContext context,
+    UIXRenderingContext context,
     AttributeKey     key
     )
   {
@@ -97,7 +97,7 @@
   }
 
   public Iterator attributeKeys(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     int size = size();

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/ArrayUINodeList.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/ArrayUINodeList.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/ArrayUINodeList.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/ArrayUINodeList.java Wed Jul 26 23:44:58 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.trinidadinternal.ui.collection;
 
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 
 
@@ -38,13 +38,13 @@
     _nodes = new UINode[initialCapacity];
   }
  
-  public int size(RenderingContext context)
+  public int size(UIXRenderingContext context)
   {
     return _nodeCount;
   }
   
   public UINode getUINode(
-    RenderingContext context,
+    UIXRenderingContext context,
     int index
     )
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/AttributeMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/AttributeMap.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/AttributeMap.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/AttributeMap.java Wed Jul 26 23:44:58 2006
@@ -18,7 +18,7 @@
 import java.util.Iterator;
 
 import org.apache.myfaces.trinidadinternal.ui.AttributeKey;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 
 
 /**
@@ -48,7 +48,7 @@
   /**
    * Returns the value in the AttributeMap specified by the key.
    */
-  public Object getAttribute(RenderingContext context, AttributeKey key);
+  public Object getAttribute(UIXRenderingContext context, AttributeKey key);
 
   /**
    * Sets an attribute value specified by the key to the new value.
@@ -60,5 +60,5 @@
    * Returns an Iterator of all of the AttributeKeys in the AttributeMap
    * that values exist for.
    */
-  public Iterator attributeKeys(RenderingContext context);
+  public Iterator attributeKeys(UIXRenderingContext context);
 }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/ContextMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/ContextMap.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/ContextMap.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/ContextMap.java Wed Jul 26 23:44:58 2006
@@ -17,7 +17,7 @@
 
 import java.util.Iterator;
 
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 
 /**
  * Map-like object for storing context-based information.  Since the
@@ -44,7 +44,7 @@
    *         no value is found.
    * @throws IllegalArgumentException if the key is null
    */
-  public Object get(RenderingContext context, Object key);
+  public Object get(UIXRenderingContext context, Object key);
 
   /**
    * Stores the <code>value</code> in the map, under the <code>key</code>.
@@ -66,9 +66,9 @@
    * The entire contents of the ContextMap can
    * be retrieved by calling <code>ContextMap.get</code> for each of the keys
    * in the enumeration.
-   * @param RenderingContext context Context used to determine the set of
+   * @param UIXRenderingContext context Context used to determine the set of
    *                                 keys.
    * @return The Iterator of keys in the RenderingContext
    */
-  public Iterator keys(RenderingContext context);
+  public Iterator keys(UIXRenderingContext context);
 }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/DataObjectListNodeList.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/DataObjectListNodeList.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/DataObjectListNodeList.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/DataObjectListNodeList.java Wed Jul 26 23:44:58 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.trinidadinternal.ui.collection;
 
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 
 import org.apache.myfaces.trinidadinternal.ui.data.BoundValue;
@@ -198,7 +198,7 @@
    * Returns the size of the DataObjectListNodeList;  returns
    * (number of contained nodes) * (size of the DataObjectList).
    */
-  public int size(RenderingContext context)
+  public int size(UIXRenderingContext context)
   {
     DataObjectList dol = getDataObjectList(context);
     if (dol == null)
@@ -208,7 +208,7 @@
 
 
   public UINode getUINode(
-    RenderingContext context,
+    UIXRenderingContext context,
     int index
     )
   {
@@ -262,7 +262,7 @@
   /**
    * Returns the DataObjectList to be used.
    */
-  protected DataObjectList getDataObjectList(RenderingContext context)
+  protected DataObjectList getDataObjectList(UIXRenderingContext context)
   {
     if (_boundData != null)
     {
@@ -298,7 +298,7 @@
     }
   }
 
-  protected UINodeList getUINodeList(RenderingContext context)
+  protected UINodeList getUINodeList(UIXRenderingContext context)
   {
     return _baseNodes;
   }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/DataObjectUINodeProxy.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/DataObjectUINodeProxy.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/DataObjectUINodeProxy.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/DataObjectUINodeProxy.java Wed Jul 26 23:44:58 2006
@@ -18,7 +18,7 @@
 import java.io.IOException;
 
 import org.apache.myfaces.trinidadinternal.ui.AttributeKey;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 import org.apache.myfaces.trinidadinternal.ui.UINodeProxy;
 
@@ -81,7 +81,7 @@
   }
 
   public Object getAttributeValue(
-    RenderingContext context,
+    UIXRenderingContext context,
     AttributeKey     attrKey
     )
   {
@@ -110,7 +110,7 @@
     return value;
   }
 
-  public int getIndexedChildCount(RenderingContext context)
+  public int getIndexedChildCount(UIXRenderingContext context)
   {
     int count;
 
@@ -137,7 +137,7 @@
     return count;
   }
 
-  public void render(RenderingContext context, UINode node)
+  public void render(UIXRenderingContext context, UINode node)
     throws IOException
   {
     DataObject oldDataObject = context.getCurrentDataObject();
@@ -155,7 +155,7 @@
 
 
   public UINode getIndexedChild(
-    RenderingContext context,
+    UIXRenderingContext context,
     int              childIndex)
   {
     UINode child;
@@ -189,7 +189,7 @@
 
 
   public UINode getNamedChild(
-    RenderingContext context,
+    UIXRenderingContext context,
     String           childName)
   {
     UINode child;

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/FlaggedAttributeMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/FlaggedAttributeMap.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/FlaggedAttributeMap.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/FlaggedAttributeMap.java Wed Jul 26 23:44:58 2006
@@ -16,7 +16,7 @@
 package org.apache.myfaces.trinidadinternal.ui.collection;
 
 import org.apache.myfaces.trinidadinternal.ui.AttributeKey;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 
 
 /**
@@ -59,7 +59,7 @@
   
   
   public Object getAttribute(
-    RenderingContext context,
+    UIXRenderingContext context,
     AttributeKey     key
     )
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/MapContextMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/MapContextMap.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/MapContextMap.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/MapContextMap.java Wed Jul 26 23:44:58 2006
@@ -21,7 +21,7 @@
 
 import org.apache.myfaces.trinidad.util.ArrayMap;
 
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 
 /**
  * @version $Name:  $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/ui/collection/MapContextMap.java#0 $) $Date: 10-nov-2005.18:57:34 $
@@ -45,7 +45,7 @@
   }
 
   public Object get(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object           key
     )
   {
@@ -68,7 +68,7 @@
   }
 
   public Iterator keys(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {  
     if(_map instanceof ArrayMap)

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/Parameter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/Parameter.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/Parameter.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/Parameter.java Wed Jul 26 23:44:58 2006
@@ -16,7 +16,7 @@
 
 package org.apache.myfaces.trinidadinternal.ui.collection;
 
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.data.BoundValue;
 
 /**
@@ -109,14 +109,14 @@
   /**
    * Gets the value, resolving any data binding.
    */
-  public String getValue(RenderingContext context)
+  public String getValue(UIXRenderingContext context)
   {
     return _getString(context, _valueBinding, _value);
   }
 
   // Convert a BoundValue into a string
   static private String _getString(
-    RenderingContext context,
+    UIXRenderingContext context,
     BoundValue value,
     String     s)
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UINodeAttributeMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UINodeAttributeMap.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UINodeAttributeMap.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UINodeAttributeMap.java Wed Jul 26 23:44:58 2006
@@ -18,7 +18,7 @@
 import java.util.Iterator;
 
 import org.apache.myfaces.trinidadinternal.ui.AttributeKey;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.MutableUINode;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 
@@ -31,15 +31,15 @@
  */
 public abstract class UINodeAttributeMap implements AttributeMap
 {
-  protected abstract UINode getUINode(RenderingContext context);
+  protected abstract UINode getUINode(UIXRenderingContext context);
 
-  protected RenderingContext getRenderingContext(RenderingContext context)
+  protected UIXRenderingContext getRenderingContext(UIXRenderingContext context)
   {
     return context;
   }
 
   public Object getAttribute(
-    RenderingContext context,
+    UIXRenderingContext context,
     AttributeKey     key
     )
   {
@@ -72,7 +72,7 @@
   }
 
   public Iterator attributeKeys(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     UINode node = getUINode(context);

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UINodeList.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UINodeList.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UINodeList.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UINodeList.java Wed Jul 26 23:44:58 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.trinidadinternal.ui.collection;
 
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 
 
@@ -45,13 +45,13 @@
    * Returns the number of elements in the UINodeList given the specified
    * RenderingContext.
    */
-  public int size(RenderingContext context);
+  public int size(UIXRenderingContext context);
 
   /**
    * Returns the UINode at the specifed index in the UINodeList, given
    * the specified RenderingContext.
    */
-  public UINode getUINode(RenderingContext context, int index);
+  public UINode getUINode(UIXRenderingContext context, int index);
   
   /**
    * Replaces the UINode at the specified index with the new UINode value,

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UINodeListProxy.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UINodeListProxy.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UINodeListProxy.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UINodeListProxy.java Wed Jul 26 23:44:58 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.trinidadinternal.ui.collection;
 
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 
 /**
@@ -25,10 +25,10 @@
  */
 public abstract class UINodeListProxy implements UINodeList
 {
-  protected abstract UINodeList getUINodeList(RenderingContext context);
+  protected abstract UINodeList getUINodeList(UIXRenderingContext context);
   
   public int size(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     UINodeList nodeList = getUINodeList(context);
@@ -44,7 +44,7 @@
   }
   
   public UINode getUINode(
-    RenderingContext context,
+    UIXRenderingContext context,
     int              index
     )
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UINodeUINodeList.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UINodeUINodeList.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UINodeUINodeList.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UINodeUINodeList.java Wed Jul 26 23:44:58 2006
@@ -16,7 +16,7 @@
 package org.apache.myfaces.trinidadinternal.ui.collection;
 
 import org.apache.myfaces.trinidadinternal.ui.MutableUINode;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 
 /**
@@ -27,9 +27,9 @@
  */
 public abstract class UINodeUINodeList implements UINodeList
 {
-  protected abstract UINode getUINode(RenderingContext context);
+  protected abstract UINode getUINode(UIXRenderingContext context);
 
-  protected RenderingContext getRenderingContext(RenderingContext context)
+  protected UIXRenderingContext getRenderingContext(UIXRenderingContext context)
   {
     return context;
   }
@@ -50,7 +50,7 @@
   
 
   public int size(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     UINode node = getUINode(context);
@@ -68,7 +68,7 @@
   
   
   public UINode getUINode(
-    RenderingContext context,
+    UIXRenderingContext context,
     int              index
     )
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UnmodifiableCompoundNodeList.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UnmodifiableCompoundNodeList.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UnmodifiableCompoundNodeList.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UnmodifiableCompoundNodeList.java Wed Jul 26 23:44:58 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.trinidadinternal.ui.collection;
 
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 
 /**
@@ -36,7 +36,7 @@
   }
   
   public int size(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     int total = 0;
@@ -52,7 +52,7 @@
   
   
   public UINode getUINode(
-    RenderingContext context,
+    UIXRenderingContext context,
     int              index
     )
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/CompositeRenderingContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/CompositeRenderingContext.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/CompositeRenderingContext.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/CompositeRenderingContext.java Wed Jul 26 23:44:58 2006
@@ -38,7 +38,7 @@
 
 import org.apache.myfaces.trinidadinternal.ui.LogicalNodeRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.RendererManager;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 import org.apache.myfaces.trinidadinternal.ui.expl.UIVariableResolver;
 import org.apache.myfaces.trinidadinternal.ui.data.DataObject;
@@ -59,7 +59,7 @@
    */
   static synchronized CompositeRenderingContext
                              __getCompositeRenderingContext(
-    RenderingContext parentContext
+    UIXRenderingContext parentContext
     )
   {
     CompositeRenderingContext currContext = _sContexts;
@@ -125,7 +125,7 @@
   }
 
   protected void initialize(
-    RenderingContext parentContext
+    UIXRenderingContext parentContext
     )
   {
     if (parentContext == null)
@@ -262,7 +262,7 @@
 
 
   public void pushRenderedChild(
-    RenderingContext currentContext,
+    UIXRenderingContext currentContext,
     UINode renderedChild
     )
   {
@@ -273,7 +273,7 @@
     super.pushRenderedChild(currentContext, renderedChild);
   }
 
-  public void popRenderedChild(RenderingContext currentContext)
+  public void popRenderedChild(UIXRenderingContext currentContext)
   {
     // handle cleaning up any of the dataproviders
     super.popRenderedChild(currentContext);
@@ -288,7 +288,7 @@
    * Returns the DataObject for the given namespace and name pair.
    */
   public DataObject getDataObject(
-    RenderingContext context,
+    UIXRenderingContext context,
     String namespaceURI,
     String name
     )
@@ -494,7 +494,7 @@
 
 
   /**
-   * @see RenderingContext#getFormEncoder()
+   * @see UIXRenderingContext#getFormEncoder()
    */
   public FormEncoder getFormEncoder()
   {
@@ -502,7 +502,7 @@
   }
 
   /**
-   * @see RenderingContext#getURLEncoder()
+   * @see UIXRenderingContext#getURLEncoder()
    */
   public URLEncoder getURLEncoder()
   {
@@ -534,7 +534,7 @@
     return _nonCompositeContext.getStyleContext();
   }
 
-  public RenderingContext getParentContext()
+  public UIXRenderingContext getParentContext()
   {
     return _parentContext;
   }
@@ -550,7 +550,7 @@
     CompositeRenderingContext context = (CompositeRenderingContext)super.clone();
 
     // clone the delegated context
-    context._parentContext = (RenderingContext)_parentContext.clone();
+    context._parentContext = (UIXRenderingContext)_parentContext.clone();
 
     return context;
   }
@@ -562,7 +562,7 @@
   }
 
 
-  private RenderingContext _getNonCompositeContext(RenderingContext parent)
+  private UIXRenderingContext _getNonCompositeContext(UIXRenderingContext parent)
   {
     while (parent instanceof CompositeRenderingContext)
     {
@@ -581,8 +581,8 @@
   private static int _sCurrCompositeCount;
 
   private CompositeRenderingContext _nextContext;
-  private RenderingContext _parentContext;
-  private RenderingContext _nonCompositeContext;
+  private UIXRenderingContext _parentContext;
+  private UIXRenderingContext _nonCompositeContext;
   private Map  _skinResourceKeyMap;
 
   private boolean _globalCurrentDataObject;

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/ContextPoppingUINode.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/ContextPoppingUINode.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/ContextPoppingUINode.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/ContextPoppingUINode.java Wed Jul 26 23:44:58 2006
@@ -25,7 +25,7 @@
 import org.apache.myfaces.trinidadinternal.ui.BaseUINode;
 import org.apache.myfaces.trinidadinternal.ui.NodeRole;
 import org.apache.myfaces.trinidadinternal.ui.Renderer;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.RoledRenderer;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
@@ -94,7 +94,7 @@
 
 
   public int getIndexedChildCount(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     if (getPoppedNode(context) != null)
@@ -109,7 +109,7 @@
 
 
   public UINode getIndexedChild(
-    RenderingContext context,
+    UIXRenderingContext context,
     int              childIndex
     )
   {
@@ -127,7 +127,7 @@
   }
 
   protected UINode getPoppedNode(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     if (context == null)
@@ -150,7 +150,7 @@
   }
 
   protected Object getAttributeValueImpl(
-    RenderingContext context,
+    UIXRenderingContext context,
     AttributeKey     attrKey,
     boolean          returnBoundValue
     )
@@ -177,7 +177,7 @@
   }
 
   protected Renderer getRenderer(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           dataNode
     )
   {
@@ -207,7 +207,7 @@
   private static class ContextPoppingRenderer implements RoledRenderer
   {
     public void render(
-      RenderingContext context,
+      UIXRenderingContext context,
       UINode           node
       )
       throws IOException
@@ -216,7 +216,7 @@
                               (ContextPoppingUINode)context.getAncestorNode(0);
       DataObject poppingCurrentDataObject  = context.getCurrentDataObject();
 
-      RenderingContext poppedContext = context.getParentContext();
+      UIXRenderingContext poppedContext = context.getParentContext();
 
       UINode poppedNode = poppingNode.getPoppedNode(context);
 
@@ -242,7 +242,7 @@
     }
 
     public NodeRole getNodeRole(
-      RenderingContext context,
+      UIXRenderingContext context,
       UINode           node)
     {
       return STATE_ROLE;

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/ContextPropertyUINode.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/ContextPropertyUINode.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/ContextPropertyUINode.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/ContextPropertyUINode.java Wed Jul 26 23:44:58 2006
@@ -20,7 +20,7 @@
 import org.apache.myfaces.trinidadinternal.ui.BaseMutableUINode;
 import org.apache.myfaces.trinidadinternal.ui.BaseRenderer;
 import org.apache.myfaces.trinidadinternal.ui.NodeRole;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.Renderer;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
@@ -58,13 +58,13 @@
     _propertyValue     = propertyValue;
   }
 
-  public NodeRole getNodeRole(RenderingContext context)
+  public NodeRole getNodeRole(UIXRenderingContext context)
   {
     return UIConstants.STATE_ROLE;
   }
 
   protected Renderer getRenderer(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           dataNode
     )
   {
@@ -74,7 +74,7 @@
   private class Rndr extends BaseRenderer
   {
     public void render(
-      RenderingContext context,
+      UIXRenderingContext context,
       UINode           node
       ) throws IOException
     {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/PoppedAttributeBoundValue.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/PoppedAttributeBoundValue.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/PoppedAttributeBoundValue.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/PoppedAttributeBoundValue.java Wed Jul 26 23:44:58 2006
@@ -16,7 +16,7 @@
 package org.apache.myfaces.trinidadinternal.ui.composite;
 
 import org.apache.myfaces.trinidadinternal.ui.AttributeKey;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 
 import org.apache.myfaces.trinidadinternal.ui.data.BoundValue;
@@ -53,10 +53,10 @@
    * @param context the rendering context
    */
   public Object getValue(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
-    RenderingContext parentContext = context.getParentContext();
+    UIXRenderingContext parentContext = context.getParentContext();
     
     if (parentContext != null)
     {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootAttributeBoundValue.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootAttributeBoundValue.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootAttributeBoundValue.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootAttributeBoundValue.java Wed Jul 26 23:44:58 2006
@@ -18,7 +18,7 @@
 import org.apache.myfaces.trinidadinternal.util.OptimisticHashMap;
 
 import org.apache.myfaces.trinidadinternal.ui.AttributeKey;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 
 import org.apache.myfaces.trinidadinternal.ui.data.BoundValue;
@@ -83,10 +83,10 @@
    * @param context the rendering context
    */
   public Object getValue(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
-    RenderingContext parentContext = context.getParentContext();
+    UIXRenderingContext parentContext = context.getParentContext();
 
     if (parentContext != null)
     {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootAttributeMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootAttributeMap.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootAttributeMap.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootAttributeMap.java Wed Jul 26 23:44:58 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.trinidadinternal.ui.composite;
 
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 
 import org.apache.myfaces.trinidadinternal.ui.collection.UINodeAttributeMap;
@@ -42,12 +42,12 @@
   }
   
   protected UINode getUINode(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     if (context != null)
     {
-      RenderingContext parentContext = context.getParentContext();
+      UIXRenderingContext parentContext = context.getParentContext();
       
       if (parentContext != null)
       {
@@ -58,7 +58,7 @@
     return null;
   }
   
-  protected RenderingContext getRenderingContext(RenderingContext context)
+  protected UIXRenderingContext getRenderingContext(UIXRenderingContext context)
   {
     if (context == null)
       return null;

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootBoundValue.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootBoundValue.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootBoundValue.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootBoundValue.java Wed Jul 26 23:44:58 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.trinidadinternal.ui.composite;
 
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 
 import org.apache.myfaces.trinidadinternal.ui.data.BoundValue;
 
@@ -46,10 +46,10 @@
    * @param context the rendering context
    */
   public Object getValue(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
-    RenderingContext parentContext = context.getParentContext();
+    UIXRenderingContext parentContext = context.getParentContext();
     
     if (parentContext != null)
     {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootChildBoundValue.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootChildBoundValue.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootChildBoundValue.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootChildBoundValue.java Wed Jul 26 23:44:58 2006
@@ -19,7 +19,7 @@
 
 import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
 
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 
 import org.apache.myfaces.trinidadinternal.ui.data.BoundValue;
@@ -88,10 +88,10 @@
    * @param context the rendering context
    */
   public Object getValue(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
-    RenderingContext parentContext = context.getParentContext();
+    UIXRenderingContext parentContext = context.getParentContext();
 
     if (parentContext != null)
     {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootUINodeList.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootUINodeList.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootUINodeList.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootUINodeList.java Wed Jul 26 23:44:58 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.trinidadinternal.ui.composite;
 
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 
 import org.apache.myfaces.trinidadinternal.ui.collection.UINodeUINodeList;
@@ -39,7 +39,7 @@
   }
     
   protected UINode getUINode(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {    
     if (context != null)
@@ -52,7 +52,7 @@
     }
   }
 
-  protected RenderingContext getRenderingContext(RenderingContext context)
+  protected UIXRenderingContext getRenderingContext(UIXRenderingContext context)
   {
     if (context == null)
       return null;
@@ -62,7 +62,7 @@
 
 
   public UINode getUINode(
-    RenderingContext context,
+    UIXRenderingContext context,
     int              index
     )
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/UINodeRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/UINodeRenderer.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/UINodeRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/UINodeRenderer.java Wed Jul 26 23:44:58 2006
@@ -18,7 +18,7 @@
 import java.io.IOException;
 
 import org.apache.myfaces.trinidadinternal.ui.Renderer;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 
@@ -32,14 +32,14 @@
 public abstract class UINodeRenderer implements Renderer
 {
   protected abstract UINode getRenderingUINode(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node);
     
   /**
    * Render a UINode in a RenderingContext.
    */
   public void render(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {    
@@ -54,7 +54,7 @@
    * @param node the current UINode
    */
   protected void prerender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -67,17 +67,17 @@
    * @param node the current UINode
    */
   protected void postrender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
   }
 
   /**
-   * @see #renderInCompositeContext(RenderingContext,UINode,UINode)
+   * @see #renderInCompositeContext(UIXRenderingContext,UINode,UINode)
    */
   protected void renderWithNode(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     UINode           renderingUINode
     ) throws IOException
@@ -117,7 +117,7 @@
    * and/or indexed/named children from <code>node</code>. It renders in its
    * own RenderingContext.
    */
-  public static void renderInCompositeContext(RenderingContext context,
+  public static void renderInCompositeContext(UIXRenderingContext context,
                                               UINode node,
                                               UINode renderingUINode)
     throws IOException
@@ -142,7 +142,7 @@
   }
 
   static private CompositeRenderingContext _startCompositeContext(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode renderingUINode
     )
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/BoundValue.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/BoundValue.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/BoundValue.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/BoundValue.java Wed Jul 26 23:44:58 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.trinidadinternal.ui.data;
 
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 
 /**
  * The BoundValue interface is used to dynamically compute
@@ -34,5 +34,5 @@
    * context.
    * @param context the rendering context
    */
-  public Object getValue(RenderingContext context);
+  public Object getValue(UIXRenderingContext context);
 }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/DataBoundValue.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/DataBoundValue.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/DataBoundValue.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/DataBoundValue.java Wed Jul 26 23:44:58 2006
@@ -19,7 +19,7 @@
 
 import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 
 
 /**
@@ -82,7 +82,7 @@
    * @param context the rendering context
    */
   public Object getValue(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     if (context != null)
@@ -139,7 +139,7 @@
    * Handles a Throwable;  the exception is swallowed after being logged.
    */
   static public void handleException(
-    RenderingContext context,
+    UIXRenderingContext context,
     Throwable throwable)
   {
     if (throwable == null)
@@ -164,7 +164,7 @@
    * the exception is swallowed after being logged.
    */
   static public void handleException(
-    RenderingContext context,
+    UIXRenderingContext context,
     RuntimeException exception)
   {
     // Catch and log all exceptions.

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/DataObject.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/DataObject.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/DataObject.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/DataObject.java Wed Jul 26 23:44:58 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.trinidadinternal.ui.data;
 
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 
 /**
  * The DataObject interface provides an extremely simple API for
@@ -37,6 +37,6 @@
    * @param context the current rendering context
    * @param select a select criterion, syntax as defined by the data object
    */
-  public Object selectValue(RenderingContext context, Object select);
+  public Object selectValue(UIXRenderingContext context, Object select);
 }
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/DictionaryData.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/DictionaryData.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/DictionaryData.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/DictionaryData.java Wed Jul 26 23:44:58 2006
@@ -21,7 +21,7 @@
 import java.util.ArrayList;
 
 import java.util.Iterator;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 
 /**
  * The DictionaryData interface provides a simple,
@@ -75,7 +75,7 @@
   /**
    * Returns the value registered with the select key.
    */
-  public Object selectValue(RenderingContext context, Object select)
+  public Object selectValue(UIXRenderingContext context, Object select)
   {
     if (select == null)
       return null;
@@ -83,7 +83,7 @@
   }
   
   public void updateValue(
-    RenderingContext context, 
+    UIXRenderingContext context, 
     Object select,
     Object value)
   {
@@ -91,7 +91,7 @@
   }
   
   public Iterator keys(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     ArrayList keyList = new ArrayList();

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/KeyedDataObject.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/KeyedDataObject.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/KeyedDataObject.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/KeyedDataObject.java Wed Jul 26 23:44:58 2006
@@ -17,7 +17,7 @@
 
 import java.util.Iterator;
 
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 
 
 /**
@@ -28,5 +28,5 @@
  */
 public interface KeyedDataObject extends DataObject
 {
-  public Iterator keys(RenderingContext context);
+  public Iterator keys(UIXRenderingContext context);
 }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/MapData.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/MapData.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/MapData.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/MapData.java Wed Jul 26 23:44:58 2006
@@ -19,7 +19,7 @@
 import java.util.HashMap;
 
 import java.util.Map;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 
 /**
  * The MapData interface provides a simple,
@@ -73,7 +73,7 @@
   /**
    * Returns the value registered with the select key.
    */
-  public Object selectValue(RenderingContext context, Object select)
+  public Object selectValue(UIXRenderingContext context, Object select)
   {
     if (select == null)
       return null;
@@ -81,7 +81,7 @@
   }
 
   public void updateValue(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object select,
     Object value)
   {
@@ -89,7 +89,7 @@
   }
 
   public Iterator keys(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     return _table.keySet().iterator();

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/MutableBoundValue.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/MutableBoundValue.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/MutableBoundValue.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/MutableBoundValue.java Wed Jul 26 23:44:58 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.trinidadinternal.ui.data;
 
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 
 /**
  * @version $Name:  $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/ui/data/MutableBoundValue.java#0 $) $Date: 10-nov-2005.18:56:34 $
@@ -29,6 +29,6 @@
    * @param value the new value for this BoundValue
    */
   public void setValue(
-    RenderingContext  context,
+    UIXRenderingContext  context,
     Object            value);
 }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/MutableDataObject.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/MutableDataObject.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/MutableDataObject.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/MutableDataObject.java Wed Jul 26 23:44:58 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.trinidadinternal.ui.data;
 
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 
 /**
  * The MutableDataObject interface provides an extremely simple API for
@@ -37,7 +37,7 @@
    * @param select a select criterion, syntax as defined by the data object
    * @param value  the new value associated with this select criterion
    */
-  public void updateValue(RenderingContext context, 
+  public void updateValue(UIXRenderingContext context, 
                           Object select, 
                           Object value);
 }



Mime
View raw message