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 [7/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/laf/base/xhtml/GlobalButtonBarRenderer.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/laf/base/xhtml/GlobalButtonBarRenderer.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/laf/base/xhtml/GlobalButtonBarRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/GlobalButtonBarRenderer.java Wed Jul 26 23:44:58 2006
@@ -21,7 +21,7 @@
 import org.apache.myfaces.trinidad.component.UIXNavigationLevel;
 
 import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
-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.beans.MarlinBean;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.NodeRoleUtils;
@@ -33,7 +33,7 @@
 public class GlobalButtonBarRenderer extends RowLayoutRenderer
 {
   protected void prerender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -45,7 +45,7 @@
 
 
   protected UIXHierarchy getHierarchyBase(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
   )
   {
@@ -54,7 +54,7 @@
 
 
   protected UINode getStamp(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -63,7 +63,7 @@
 
 
   protected boolean setNewPath(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     UIXHierarchy    component
   )
@@ -74,7 +74,7 @@
   }
 
   protected void renderContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -130,7 +130,7 @@
   }
 
   protected boolean isRendered(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           stamp
   )
   {
@@ -138,7 +138,7 @@
   }
 
  protected void renderStamp(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     boolean          selected
     )throws IOException
@@ -157,7 +157,7 @@
   }
 
   protected void postrender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -167,7 +167,7 @@
   }
 
   protected void renderBetweenIndexedChildren(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -175,7 +175,7 @@
   }
 
   protected void renderBetweenNodes(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -183,7 +183,7 @@
   }
 
   protected void renderDefaultCellAttributes(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           child) throws IOException
   {
     String valign;
@@ -202,7 +202,7 @@
    * Renders attributes of the current node.
    */
   protected void renderAttributes(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -230,7 +230,7 @@
    * @return true if the ancestor node is a table
    * (tableLayout or messageComponentLayout)
    */
-  protected boolean hasTableParent(RenderingContext context)
+  protected boolean hasTableParent(UIXRenderingContext context)
   {
     UINode ancestor = NodeRoleUtils.getStructuralAncestor(context);
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/HeaderRenderer.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/laf/base/xhtml/HeaderRenderer.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/laf/base/xhtml/HeaderRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/HeaderRenderer.java Wed Jul 26 23:44:58 2006
@@ -19,7 +19,7 @@
 
 
 
-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.renderkit.core.xhtml.PanelHeaderRenderer;
@@ -35,7 +35,7 @@
   * Sets the size of the header,
   */
   protected static void setPrevHeaderSize(
-    RenderingContext context
+    UIXRenderingContext context
     ) throws IOException
   {
 
@@ -44,7 +44,7 @@
 
   }
   protected static Number getContextHeaderSize(
-    RenderingContext context,
+    UIXRenderingContext context,
     Number           defaultValue
     )throws IOException
   {
@@ -57,7 +57,7 @@
    * Set the size of the header stored on the context
    */
   protected static void setContextHeaderSize(
-    RenderingContext context,
+    UIXRenderingContext context,
     Number           size
     )throws IOException
   {
@@ -72,7 +72,7 @@
   * resets header size to value saved as local property
   */
   protected static void resetHeaderSize(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     setRenderingProperty( context,
@@ -88,7 +88,7 @@
    * Returns the current depth of the nesting.
    */
   protected static int getHeaderNestLevel(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     return ((Number)getRenderingProperty(context,
@@ -98,7 +98,7 @@
 
 
   protected static void incrementHeaderNestLevel(
-    RenderingContext context
+    UIXRenderingContext context
     )throws IOException
   {
     setRenderingProperty( context,
@@ -107,7 +107,7 @@
   }
 
   protected static void decrementHeaderNestLevel(
-    RenderingContext context
+    UIXRenderingContext context
     )throws IOException
   {
     int headerNestLevel = getHeaderNestLevel(context);
@@ -125,7 +125,7 @@
   * Returns text of header
   */
   protected Object getText(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     String           messageType
     )
@@ -161,7 +161,7 @@
   * Returns the uri for icon.
   */
   protected Object getIconURI(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     String           messageType
     )

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/HiddenLabelUtils.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/laf/base/xhtml/HiddenLabelUtils.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/laf/base/xhtml/HiddenLabelUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/HiddenLabelUtils.java Wed Jul 26 23:44:58 2006
@@ -24,7 +24,7 @@
 import org.apache.myfaces.trinidadinternal.share.config.Configuration;
 import org.apache.myfaces.trinidadinternal.share.config.AccessibilityMode;
 
-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.laf.base.BaseLafRenderer;
@@ -42,7 +42,7 @@
    * Identifies whether the current agent supports the hidden label
    * trick.
    */
-  static public boolean supportsHiddenLabels(RenderingContext context)
+  static public boolean supportsHiddenLabels(UIXRenderingContext context)
   {
     if (!BaseLafRenderer.supportsID(context))
       return false;
@@ -86,7 +86,7 @@
    * @param component 
    */
   static public void outputHiddenLabel(
-    RenderingContext context,
+    UIXRenderingContext context,
     String           id,
     Object           text, 
     UIComponent component
@@ -119,7 +119,7 @@
    * a <label> tag, since the values are needed for validation.
    */
   static public void rememberLabel(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object           id)
   {
     if (id != null)

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/HtmlRenderer.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/laf/base/xhtml/HtmlRenderer.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/laf/base/xhtml/HtmlRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/HtmlRenderer.java Wed Jul 26 23:44:58 2006
@@ -26,7 +26,7 @@
 
 import org.apache.myfaces.trinidadinternal.ui.ElementRenderer;
 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.RoledRenderer;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
@@ -45,14 +45,14 @@
   implements RoledRenderer, PreAndPostRenderer
 {
   public NodeRole getNodeRole(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node)
   {
     return XhtmlLafConstants.DOCUMENT_ROLE;
   }
 
   public void prerender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node) throws IOException
   {
     // write the correct doctype - this has to be in render(),
@@ -82,7 +82,7 @@
   }
 
   public void postrender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node) throws IOException
   {
     super.postrender(context, node);
@@ -92,7 +92,7 @@
    * Subclasses should override to return their doctype
    */
   protected String getDocType(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -120,7 +120,7 @@
    * opposed to a document.
    */
   protected String getFrameSetDocType(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     if (isXMLDocument(context))
@@ -139,7 +139,7 @@
    * to a frameset.
    */
   protected String getDocumentDocType(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     // default to transitional, rather than strict
@@ -160,7 +160,7 @@
 
 
   protected String getElementName(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -172,7 +172,7 @@
    * for determining which doctype to return
    */
   private boolean _hasFrameSet(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -196,7 +196,7 @@
   }
 
   protected void renderAttributes(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -237,7 +237,7 @@
    * Returns the name of the language attribute
    */
   protected String getLangAttrName(
-    RenderingContext context)
+    UIXRenderingContext context)
   {
     return "xml:lang";
   }
@@ -255,7 +255,7 @@
    * Returns true if we are rendering an XML document
    */
   protected boolean isXMLDocument(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     String contentType = null;

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/IconArrayLafIconProvider.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/laf/base/xhtml/IconArrayLafIconProvider.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/laf/base/xhtml/IconArrayLafIconProvider.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/IconArrayLafIconProvider.java Wed Jul 26 23:44:58 2006
@@ -23,7 +23,7 @@
 import org.apache.myfaces.trinidadinternal.image.ImageProviderRequest;
 
 import org.apache.myfaces.trinidadinternal.share.io.NameResolver;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 
 /**
  * Abstracts out the retrieval of ImageProviderResponses for
@@ -139,7 +139,7 @@
    * Returns the URI to the icon indentified by the icon key
    */
   public String getIconURI(
-    RenderingContext context,
+    UIXRenderingContext context,
     IconKey          iconKey
     )
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/IconKeyRenderer.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/laf/base/xhtml/IconKeyRenderer.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/laf/base/xhtml/IconKeyRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/IconKeyRenderer.java Wed Jul 26 23:44:58 2006
@@ -19,7 +19,7 @@
 
 import javax.faces.context.ResponseWriter;
 
-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.skin.icon.Icon;
@@ -33,7 +33,7 @@
  */
 public class IconKeyRenderer extends XhtmlLafRenderer
 {
-  protected void renderContent(RenderingContext context, UINode node)
+  protected void renderContent(UIXRenderingContext context, UINode node)
     throws IOException
   {
     Object name = node.getAttributeValue(context, NAME_ATTR);
@@ -53,7 +53,7 @@
   }
 
   protected String getElementName(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -61,7 +61,7 @@
   }
 
   protected Object getStyleClass(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node)
   {
     return XhtmlLafConstants.TIP_TEXT_STYLE_CLASS;

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/IconRenderer.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/laf/base/xhtml/IconRenderer.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/laf/base/xhtml/IconRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/IconRenderer.java Wed Jul 26 23:44:58 2006
@@ -25,7 +25,7 @@
 import org.apache.myfaces.trinidadinternal.share.xml.NamespaceURI;
 
 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;
 
@@ -44,7 +44,7 @@
    * Render the icon
    */
   public void render(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -106,7 +106,7 @@
    *             the node.
    */
   private Map _getNodeAttributeMap(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node)
   {
     Map attrs = null;

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ImageRenderer.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/laf/base/xhtml/ImageRenderer.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/laf/base/xhtml/ImageRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ImageRenderer.java Wed Jul 26 23:44:58 2006
@@ -19,7 +19,7 @@
 
 import javax.faces.context.ResponseWriter;
 
-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.action.ClientActionUtils;
@@ -35,7 +35,7 @@
 public class ImageRenderer extends XhtmlLafRenderer
 {
   protected void renderID(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -43,7 +43,7 @@
   }
 
   protected Object getSource(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -52,7 +52,7 @@
 
 
   protected Object getLongDesc(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -61,7 +61,7 @@
 
 
   protected Object getText(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -73,7 +73,7 @@
    * Returns the destination to use for the ImageRenderer.
    */
   protected Object getDestination(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -98,7 +98,7 @@
   }
 
   protected Object getOnClick(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -135,7 +135,7 @@
   }
 
   protected Object getOnFocus(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -144,7 +144,7 @@
 
 
   protected Object getDestinationAttr(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -152,7 +152,7 @@
   }
 
   protected void prerender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -160,7 +160,7 @@
   }
 
   protected final void postrender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode node
     ) throws IOException
   {
@@ -171,7 +171,7 @@
    * Called to render the attributes of the <img> tag
    */
   protected void renderImageAttributes(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -188,7 +188,7 @@
   }
 
   protected void renderHAlign(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -217,7 +217,7 @@
    * we render shortDesc as alt text on image. Do not render it as title
    * on the link.
    */
-  protected void renderShortDesc(RenderingContext context,
+  protected void renderShortDesc(UIXRenderingContext context,
                                  UINode node)
   {
   }
@@ -229,7 +229,7 @@
    * can be a little expensive for subclasses like ButtonRenderer.
    */
   protected final void renderContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -329,7 +329,7 @@
   * otherwise don't render any image map attribute
   */
   private void _renderImageMap(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -346,7 +346,7 @@
 
   // Get the source attribute from a local property
   private Object _getLocalSource(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ImportScriptRenderer.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/laf/base/xhtml/ImportScriptRenderer.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/laf/base/xhtml/ImportScriptRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ImportScriptRenderer.java Wed Jul 26 23:44:58 2006
@@ -19,7 +19,7 @@
 
 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.RoledRenderer;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
@@ -34,14 +34,14 @@
 
 {
   public NodeRole getNodeRole(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node)
   {
     return USER_INVISIBLE_ROLE;
   }
 
   protected void renderContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -59,7 +59,7 @@
   }
 
   private void _importScript(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object           name) throws IOException
   {
     XhtmlLafUtils.addLib(context, name);

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkDataObject.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/laf/base/xhtml/LinkDataObject.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/laf/base/xhtml/LinkDataObject.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkDataObject.java Wed Jul 26 23:44:58 2006
@@ -19,7 +19,7 @@
 
 import org.apache.myfaces.trinidad.component.UIXHierarchy;
 import org.apache.myfaces.trinidad.component.core.nav.CoreCommandNavigationItem;
-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.data.DataObject;
@@ -40,7 +40,7 @@
 
 
   static public DataObjectList getLinkDataList(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           parent) throws IOException
   {
     int childCount = parent.getIndexedChildCount(context);
@@ -90,7 +90,7 @@
 
 
  static public DataObjectList getLinkDataList(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           parent,
     UIXHierarchy    component,
     UINode           stamp,
@@ -241,7 +241,7 @@
     _isSelected = (isSelected) ? Boolean.TRUE : Boolean.FALSE;
   }
 
-  public Object selectValue(RenderingContext rc, Object key)
+  public Object selectValue(UIXRenderingContext rc, Object key)
   {
     // this is only called by our renderers, so identity is okay here:
     if (UIConstants.TEXT_ATTR==key)         return _text;
@@ -278,7 +278,7 @@
    * @param isUsed if true, then LinkRenderers will not render. set to false
    * to clear state
    */
-  static void __setDataObjectUsedMode(RenderingContext context,
+  static void __setDataObjectUsedMode(UIXRenderingContext context,
                                              boolean used)
   {
     BaseLafUtils.setRenderingProperty(context,
@@ -289,7 +289,7 @@
   /**
    * called by LinkRenderer
    */
-  static boolean __isDataObjectUsedMode(RenderingContext context)
+  static boolean __isDataObjectUsedMode(UIXRenderingContext context)
   {
     return
       BaseLafUtils.getRenderingProperty(context, _KEY) != null;
@@ -298,7 +298,7 @@
   /**
    * called by LinkRenderer
    */
-  static void __setDataObject(RenderingContext context,
+  static void __setDataObject(UIXRenderingContext context,
                               LinkDataObject dobj)
   {
     ListDataObjectList dol = (ListDataObjectList)
@@ -309,7 +309,7 @@
   /**
    * called by LinkRenderer
    */
-  static Integer __getCurrentIndex(RenderingContext context)
+  static Integer __getCurrentIndex(UIXRenderingContext context)
   {
     Object currentIndex =
       BaseLafUtils.getRenderingProperty(context, _CURRENT_INDEX_KEY, null);
@@ -321,14 +321,14 @@
   }
 
   static void __setDOL(
-    RenderingContext context,
+    UIXRenderingContext context,
     DataObjectList   list)
   {
     BaseLafUtils.setRenderingProperty(context, _DATA_OBJECT_LIST_KEY, list);
   }
 
   static void __setCurrentIndex(
-    RenderingContext context,
+    UIXRenderingContext context,
     Integer          currIndex)
   {
     BaseLafUtils.setRenderingProperty(context, _CURRENT_INDEX_KEY, currIndex);

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkRenderer.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/laf/base/xhtml/LinkRenderer.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/laf/base/xhtml/LinkRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkRenderer.java Wed Jul 26 23:44:58 2006
@@ -23,7 +23,7 @@
 import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.CoreAdfRenderingContext;
 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.UINode;
 import org.apache.myfaces.trinidadinternal.ui.action.ClientAction;
 import org.apache.myfaces.trinidadinternal.ui.action.ClientActionUtils;
@@ -37,7 +37,7 @@
 public class LinkRenderer extends XhtmlLafRenderer
 {
 
-  public void render(RenderingContext context,
+  public void render(UIXRenderingContext context,
                      UINode node) throws IOException
   {
 
@@ -52,7 +52,7 @@
   }
 
   private String _addParams(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     ClientAction     action,
     String           dest
@@ -71,7 +71,7 @@
   }
 
   protected void renderAttributes(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -116,11 +116,11 @@
   }
 
   /**
-   * @see #setDisabled(RenderingContext,boolean)
+   * @see #setDisabled(UIXRenderingContext,boolean)
    * @todo gcrawford - for now readonly maps to disabled
    */
   protected boolean isDisabled(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -145,15 +145,15 @@
    * true, or you can call this method.
    * @param isDisabled if true, disables all subsequent links, regardless
    * of their disabled attributes.
-   * @see #isDisabled(RenderingContext,UINode)
+   * @see #isDisabled(UIXRenderingContext,UINode)
    */
-  public static void setDisabled(RenderingContext context, boolean isDisabled)
+  public static void setDisabled(UIXRenderingContext context, boolean isDisabled)
   {
     AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
     ((CoreAdfRenderingContext) arc).setLinkDisabled(isDisabled);
   }
 
-  public static void setSaveModelDisabled(RenderingContext context, boolean isDisabled)
+  public static void setSaveModelDisabled(UIXRenderingContext context, boolean isDisabled)
   {
     /* =-=AEW Save model not available in ADF Faces
     if (BodyRenderer.__isSaveModelActive(context))
@@ -165,7 +165,7 @@
   }
 
 
-  protected boolean isSaveModelDisabled(RenderingContext context)
+  protected boolean isSaveModelDisabled(UIXRenderingContext context)
   {
     return getRenderingProperty(context, _SAVE_MODEL_DISABLED_KEY) != null;
   }
@@ -174,7 +174,7 @@
    * Renders the destination of the link
    */
   protected void renderDestination(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     String           destination
     ) throws IOException
@@ -207,7 +207,7 @@
    * Renders event handlers for the node.
    */
   protected void renderEventHandlers(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -222,7 +222,7 @@
   }
 
   protected void renderID(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -249,7 +249,7 @@
    * link subclasses
    */
   protected boolean makeNameAndIDSame(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     return true;
@@ -260,7 +260,7 @@
    * Override to return the id and then anme, in that order
    */
   protected Object getID(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -279,7 +279,7 @@
    * Returns the destination to use for the ImageRenderer.
    */
   protected String getDestination(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -311,7 +311,7 @@
   }
 
   protected final String getDestinationAttr(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -324,7 +324,7 @@
    * Returns the destination to use for the ImageRenderer.
    */
   protected Object getText(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -332,7 +332,7 @@
   }
 
   protected Object getTargetFrame(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -344,7 +344,7 @@
    * Returns the StyleClass to use to render this node.
    */
   protected Object getStyleClass(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -376,7 +376,7 @@
    * @param node the current UINode
    */
   protected void prerender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -429,7 +429,7 @@
    * @param node the current UINode
    */
   protected void postrender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -450,7 +450,7 @@
 
 
   protected void renderContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -480,7 +480,7 @@
   }
 
   protected boolean doRenderStyleAttrs(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -491,7 +491,7 @@
 
 
   protected String getElementName(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -509,7 +509,7 @@
   }
 
   protected Object getOnClick(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -578,7 +578,7 @@
   // Checks for partial targets provided by an ancestor link container
   // and returns a script which updates the partial targets.
   protected String getPartialChangeScript(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -612,7 +612,7 @@
 
   // Returns any partial targets provided by ancestor link containers.
   protected static String getAncestorPartialTargets(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     // First check to see if we've got a local copy
@@ -635,7 +635,7 @@
    * Returns true if we should use an anchor to represent this link.
    */
   private boolean _isAnchor(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -661,7 +661,7 @@
    * destination, or node name. We render nothing.
    */
   protected boolean isEmpty(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -683,7 +683,7 @@
     return ((text == null) && (childCount <= 0) && (id == null));
   }
 
-  private void _buildDataObject(RenderingContext context,
+  private void _buildDataObject(UIXRenderingContext context,
                                 UINode link) throws IOException
   {
     Object id = getID(context, link);
@@ -720,7 +720,7 @@
    * @throws IOException
    */
   private void _renderAccessibleStatus(
-    RenderingContext context
+    UIXRenderingContext context
     ) throws IOException
   {
     // Do not attempt to render this label if the underlying

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkUtils.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/laf/base/xhtml/LinkUtils.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/laf/base/xhtml/LinkUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkUtils.java Wed Jul 26 23:44:58 2006
@@ -20,7 +20,7 @@
 import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.CoreAdfRenderingContext;
 
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
 
@@ -60,12 +60,12 @@
    * 4. Then reset the selection status to the initial status calling
    *    setSelected(RenderingContext,initial-status)
    * </pre>
-   * @see #setSelected(RenderingContext,boolean)
+   * @see #setSelected(UIXRenderingContext,boolean)
    * @param context The rendering context
    * @return true if selected else false
    */
   public static boolean isSelected(
-    RenderingContext context
+    UIXRenderingContext context
   )
   {
     return Boolean.TRUE.equals(
@@ -79,10 +79,10 @@
    * initial status and reset it back to that initial status.
    * @param context The rendering context
    * @param selected selected status of the link.
-   * @see #isSelected(RenderingContext)
+   * @see #isSelected(UIXRenderingContext)
    */
   public static void setSelected(
-    RenderingContext context,
+    UIXRenderingContext context,
     boolean          selected
   )
   {
@@ -101,7 +101,7 @@
    * Important: Each call to startDefaultStyleClassDisabled()
    * must be followed by a matching call to endDefaultStyleClassDisabled().
    */
-  public static void startDefaultStyleClassDisabled(RenderingContext context)
+  public static void startDefaultStyleClassDisabled(UIXRenderingContext context)
   {   
     AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
     ((CoreAdfRenderingContext) arc).setDefaultLinkStyleDisabled(true);
@@ -111,7 +111,7 @@
    * Called by link containers that have called
    * startDefaultStyleClassDisabled().
    */
-  public static void endDefaultStyleClassDisabled(RenderingContext context)
+  public static void endDefaultStyleClassDisabled(UIXRenderingContext context)
   {
     AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
     ((CoreAdfRenderingContext) arc).setDefaultLinkStyleDisabled(false);
@@ -121,7 +121,7 @@
    * Called by base.desktop.LinkRenderer to detect whether default
    * style class rendering is currently disabled.
    */
-  public static boolean isDefaultStyleClassDisabled(RenderingContext context)
+  public static boolean isDefaultStyleClassDisabled(UIXRenderingContext context)
   {
     AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
     return ((CoreAdfRenderingContext) arc).isDefaultLinkStyleDisabled();

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ListRenderer.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/laf/base/xhtml/ListRenderer.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/laf/base/xhtml/ListRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ListRenderer.java Wed Jul 26 23:44:58 2006
@@ -29,7 +29,7 @@
 
 import org.apache.myfaces.trinidadinternal.renderkit.uix.SelectItemSupport;
 
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 
 /**
@@ -39,7 +39,7 @@
 public class ListRenderer extends FormSelectRenderer
 {
   protected void renderAttributes(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -93,7 +93,7 @@
   }
 
   protected void prerender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node) throws IOException
   {
     // If we've got a ClientAction, let it write its dependencies
@@ -107,7 +107,7 @@
   }
 
   protected void renderContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -146,7 +146,7 @@
   }  
 
   protected Boolean isMultipleSelection(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node)
   {
     // list can be multiple selection
@@ -161,7 +161,7 @@
    * @param node the current UINode
    */
   protected void renderBetweenIndexedChildren(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -176,7 +176,7 @@
   }
 
   protected Object getOnChange(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -200,7 +200,7 @@
 
 
   protected boolean wasOptionSelected(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/MediaRenderer.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/laf/base/xhtml/MediaRenderer.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/laf/base/xhtml/MediaRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/MediaRenderer.java Wed Jul 26 23:44:58 2006
@@ -28,7 +28,7 @@
 
 import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
 
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 
 
@@ -44,7 +44,7 @@
    * Returns an URL to the media to display
    */
   protected Object getSource(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -55,7 +55,7 @@
    * Returns the expected content type of the media to display
    */
   protected Object getContentType(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -67,7 +67,7 @@
    * Returns true if the media should start playing as soon as it is loaded.
    */
   protected Object getAutostart(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -78,7 +78,7 @@
    * Returns the number of times that the media should play
    */
   protected Number getPlayCount(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -89,7 +89,7 @@
    * Returns an enumeration determining the set of controls to render
    */
   protected Object getControls(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -111,7 +111,7 @@
    *         do all of the work in render() could be revisited.
    */
   public void render(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -398,7 +398,7 @@
    * specified.
    */
   protected Number getDefaultInnerWidth(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     String           primaryContentType
     )
@@ -412,7 +412,7 @@
    * specified.
    */
   protected Number getDefaultInnerHeight(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     String           primaryContentType
     )
@@ -426,7 +426,7 @@
    * <object> tag to embed the viewer
    */
   protected boolean useEmbed(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     AdfFacesAgent agent = context.getAgent();
@@ -512,7 +512,7 @@
    * Renders a name value pair as a <param> element
    */
   private void _renderParamAttribute(
-    RenderingContext context,
+    UIXRenderingContext context,
     String           paramName,
     Object           paramValue,
     boolean          isURL
@@ -545,7 +545,7 @@
    * =-= bts Do we care about AccessibilityMode?
    */
   private MediaRenderer.PlayerData _getPlayerData(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     String           mimeType,
     String           primaryMimeType
@@ -714,7 +714,7 @@
    * Returns the most likely MIME type for the content
    */
   private String _getMimeType(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -788,7 +788,7 @@
    * Returns the lowercase extension of any source URL
    */
   private String _getSourceExtension(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -867,7 +867,7 @@
 
   // get the height of the image window
   private Object _getInnerHeight(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     boolean          canAutosize,
     String           primaryContentType,
@@ -922,7 +922,7 @@
   // determine the height without checking the min height
   //
   private Object _getHeightNoMin(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     boolean          canAutosize,
     String           primaryContentType,
@@ -971,7 +971,7 @@
   // determine the height including the controls
   //
   private Object _getHeight(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     boolean          canAutosize,
     String           primaryContentType,
@@ -1049,7 +1049,7 @@
   }
 
   private void _render(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     Object           contentType,
     Object           id,

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.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/laf/base/xhtml/NavigationBarRenderer.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/laf/base/xhtml/NavigationBarRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java Wed Jul 26 23:44:58 2006
@@ -31,7 +31,7 @@
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
 import org.apache.myfaces.trinidadinternal.ui.AttributeKey;
 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.TextNode;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 import org.apache.myfaces.trinidadinternal.ui.beans.MarlinBean;
@@ -54,7 +54,7 @@
 {
 
   protected MutableUINode createSingleItemURLButton(
-    RenderingContext context,
+    UIXRenderingContext context,
     boolean          isBack,
     Object           buttonText,
     Object           buttonAccessKey,
@@ -72,7 +72,7 @@
 
 
   protected MutableUINode createSingleItemSubmitButton(
-    RenderingContext context,
+    UIXRenderingContext context,
     boolean          isBack,
     Object           buttonText,
     Object           buttonAccessKey,
@@ -95,7 +95,7 @@
   //         decide how to create anonymous children for UINodes that
   //         can persist across renderings.
   protected void prerender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node) throws IOException
   {
     URLEncoder encoder = context.getURLEncoder();
@@ -147,7 +147,7 @@
   }
 
   protected void postrender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -156,7 +156,7 @@
 
 
   protected void renderContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -170,7 +170,7 @@
 
   // render a single-step navigator
   private void _renderSingleItemNavigator(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           navBar,
     String           eventKey,
     String           sourceKey,
@@ -615,7 +615,7 @@
 
 
   private String _getChoiceOnChangeFormSubmitted(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     String           form,
     String           eventKey,
@@ -673,7 +673,7 @@
 
   // render a multi-item navigator
   private void _renderMultiItemNavigator(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode navBar,
     int    blockSize,
     String eventKey,
@@ -1131,7 +1131,7 @@
    * Returns the destination, defaulting if none is provided
    */
   private static String _getDestinationString(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -1159,7 +1159,7 @@
    * Returns the name of the String, defaulting if none is provided
    */
   private String _getNameString(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -1181,7 +1181,7 @@
   // Note: This public method is called by TrainRenderer.java. The train
   // uses the javascript submission code rendered here to do validation
   public static void renderHiddenFields(
-    RenderingContext context,
+    UIXRenderingContext context,
     String           formName,
     boolean          isMulti,
     String           eventKey,
@@ -1250,7 +1250,7 @@
 
   // create the anonymous node displayed between the links
   private UINode _createRangeNode(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode navBar,
     String destination,
     String name,
@@ -1416,7 +1416,7 @@
    * submit
    */
   protected boolean requiresForm(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     return true;
@@ -1427,7 +1427,7 @@
    * create each of the choice options and add them onto the choiceBean.
    * @return the number of options added
    */
-  private int _addNavigationOptions(RenderingContext context,
+  private int _addNavigationOptions(UIXRenderingContext context,
                                     UINode navBar,
                                     MarlinBean choice,
                                     boolean isForm,
@@ -1573,7 +1573,7 @@
   }
 
   private UINode _createShowAllOption(
-    RenderingContext context,
+    UIXRenderingContext context,
     long             maxValue,
     boolean          atShowAll)
   {
@@ -1594,7 +1594,7 @@
 
   // create a choice option when max value is known
   private MarlinBean _createNavigationOption(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           navBar,
     boolean          isForm,
     long             blockStart,
@@ -1649,7 +1649,7 @@
    * Returns true if disabled navigation items should be shown
    */
   protected boolean disabledNavigationShown(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     return true;
@@ -1661,7 +1661,7 @@
    * multi item submit navbar
    */
   private String _getMultiSubmitButtonText(
-    RenderingContext context,
+    UIXRenderingContext context,
     boolean          isBack,
     int              size
     )
@@ -1700,7 +1700,7 @@
    * Creates the submit button bean
    */
   public static UINode createSubmitButton(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object           buttonText,
     Object           buttonAccessKey,
     String           buttonID,
@@ -1737,7 +1737,7 @@
 
   // create one of the text links for navigation
   private UINode _createTextLink(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           navBar,
     boolean          isBack,
     String           destination,
@@ -1781,7 +1781,7 @@
   }
 
   protected String getIconURI(
-    RenderingContext context,
+    UIXRenderingContext context,
     boolean          isBack,
     boolean          isEnabled
   )
@@ -1824,7 +1824,7 @@
 
   // create the arrow image used in multi-item navigation
   private UINode _createArrowImage(
-    RenderingContext context,
+    UIXRenderingContext context,
     boolean          isBack,
     String           destination,
     String           onClick
@@ -1886,7 +1886,7 @@
    * in a table navigation bar.
    */
   protected String getBlockString(
-    RenderingContext context,
+    UIXRenderingContext context,
     boolean          isBack,
     int              numRecords
     )
@@ -1918,7 +1918,7 @@
 
   // get the string for the current range
   private String _getRangeString(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode node,
     long   start,
     int    visibleItemCount,
@@ -2033,7 +2033,7 @@
   // Note: UINode is not guaranteed to be a navBar node.
   // e.g., it could be a train node.
   public static String getSingleDestinationURL(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode node,
     String eventKey,
     String sourceKey,
@@ -2055,7 +2055,7 @@
   // Note: UINode is not guaranteed to be a navBar node.
   // e.g., it could be a train node.
   public static String getSingleDestinationSubmit(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode  node,
     String  form,
     String  name,
@@ -2079,7 +2079,7 @@
   // Note: UINode is not guaranteed to be a navBar node.
   // e.g., it could be a train node.
   public static String getSingleDestinationSubmit(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode  node,
     String  form,
     String  eventKey,
@@ -2135,7 +2135,7 @@
   }
 
   private String _getMultiDestinationSubmit(
-    RenderingContext context,
+    UIXRenderingContext context,
     String  form,
     String  eventKey,
     String  sourceKey,
@@ -2361,7 +2361,7 @@
 
   // don't render as a table in certain locations like a page button bar
   private boolean _renderAsTable(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     UINode ancestor = NodeRoleUtils.getStructuralAncestor(context);
@@ -2373,7 +2373,7 @@
   // Utility method which tests whether the nav bar should validate
   // prior to navigating
   private static boolean _doValidate(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           navBar
     )
   {
@@ -2386,7 +2386,7 @@
    * Writes the separator between two elements
    */
   protected void renderItemSpacer(
-    RenderingContext context
+    UIXRenderingContext context
     ) throws IOException
   {
     char[] chars = new char[1];
@@ -2399,7 +2399,7 @@
    * Writes the separator between two elements
    */
   private void _renderSpacerCell(
-    RenderingContext context
+    UIXRenderingContext context
     ) throws IOException
   {
     ResponseWriter writer = context.getResponseWriter();
@@ -2415,7 +2415,7 @@
    * subID.
    */
   private void _renderStartTableCell(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     ResponseWriter   writer,
     boolean          renderAsTable,
@@ -2435,7 +2435,7 @@
 
   // Gets the encoded partial targets for the specified node
   private static String _getPartialTargets(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -2450,7 +2450,7 @@
   }
 
   private String _getIDForFocus(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           navBar
     )
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationPathRenderer.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/laf/base/xhtml/NavigationPathRenderer.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/laf/base/xhtml/NavigationPathRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationPathRenderer.java Wed Jul 26 23:44:58 2006
@@ -33,7 +33,7 @@
 import org.apache.myfaces.trinidadinternal.renderkit.core.CoreAdfRenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils;
 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.UINode;
 import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
 
@@ -46,7 +46,7 @@
 public class NavigationPathRenderer extends XhtmlLafRenderer
 {
   protected String getElementName(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -58,7 +58,7 @@
 
 
   protected void prerender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -101,7 +101,7 @@
   }
 
   protected void postrender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -129,7 +129,7 @@
   }
 
   protected void renderContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -191,7 +191,7 @@
   }
 
   protected void renderStamp(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     UINode           stamp,
     boolean          isLastChild
@@ -282,14 +282,14 @@
   }
   */
   protected boolean renderLastChild(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node)
   {
     return false;
   }
 
   protected Object getStyleClass(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -300,7 +300,7 @@
   // Renders (almost) everything that goes before the link
   //
   private void _renderStartOfLink(
-    RenderingContext context,
+    UIXRenderingContext context,
     boolean      vertical,
     boolean      isLastChild) throws IOException
   {
@@ -323,7 +323,7 @@
   // Renders everything that goes after the link
   //
   private void _renderEndOfLink(
-    RenderingContext context,
+    UIXRenderingContext context,
     boolean      vertical
     ) throws IOException
   {
@@ -343,7 +343,7 @@
    * defaults to horizontal.
    * @return true if the orientation is vertical
    */
-  private static boolean _getOrientation(RenderingContext context,
+  private static boolean _getOrientation(UIXRenderingContext context,
                                          UINode breadCrumbs)
   {
     Object orientation = breadCrumbs.getAttributeValue(context,
@@ -377,7 +377,7 @@
       _separatorIcon = separatorIcon;
     }
 
-    public void render(RenderingContext context, UINode node)
+    public void render(UIXRenderingContext context, UINode node)
       throws IOException
     {
       ResponseWriter writer = context.getResponseWriter();
@@ -427,7 +427,7 @@
         LinkRenderer.setDisabled(context, true);
     }
 
-    private boolean _isLastChild(RenderingContext context)
+    private boolean _isLastChild(UIXRenderingContext context)
     {
       // See if BreadCrumbs has taken responsibility for determining
       // this.  This code's here so that our "BetweenRenderer" strategy

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/OptionContainerRenderer.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/laf/base/xhtml/OptionContainerRenderer.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/laf/base/xhtml/OptionContainerRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/OptionContainerRenderer.java Wed Jul 26 23:44:58 2006
@@ -35,7 +35,7 @@
 import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
 import org.apache.myfaces.trinidadinternal.ui.NodeUtils;
 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.UINode;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.BaseLafUtils;
 import org.apache.myfaces.trinidadinternal.ui.path.Path;
@@ -50,7 +50,7 @@
  */
 abstract public class OptionContainerRenderer extends FormElementRenderer
 {
-  protected void renderAsNonElement(RenderingContext context, UINode node)
+  protected void renderAsNonElement(UIXRenderingContext context, UINode node)
     throws IOException
   {
     pushRenderingProperty(context, _OPTION_INFO_PROPERTY,
@@ -62,7 +62,7 @@
   }
 
   protected void prerender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -89,7 +89,7 @@
   }
 
   protected void postrender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -101,7 +101,7 @@
    * Renders event handlers for the node.
    */
   protected void renderEventHandlers(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -112,7 +112,7 @@
 
 
   abstract protected Boolean isMultipleSelection(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node);
 
 
@@ -121,7 +121,7 @@
    * RadioSetRenderer, which does not have an onChange handler.
    */
   protected Object getOnChange(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node) throws IOException
   {
     return node.getAttributeValue(context, ON_CHANGE_ATTR);
@@ -130,7 +130,7 @@
   /**
    * Returns the value associated with the selected value attribute
    */
-  protected String getSelectedValue(RenderingContext context, UINode node)
+  protected String getSelectedValue(UIXRenderingContext context, UINode node)
   {
     return BaseLafUtils.getLocalTextAttribute(context, node,
                                                        SELECTED_VALUE_ATTR);
@@ -139,13 +139,13 @@
   /**
    * Returns the value associated with the selected index attribute
    */
-  protected Integer getSelectedIndex(RenderingContext context, UINode node)
+  protected Integer getSelectedIndex(UIXRenderingContext context, UINode node)
   {
     return (Integer) BaseLafUtils.getLocalAttribute(context, node,
                                                     SELECTED_INDEX_ATTR);
   }
 
-  protected Selection getSelection(RenderingContext context, UINode node)
+  protected Selection getSelection(UIXRenderingContext context, UINode node)
   {
     return (BaseSelection) BaseLafUtils.getLocalAttribute(context, node,
                                                           SELECTION_ATTR);
@@ -156,7 +156,7 @@
    * populated with information, leveraging populateOptionInfo as needed.
    */
   protected OptionContainerRenderer.OptionInfo createOptionInfo(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node)
   {
     OptionContainerRenderer.OptionInfo info = new OptionContainerRenderer.OptionInfo();
@@ -165,7 +165,7 @@
   }
 
   final protected void populateOptionInfo(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     OptionContainerRenderer.OptionInfo info)
   {
@@ -189,7 +189,7 @@
    * Returns the cached option information.
    */
   protected OptionContainerRenderer.OptionInfo getOptionInfo(
-    RenderingContext context)
+    UIXRenderingContext context)
   {
     return (OptionInfo) getRenderingProperty(context,
                                              _OPTION_INFO_PROPERTY);
@@ -199,10 +199,10 @@
    * Subclasses should implement this method to return the specifc
    * option renderer to use.
    */
-  abstract protected Renderer getOptionRenderer(RenderingContext context);
+  abstract protected Renderer getOptionRenderer(UIXRenderingContext context);
 
   protected void renderSelectItemOptions(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     UIComponent      component,
     List             items) throws IOException
@@ -313,7 +313,7 @@
    * @return false if nothing was rendered, true otherwise
    */
   protected boolean renderSelectItem(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     UIComponent      component,
     SelectItem       item,
@@ -373,13 +373,13 @@
   }
 
   static UIComponent __getUIComponent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node)
   {
     UIComponent component = node.getUIComponent();
     if (component == null)
     {
-      RenderingContext parentContext = context.getParentContext();
+      UIXRenderingContext parentContext = context.getParentContext();
       if (parentContext != null)
       {
         UINode parentNode = parentContext.getAncestorNode(0);
@@ -437,14 +437,14 @@
   protected static class OptionRenderer extends XhtmlLafRenderer
   {
     protected OptionContainerRenderer.OptionInfo getOptionInfo(
-      RenderingContext context)
+      UIXRenderingContext context)
     {
       return (OptionInfo) getRenderingProperty(context,
                                                _OPTION_INFO_PROPERTY);
     }
 
     protected void renderAttributes(
-      RenderingContext context,
+      UIXRenderingContext context,
       UINode           node
       ) throws IOException
     {
@@ -468,7 +468,7 @@
     }
     
     protected void renderValue(
-      RenderingContext context,
+      UIXRenderingContext context,
       UINode           node,
       Object           value
     )throws IOException
@@ -481,7 +481,7 @@
      * @param node
      * @throws IOException
      */
-    private void _renderDisabledAttribute(RenderingContext context, UINode node)
+    private void _renderDisabledAttribute(UIXRenderingContext context, UINode node)
         throws IOException
     {
       boolean isReadOnly = BaseLafUtils.getLocalBooleanAttribute(context, 
@@ -500,14 +500,14 @@
     }
     
     protected void renderSelectedAttribute(
-      RenderingContext context,
+      UIXRenderingContext context,
       UINode           node
       ) throws IOException
     {
     }
 
     protected boolean renderAsElement(
-      RenderingContext context,
+      UIXRenderingContext context,
       UINode           node
       )
     {
@@ -530,7 +530,7 @@
     }
 
     protected Object getNodeName(
-      RenderingContext context,
+      UIXRenderingContext context,
       UINode           node
       )
     {
@@ -539,7 +539,7 @@
     }
 
     protected Object getTransformedName(
-      RenderingContext context,
+      UIXRenderingContext context,
       UINode           node
       )
     {
@@ -548,7 +548,7 @@
     }
 
     protected Boolean isMultipleSelection(
-      RenderingContext context,
+      UIXRenderingContext context,
       UINode           node)
     {
       OptionContainerRenderer.OptionInfo info = getOptionInfo(context);
@@ -556,7 +556,7 @@
     }
 
     protected Boolean getDisabled(
-      RenderingContext context,
+      UIXRenderingContext context,
       UINode           node
       )
     {
@@ -565,7 +565,7 @@
     }
 
     protected Boolean getReadOnly(
-      RenderingContext context,
+      UIXRenderingContext context,
       UINode           node
       )
     {
@@ -574,7 +574,7 @@
     }
 
     protected Object getStyleClass(
-      RenderingContext context,
+      UIXRenderingContext context,
       UINode           node
       )
     {
@@ -586,7 +586,7 @@
      * Returns the value associated with the text attribute
      */
     protected Object getText(
-      RenderingContext context,
+      UIXRenderingContext context,
       UINode  node)
     {
       return BaseLafUtils.getLocalTextAttribute(context, node, TEXT_ATTR);
@@ -596,7 +596,7 @@
      * Returns the value associated with the value attribute
      */
     protected Object getValue(
-      RenderingContext context,
+      UIXRenderingContext context,
       UINode  node)
     {
       return BaseLafUtils.getLocalTextAttribute(context, node, VALUE_ATTR);
@@ -606,7 +606,7 @@
      * Returns the value associated with the selected attribute
      */
     protected Boolean getSelected(
-      RenderingContext context,
+      UIXRenderingContext context,
       UINode  node)
     {
       return (Boolean)
@@ -617,7 +617,7 @@
      * Returns the value associated with the option value attribute
      */
     protected Object getOptionValue(
-      RenderingContext context,
+      UIXRenderingContext context,
       UINode  node)
     {
       Object value = getValue(context, node);
@@ -629,7 +629,7 @@
     }
 
     protected Selection getSelection(
-      RenderingContext context,
+      UIXRenderingContext context,
       UINode           node
       )
     {
@@ -638,7 +638,7 @@
     }
 
     protected Number getSelectedIndex(
-      RenderingContext context,
+      UIXRenderingContext context,
       UINode           node
       )
     {
@@ -647,7 +647,7 @@
     }
 
     protected String getSelectedValue(
-      RenderingContext context,
+      UIXRenderingContext context,
       UINode           node
       )
     {
@@ -656,7 +656,7 @@
     }
 
     protected boolean isOptionSelected(
-      RenderingContext context,
+      UIXRenderingContext context,
       UINode           node
       )
     {
@@ -730,7 +730,7 @@
       return optionSelected;
     }
 
-    private int _getChildIndex(RenderingContext context)
+    private int _getChildIndex(UIXRenderingContext context)
     {
       Path path = context.getPath();
       // If the path is empty, this means we're working with composite
@@ -739,7 +739,7 @@
       // is tops in the template/composite widget - but it helps out a lot.
       if (path.getElementCount() == 0)
       {
-        RenderingContext parent = context.getParentContext();
+        UIXRenderingContext parent = context.getParentContext();
         if (parent == null)
           return -1;
         return _getChildIndex(parent);

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/OptionRenderer.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/laf/base/xhtml/OptionRenderer.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/laf/base/xhtml/OptionRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/OptionRenderer.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;
 
 /**
@@ -27,7 +27,7 @@
 public class OptionRenderer extends OptionContainerRenderer.OptionRenderer
 {
   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/laf/base/xhtml/PageButtonBarRenderer.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/laf/base/xhtml/PageButtonBarRenderer.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/laf/base/xhtml/PageButtonBarRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageButtonBarRenderer.java Wed Jul 26 23:44:58 2006
@@ -20,7 +20,7 @@
 
 import org.apache.myfaces.trinidad.component.UIXHierarchy;
 
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 
 /**
@@ -30,7 +30,7 @@
 public class PageButtonBarRenderer extends GlobalButtonBarRenderer
 {
   protected UIXHierarchy getHierarchyBase(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
   )
   {
@@ -38,14 +38,14 @@
   }
 
   protected void renderDefaultCellAttributes(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           child
     )
   {
   }
 
   protected boolean renderCellElement(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           child
     )
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageMenuButtonsRenderer.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/laf/base/xhtml/PageMenuButtonsRenderer.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/laf/base/xhtml/PageMenuButtonsRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageMenuButtonsRenderer.java Wed Jul 26 23:44:58 2006
@@ -19,7 +19,7 @@
 import org.apache.myfaces.trinidad.component.UIXPage;
 import org.apache.myfaces.trinidad.component.core.nav.CoreCommandNavigationItem;
 
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 
 /**
@@ -29,7 +29,7 @@
 public class PageMenuButtonsRenderer extends GlobalButtonBarRenderer
 {
   protected UIXHierarchy getHierarchyBase(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
   )
   {
@@ -38,7 +38,7 @@
   }
 
   protected UINode getStamp(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -47,7 +47,7 @@
   }
 
   protected boolean setNewPath(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     UIXHierarchy      component
   )

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageNavigationPathRenderer.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/laf/base/xhtml/PageNavigationPathRenderer.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/laf/base/xhtml/PageNavigationPathRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageNavigationPathRenderer.java Wed Jul 26 23:44:58 2006
@@ -18,7 +18,7 @@
 import org.apache.myfaces.trinidad.component.UIXHierarchy;
 import org.apache.myfaces.trinidad.component.UIXPage;
 
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 
 /**
@@ -32,7 +32,7 @@
 
 
   protected UIXHierarchy getHierarchyBase(
-    RenderingContext context, 
+    UIXRenderingContext context, 
     UINode           node
   )
   {    
@@ -41,7 +41,7 @@
   }
 
   protected UINode getStamp(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageRenderer.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/laf/base/xhtml/PageRenderer.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/laf/base/xhtml/PageRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageRenderer.java Wed Jul 26 23:44:58 2006
@@ -24,7 +24,7 @@
 import org.apache.myfaces.trinidadinternal.ui.AttributeKey;
 import org.apache.myfaces.trinidadinternal.ui.BaseMutableUINode;
 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.UIConstants;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 import org.apache.myfaces.trinidadinternal.ui.beans.MarlinBean;
@@ -47,7 +47,7 @@
 public class PageRenderer extends UINodeRenderer
 {
   protected UINode getRenderingUINode(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node)
   {
     return _compositeNode;
@@ -55,7 +55,7 @@
 
 
   protected void renderWithNode(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     UINode           renderingUINode
     ) throws IOException
@@ -104,7 +104,7 @@
     // for PPR, an ID is required:
     navigationTree.setAttributeValue(UIConstants.ID_ATTR, new BoundValue()
     {
-      public Object getValue(RenderingContext context)
+      public Object getValue(UIXRenderingContext context)
       {
         UINode pageNode = context.getParentContext().getAncestorNode(0);
         UIComponent component = pageNode.getUIComponent();
@@ -222,7 +222,7 @@
       _isDataATree = isDataATree;
     }
     public Object getValue(
-      RenderingContext context
+      UIXRenderingContext context
     )
     {
       UINode node = (UINode)_componentBV.getValue(context);

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageRendererUtils.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/laf/base/xhtml/PageRendererUtils.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/laf/base/xhtml/PageRendererUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageRendererUtils.java Wed Jul 26 23:44:58 2006
@@ -17,7 +17,7 @@
 
 import org.apache.myfaces.trinidad.component.UIXHierarchy;
 
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
 
 
@@ -29,7 +29,7 @@
 {
   
   public static final Object getFocusPath(
-    RenderingContext context
+    UIXRenderingContext context
   )
   {
     return context.getProperty(UIConstants.MARLIN_NAMESPACE, 
@@ -37,7 +37,7 @@
   }  
   
   static final void setFocusPath(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object             focusPath
   )
   {
@@ -54,7 +54,7 @@
    * @return whether or not a path was set.
    */
   public static final boolean setNewPath(
-    RenderingContext context, 
+    UIXRenderingContext context, 
     UIXHierarchy    component,
     int              startDepth
   )
@@ -68,7 +68,7 @@
    * indexed children).
    */
   public static final boolean isEmpty(
-    RenderingContext context,
+    UIXRenderingContext context,
     UIXHierarchy    component,
     int              startDepth
     )



Mime
View raw message