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 [4/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/RawTextRenderer.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/RawTextRenderer.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/RawTextRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/RawTextRenderer.java Wed Jul 26 23:44:58 2006
@@ -23,7 +23,7 @@
 import org.apache.myfaces.trinidadinternal.ui.BaseRenderer;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 
 /**
  * Renderer for text that shouldn't be escaped.  The renderer
@@ -59,7 +59,7 @@
    * @param node the current UINode
    */
   protected void prerender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -75,7 +75,7 @@
    * @param node the current UINode
    */
   protected void postrender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -88,7 +88,7 @@
    * @param node the current UINode
    */
   protected void renderBetweenIndexedChildren(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -97,7 +97,7 @@
 
 
   private void _renderText(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     AttributeKey     attrKey
     ) throws IOException

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/SkinTranslatedBoundValue.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/SkinTranslatedBoundValue.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/SkinTranslatedBoundValue.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/SkinTranslatedBoundValue.java Wed Jul 26 23:44:58 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.trinidadinternal.ui.laf.base;
 
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 
 import org.apache.myfaces.trinidadinternal.ui.data.BoundValue;
 
@@ -55,7 +55,7 @@
    * @param context the rendering context
    */
   public Object getValue(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/SwitcherRenderer.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/SwitcherRenderer.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/SwitcherRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/SwitcherRenderer.java Wed Jul 26 23:44:58 2006
@@ -20,7 +20,7 @@
 import org.apache.myfaces.trinidadinternal.ui.BaseRenderer;
 import org.apache.myfaces.trinidadinternal.ui.NodeRole;
 import org.apache.myfaces.trinidadinternal.ui.RoledRenderer;
-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;
 
@@ -34,14 +34,14 @@
   implements UIConstants, RoledRenderer
 {
   public NodeRole getNodeRole(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node)
   {
     return STATE_ROLE;
   }
 
   protected void renderContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -69,7 +69,7 @@
   // _renderCase renders a particular case child of a switcher element.
   // Return value is true if the child name pointed to a named case child.
   private boolean _renderCase(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     String           childName
     ) throws IOException

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/TextRenderer.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/TextRenderer.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/TextRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/TextRenderer.java Wed Jul 26 23:44:58 2006
@@ -18,7 +18,7 @@
 import java.io.IOException;
 
 import org.apache.myfaces.trinidadinternal.ui.BaseRenderer;
-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;
@@ -42,7 +42,7 @@
   }
 
   protected void renderContent(
-    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/TreeWalker.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/TreeWalker.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/TreeWalker.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/TreeWalker.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.path.Path;
 
@@ -45,7 +45,7 @@
    * @exception IOException if this method writes output
    */
   public Object walkNode(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     Object           previousValue,
     Path             path) throws IOException;
@@ -63,7 +63,7 @@
    *         If false, the siblings of this ndoe will still be walked to.
    */
   public boolean walkChildren(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     Object           value,
     Path             path);

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/TreeWalkerUtils.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/TreeWalkerUtils.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/TreeWalkerUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/TreeWalkerUtils.java Wed Jul 26 23:44:58 2006
@@ -21,7 +21,7 @@
 import java.util.Collections;
 
 
-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;
 
@@ -56,7 +56,7 @@
    * @return the last value returned by walkNode()
    */
   static public Object walkTree(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           ancestor,
     TreeWalker       walker) throws IOException
   {
@@ -75,7 +75,7 @@
    * @return the last value returned by walkNode()
    */
   static public Object walkTree(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           ancestor,
     TreeWalker       walker,
     PathImpl         path) throws IOException
@@ -96,7 +96,7 @@
    * @return the last value returned by walkNode()
    */
   static public Object walkTree(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           ancestor,
     TreeWalker       walker,
     PathImpl         path,
@@ -106,14 +106,14 @@
   }
 
   static private Object _walkTree(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           ancestor,
     TreeWalker       walker,
     Object           value,
     PathImpl         path,
     boolean          renderedOnly) throws IOException
   {
-    RenderingContext childContext =
+    UIXRenderingContext childContext =
       _getChildRenderingContext(context, ancestor);
 
     // Walk the indexed children
@@ -194,8 +194,8 @@
   //
   // Returns the correct RenderingContext to pass to the children of this node.
   //
-  static private RenderingContext _getChildRenderingContext(
-    RenderingContext context,
+  static private UIXRenderingContext _getChildRenderingContext(
+    UIXRenderingContext context,
     UINode           child)
   {
     if (UIConstants.CONTEXT_POPPING_NAME.equals(child.getLocalName()) &&

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/UnsupportedRenderer.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/UnsupportedRenderer.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/UnsupportedRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/UnsupportedRenderer.java Wed Jul 26 23:44:58 2006
@@ -20,7 +20,7 @@
 import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 
 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;
 
 
@@ -37,7 +37,7 @@
    * Render nothing.
    */
   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/UseAccessibilityBoundValue.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/UseAccessibilityBoundValue.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/UseAccessibilityBoundValue.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/UseAccessibilityBoundValue.java Wed Jul 26 23:44:58 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.trinidadinternal.ui.laf.base;
 
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 
 import org.apache.myfaces.trinidadinternal.ui.data.BoundValue;
 
@@ -42,7 +42,7 @@
    * @param context the rendering context
    */
   public Object getValue(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     return (BaseLafRenderer.isInaccessibleMode(context)

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ApplicationSwitcherRenderer.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/desktop/ApplicationSwitcherRenderer.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/desktop/ApplicationSwitcherRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ApplicationSwitcherRenderer.java Wed Jul 26 23:44:58 2006
@@ -32,7 +32,7 @@
 import org.apache.myfaces.trinidadinternal.share.url.FormEncoder;
 import org.apache.myfaces.trinidadinternal.share.url.URLEncoder;
 import org.apache.myfaces.trinidadinternal.ui.NodeUtils;
-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.data.BoundValue;
@@ -56,7 +56,7 @@
 {
 
  protected UIXHierarchy getHierarchyBase(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
   )
   {
@@ -65,7 +65,7 @@
 
 
   protected UINode getStamp(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -74,7 +74,7 @@
 
 
   protected boolean setNewPath(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     UIXHierarchy    component
   )
@@ -87,7 +87,7 @@
   }
 
   protected void renderContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -122,7 +122,7 @@
 
 
   protected Object getNodeName(
-          RenderingContext context,
+          UIXRenderingContext context,
           UINode           node
           )
   {
@@ -132,7 +132,7 @@
   /**
    * Returns the value associated with the selected value attribute
    */
-  protected String getSelectedValue(RenderingContext context, UINode node)
+  protected String getSelectedValue(UIXRenderingContext context, UINode node)
   {
     BoundValue bv = new MenuChoiceSelectedValueBoundValue(
       NodeUtils.getUIComponent(context, node));
@@ -141,7 +141,7 @@
 
 
   protected void selectItemsRenderContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -153,7 +153,7 @@
    * @param node the current UINode
    */
   protected void prerender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -174,7 +174,7 @@
    * @param node the current UINode
    */
   protected void renderPreChoice(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -226,7 +226,7 @@
 
 
   protected Object getTitle(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -247,7 +247,7 @@
    * @param node the current UINode
    */
   protected void postrender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -261,7 +261,7 @@
   }
 
   protected void renderPostChoice(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -290,7 +290,7 @@
   }
   // render the button
   protected void renderButton(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )throws IOException
   {
@@ -310,7 +310,7 @@
    * @param node the current UINode
    */
   private String _getOnClickHandler(
-    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/desktop/BaseDesktopUtils.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/desktop/BaseDesktopUtils.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/desktop/BaseDesktopUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopUtils.java Wed Jul 26 23:44:58 2006
@@ -18,7 +18,7 @@
 import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
 
 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.laf.LookAndFeelManager;
 import org.apache.myfaces.trinidadinternal.ui.laf.NameAndAgentScorer;
 import org.apache.myfaces.trinidadinternal.ui.laf.Score;
@@ -59,7 +59,7 @@
    * Returns true if the agent supports partial rendering of content.
    */
   public static boolean supportsPartialRendering(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     return HtmlLafRenderer.supportsPartialRendering(context);
@@ -82,7 +82,7 @@
     }
 
     public Score scoreLookAndFeel(
-      RenderingContext context,
+      UIXRenderingContext context,
       String           lafName
       )
     {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BorderLayoutRenderer.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/desktop/BorderLayoutRenderer.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/desktop/BorderLayoutRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BorderLayoutRenderer.java Wed Jul 26 23:44:58 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.trinidadinternal.ui.laf.base.desktop;
 
-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 @@
    * is specified
    */
   protected int getDefaultMarginIndent(
-    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/desktop/BreadCrumbsRenderer.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/desktop/BreadCrumbsRenderer.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/desktop/BreadCrumbsRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BreadCrumbsRenderer.java Wed Jul 26 23:44:58 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.trinidadinternal.ui.laf.base.desktop;
 
-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 @@
 {
 
   protected boolean renderLastChild(
-    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/laf/base/desktop/ButtonRenderer.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/desktop/ButtonRenderer.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/desktop/ButtonRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ButtonRenderer.java Wed Jul 26 23:44:58 2006
@@ -37,7 +37,7 @@
 import org.apache.myfaces.trinidadinternal.style.util.MutableFontProxy;
 import org.apache.myfaces.trinidadinternal.ui.AttributeKey;
 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;
 import org.apache.myfaces.trinidadinternal.ui.action.ClientAction;
@@ -65,11 +65,11 @@
    * @param context The rendering context
    * @param node the node to be rendered
    * @throws IOException
-   * @see #renderContent(RenderingContext,UINode)
-   * @see #renderImageContent(RenderingContext,UINode,ImageProviderResponse)
+   * @see #renderContent(UIXRenderingContext,UINode)
+   * @see #renderImageContent(UIXRenderingContext,UINode,ImageProviderResponse)
    */
   protected final void prerender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -86,7 +86,7 @@
    * @throws IOException
    */
   protected final void postrender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode node
     ) throws IOException
   {
@@ -105,7 +105,7 @@
    * @throws IOException
    */
   protected final void renderContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -123,7 +123,7 @@
    * false, the button will be rendered using alternate content
    */
   protected boolean doRenderImageContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -144,7 +144,7 @@
    * @throws IOException
    */
   protected void renderImageContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode node,
     ImageProviderResponse response
     ) throws IOException
@@ -170,7 +170,7 @@
    * image to render
    * @throws IOException
    */
-  public final void render(RenderingContext context, UINode node)
+  public final void render(UIXRenderingContext context, UINode node)
     throws IOException
   {
     // We override render() so that we can bypass the normal rendering
@@ -213,7 +213,7 @@
    * @throws IOException
    */
   protected void renderAltContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode node
     ) throws IOException
   {
@@ -229,7 +229,7 @@
       return _ALTERNATE_RENDERER;
     }
   protected Object getOnClick(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -277,7 +277,7 @@
   }
 
   protected Object getText(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode node
     )
   {
@@ -294,7 +294,7 @@
    * Override to provide defaults
    */
   protected Object getStyleClass(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -304,7 +304,7 @@
   }
 
   // Returns the vertical alignment
-  protected Object getVAlign(RenderingContext context, UINode node)
+  protected Object getVAlign(UIXRenderingContext context, UINode node)
   {
     // This is kind of a hack to address bug #2047577
     // Instead of adding an attribute to control placement of the button,
@@ -341,7 +341,7 @@
 
 
   protected void renderButtonAccessKey(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )    throws IOException
   {
@@ -371,7 +371,7 @@
    * button image.
    */
   abstract protected ImageProviderRequest createImageProviderRequest(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object       name,
     Object       text,
     Color        foreground,
@@ -390,7 +390,7 @@
    * button text.
    */
   protected String getServerStyleName(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     boolean          disabled
     )
@@ -402,7 +402,7 @@
   // image generation and makes a request to the ImageProvider to
   // generate the corresponding image.
   private ImageProviderResponse _getImage(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -479,7 +479,7 @@
   // This overload of _getImage() loops through all inline font families
   // and style class font families trying to find a match.
   private ImageProviderResponse _getImage(
-    RenderingContext context,
+    UIXRenderingContext context,
     ImageProvider    provider,
     ImageProviderRequest request,
     MutableFontProxy font,
@@ -527,7 +527,7 @@
     return provider.getImage(imageContext, request);
   }
 
-  private char _getAccessKey(RenderingContext context, UINode node)
+  private char _getAccessKey(UIXRenderingContext context, UINode node)
   {
     char ch = BaseDesktopUtils.getCharacterAttr(context, node, ACCESS_KEY_ATTR);
 
@@ -546,7 +546,7 @@
     * @throws IOException
     */
   private static void _writeClientActionDependency(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode node
     ) throws IOException
   {
@@ -565,7 +565,7 @@
    * @throws IOException
    */
   private  static void _renderOnKeyDownScript(
-    RenderingContext context
+    UIXRenderingContext context
     ) throws IOException
   {
     if (Boolean.TRUE.equals(getRenderingProperty(context, _ADF_BTN_ATTR)))
@@ -576,7 +576,7 @@
       }
   }
 
-  private boolean _useLinkAlternateContent(RenderingContext context)
+  private boolean _useLinkAlternateContent(UIXRenderingContext context)
   {
     return  (!supportsAdvancedButtons(context) &&
       (getParentFormName(context) == null));
@@ -586,7 +586,7 @@
   /**
    *  Returns the Renderer to use to render the alternate content.
    */
-  private Renderer _getAlternateRenderer (RenderingContext context)
+  private Renderer _getAlternateRenderer (UIXRenderingContext context)
   {
     // We need to use a special Renderer for Netscape when there
     // is no form, but other than that we delegate to a
@@ -614,7 +614,7 @@
     * @throws IOException
     */
     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/desktop/CellFormatRenderer.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/desktop/CellFormatRenderer.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/desktop/CellFormatRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/CellFormatRenderer.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;
 
 
@@ -32,7 +32,7 @@
    * Renders attributes of the current node.
    */
   protected void renderAttributes(
-    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/desktop/ColorPaletteRenderer.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/desktop/ColorPaletteRenderer.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/desktop/ColorPaletteRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ColorPaletteRenderer.java Wed Jul 26 23:44:58 2006
@@ -27,7 +27,7 @@
 import org.apache.myfaces.trinidadinternal.share.text.RGBColorFormat;
 import org.apache.myfaces.trinidadinternal.style.util.CSSUtils;
 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.expl.ColorPaletteUtils;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.XhtmlLafRenderer;
@@ -45,7 +45,7 @@
 public class ColorPaletteRenderer extends HtmlLafRenderer
 {
   protected void prerender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode node) throws IOException
   {
     super.prerender(context, node);
@@ -53,7 +53,7 @@
   }
 
   protected void renderContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode node) throws IOException
   {
     List colorData = _getColors(context, node, COLOR_DATA_ATTR);
@@ -81,7 +81,7 @@
   }
 
   private void _renderColorPalette(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode node,
     List colorData,
     int width,
@@ -321,28 +321,28 @@
   }
 
   protected String getElementName(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode node)
   {
     return "span";
   }
 
   protected int getWidth(
-    RenderingContext  context,
+    UIXRenderingContext  context,
     UINode            node)
   {
     return getIntAttributeValue(context, node, WIDTH_ATTR, 0);
   }
 
   protected int getHeight(
-    RenderingContext  context,
+    UIXRenderingContext  context,
     UINode            node)
   {
     return getIntAttributeValue(context, node, HEIGHT_ATTR, 0);
   }
 
   protected Object getOnColorSelect(
-    RenderingContext  context,
+    UIXRenderingContext  context,
     UINode            node)
   {
     return getAttributeValue(context, node,
@@ -351,7 +351,7 @@
   }
 
   protected Object getOnClick(
-    RenderingContext  context,
+    UIXRenderingContext  context,
     UINode            node)
   {
     Object onClick = null;
@@ -396,7 +396,7 @@
   }
 
   private static List _getColors(
-    RenderingContext  context,
+    UIXRenderingContext  context,
     UINode            node,
     AttributeKey     attributeKey
     )

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ContentContainerRenderer.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/desktop/ContentContainerRenderer.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/desktop/ContentContainerRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ContentContainerRenderer.java Wed Jul 26 23:44:58 2006
@@ -22,7 +22,7 @@
 
 
 
-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 @@
    * Implementation of ElementRenderer.getName();
    */
   protected String getElementName(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -50,7 +50,7 @@
    * Override of BaseRenderer.renderAttributes().
    */
   protected void renderAttributes(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )throws IOException
   {
@@ -68,7 +68,7 @@
    * Returns the style class for the content container
    */
   protected Object getStyleClass(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -115,7 +115,7 @@
    * the contentContainer's chrome around the child contents.
    */
   protected void renderContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -132,7 +132,7 @@
    * Gets the contentContainer's header text.
    */
   protected Object getText(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -145,7 +145,7 @@
    * Gets the contentContainer's background value
    */
   protected Object getBackground(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -156,7 +156,7 @@
    * Hook for subclasses to render child contents
    */
   protected void renderChildContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -165,7 +165,7 @@
 
   // Renders the header row
   private void _renderHeaderRow(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     Object           text
     ) throws IOException
@@ -202,7 +202,7 @@
   // Renders the table row which contains the
   // contentContainer's child contents.
   private void _renderContentRow(
-    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/desktop/ContentFooterRenderer.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/desktop/ContentFooterRenderer.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/desktop/ContentFooterRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ContentFooterRenderer.java Wed Jul 26 23:44:58 2006
@@ -20,7 +20,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;
 
 /**
@@ -32,7 +32,7 @@
 public class ContentFooterRenderer extends HtmlLafRenderer
 {
   protected void renderAttributes(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {    
@@ -40,7 +40,7 @@
   }
 
   protected void prerender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -63,7 +63,7 @@
 
 
   protected void postrender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -83,7 +83,7 @@
   }
     
   
-  protected String getElementName(RenderingContext context, UINode node)
+  protected String getElementName(UIXRenderingContext context, UINode node)
   {
     return DIV_ELEMENT;
   }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/FooterRenderer.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/desktop/FooterRenderer.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/desktop/FooterRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/FooterRenderer.java Wed Jul 26 23:44:58 2006
@@ -20,7 +20,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.laf.base.xhtml.LinkUtils;
@@ -34,7 +34,7 @@
 public class FooterRenderer extends HtmlLafRenderer
 {
   protected void renderAttributes(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node) throws IOException
   {
     super.renderAttributes(context, node);
@@ -42,7 +42,7 @@
   }
 
   protected void renderBetweenIndexedChildren(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node) throws IOException
   {
     ResponseWriter writer = context.getResponseWriter();
@@ -51,7 +51,7 @@
   }  
 
   protected void postrender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node) throws IOException
   {
     
@@ -100,7 +100,7 @@
     super.postrender(context, node);
   }
 
-  protected String getElementName(RenderingContext context, UINode node)
+  protected String getElementName(UIXRenderingContext context, UINode node)
   {
     return DIV_ELEMENT;
   }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GeneratedImageRenderer.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/desktop/GeneratedImageRenderer.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/desktop/GeneratedImageRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GeneratedImageRenderer.java Wed Jul 26 23:44:58 2006
@@ -39,7 +39,7 @@
 import org.apache.myfaces.trinidadinternal.image.ImageProviderResponse;
 
 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;
 
 
@@ -55,7 +55,7 @@
 
 
   protected void renderImage(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode node,
     ImageProviderResponse response
     )
@@ -69,13 +69,13 @@
    * as the title attribute; instead we write shortDesc as the alt text of the
    * image.
    */
-  protected void renderShortDesc(RenderingContext context, UINode node)
+  protected void renderShortDesc(UIXRenderingContext context, UINode node)
   {
   }
 
 
   protected void renderImage(
-    RenderingContext      context,
+    UIXRenderingContext      context,
     UINode                node,
     ImageProviderResponse response,
     String                mapName
@@ -104,7 +104,7 @@
   }
 
   protected void renderImage(
-    RenderingContext      context,
+    UIXRenderingContext      context,
     UINode                node,
     ImageProviderResponse response,
     boolean               hasMap,
@@ -198,7 +198,7 @@
   }
 
   protected Object getText(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -206,7 +206,7 @@
   }
 
   protected Object getShortDesc(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -221,7 +221,7 @@
   }
 
   protected Object getImageName(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -229,7 +229,7 @@
   }
 
   protected Object getLongDesc(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -241,7 +241,7 @@
    * Returns the destination to use for the GeneratedImageRenderer
    */
   protected Object getDestination(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -267,7 +267,7 @@
 
 
   protected String getImageStyle(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -275,7 +275,7 @@
   }
 
   protected String getImageStyleClass(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -284,7 +284,7 @@
 
 
   protected void renderButtonAccessKey(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )    throws IOException
   {
@@ -292,7 +292,7 @@
   }
 
   static protected String getURLAttribute(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode       node,
     AttributeKey attrKey
     )
@@ -306,7 +306,7 @@
 
   // Returns the style for the specified name
   static protected Style getStyle(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     String           name
     )
@@ -322,13 +322,13 @@
   }
 
   // Returns the vertical alignment
-  protected Object getVAlign(RenderingContext context, UINode node)
+  protected Object getVAlign(UIXRenderingContext context, UINode node)
   {
     return null;
   }
 
   static protected int getFontStyle(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode node,
     Style classStyle,
     Style inlineStyle,
@@ -386,7 +386,7 @@
   }
 
   static protected int getFontSize(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode node,
     Style classStyle,
     Style inlineStyle,
@@ -418,7 +418,7 @@
   }
 
   static protected Collection getFontFamilies(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode node,
     Style  style,
     String styleName
@@ -442,7 +442,7 @@
   }
 
   static protected Color getBackground(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode node,
     Style classStyle,
     Style inlineStyle,
@@ -464,7 +464,7 @@
   }
 
   static protected Color getForeground(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode node,
     Style classStyle,
     Style inlineStyle,
@@ -485,7 +485,7 @@
       _parseValue(classStyle, styleName, Style.FOREGROUND_KEY);
   }
 
-  static protected Color getSurroundingColor(RenderingContext context)
+  static protected Color getSurroundingColor(UIXRenderingContext context)
   {
     if (BaseDesktopUtils.supportsTransparentImages(context))
       return null;
@@ -494,7 +494,7 @@
   }
 
   static protected int getDirection(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode node
     )
   {
@@ -503,7 +503,7 @@
   }
 
   static protected boolean isTextAntialiased(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode node,
     Style classStyle,
     Style inlineStyle

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GlobalButtonRenderer.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/desktop/GlobalButtonRenderer.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/desktop/GlobalButtonRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GlobalButtonRenderer.java Wed Jul 26 23:44:58 2006
@@ -25,7 +25,7 @@
 import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.XhtmlLafUtils;
 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;
 
 /**
@@ -40,7 +40,7 @@
   /**
    *
    */
-  protected void prerender(RenderingContext context, UINode node)
+  protected void prerender(UIXRenderingContext context, UINode node)
     throws IOException
   {
    // If we've got a ClientAction, let it write its dependencies
@@ -98,7 +98,7 @@
   }
 
   protected void renderContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -110,7 +110,7 @@
    * about _getPartialChangeScript if action is null
    */
   protected Object getOnClick(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -175,7 +175,7 @@
   }
 
   protected Object getDestination(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -204,7 +204,7 @@
   }
 
   protected final String getDestinationAttr(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -214,7 +214,7 @@
   }
 
   protected static boolean isSelected(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode node
     )
   {
@@ -225,7 +225,7 @@
   }
 
   protected Object getStyleClass(
-    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/desktop/GlobalHeaderRenderer.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/desktop/GlobalHeaderRenderer.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/desktop/GlobalHeaderRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GlobalHeaderRenderer.java Wed Jul 26 23:44:58 2006
@@ -22,7 +22,7 @@
 
 import org.apache.myfaces.trinidad.component.UIXNavigationLevel;
 import org.apache.myfaces.trinidadinternal.style.Style;
-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.xhtml.LinkUtils;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.XhtmlLafUtils;
@@ -44,7 +44,7 @@
 public class GlobalHeaderRenderer extends HtmlLafRenderer
 {
   protected String getElementName(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -52,7 +52,7 @@
   }
 
   protected void renderAttributes(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )throws IOException
   {
@@ -66,7 +66,7 @@
    *
    */
   protected void prerender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
     throws IOException
@@ -97,7 +97,7 @@
   }
 
   protected void renderContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -142,7 +142,7 @@
    *
    */
   protected void postrender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
     throws IOException
@@ -163,7 +163,7 @@
   }
   
   protected void renderIndexedChild(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     int              index
     )throws IOException
@@ -188,7 +188,7 @@
   }  
 
     protected void renderStamp(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           stamp,
     boolean          selected
     )throws IOException
@@ -214,7 +214,7 @@
    * renders the separator Icon.
    */
   protected void renderBetweenIndexedChildren(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -226,7 +226,7 @@
    * renders the separator Icon.
    */
   protected void renderBetweenNodes(
-    RenderingContext context
+    UIXRenderingContext context
     ) throws IOException
   {
     // Get the separator icon and render it in a table cell
@@ -240,7 +240,7 @@
    * to OraGlobalHeader.
    */
   protected Object getStyleClass(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -251,7 +251,7 @@
    * Renders the style attributes for global header items
    */
   protected void renderItemStyleAttrs(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     int              index,
     boolean          selected
@@ -270,7 +270,7 @@
   /**
    * Returns the separator Icon
    */
-  protected Icon getSeparatorIcon(RenderingContext context)
+  protected Icon getSeparatorIcon(UIXRenderingContext context)
   {
     return (Icon)context.getLocalProperty(0, _SEPARATOR_ICON_KEY, null);
   }
@@ -280,7 +280,7 @@
    * indexed children).
    */
   protected boolean isEmpty(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -301,7 +301,7 @@
    * Renders the empty global header
    */
   protected void renderEmptyGlobalHeader(
-    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/desktop/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/desktop/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/desktop/HeaderRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HeaderRenderer.java Wed Jul 26 23:44:58 2006
@@ -25,7 +25,7 @@
 import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
 
 import org.apache.myfaces.trinidadinternal.ui.NodeUtils;
-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;
@@ -48,14 +48,14 @@
   // ask whether the header is being rendered as an HTML table.  If
   // so, we don't bother rendering our div-based contents.
   protected boolean rendersTableHeader(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     return false;
   }
 
   protected void prerender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -66,7 +66,7 @@
   }
 
   protected void postrender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -77,7 +77,7 @@
   }
 
   protected boolean hasQuickLinkAnchor(
-     RenderingContext context,
+     UIXRenderingContext context,
      UINode           node,
      int              headerIndentLevel
      )
@@ -92,7 +92,7 @@
 
 
   protected Object getReturnAltString(
-    RenderingContext context
+    UIXRenderingContext context
   )
   {
     return getTranslatedValue(context, _QUICK_LINKS_RETURN_TOP_TIP);
@@ -100,7 +100,7 @@
 
 
   protected Object getReturnString(
-    RenderingContext context
+    UIXRenderingContext context
   )
   {
     return getTranslatedValue(context, _QUICK_LINKS_RETURN_TOP_TEXT);
@@ -112,7 +112,7 @@
   //
 
   private void _prerender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
   ) throws IOException
   {
@@ -199,7 +199,7 @@
   // then the icon is retrieved from the Skin.  Otherwise,
   // we use the icon specified via the header's ICON_ATTR.
   protected void renderIcon(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {   
@@ -242,7 +242,7 @@
   }
 
   private void _postrender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -266,7 +266,7 @@
   }
 
   private int _getSize(
-    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/desktop/HeaderUtils.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/desktop/HeaderUtils.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/desktop/HeaderUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HeaderUtils.java Wed Jul 26 23:44:58 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.trinidadinternal.ui.laf.base.desktop;
 
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
 
 /**
@@ -30,14 +30,14 @@
   }
 
   public static Object getHeaderID(
-    RenderingContext context
+    UIXRenderingContext context
   )
   {    
     return BaseDesktopUtils.getRenderingProperty(context, _HEADER_ID_PROPERTY);
   }
 
   public static void setHeaderID(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object           id
   )
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HideShowUtils.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/desktop/HideShowUtils.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/desktop/HideShowUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HideShowUtils.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.skin.icon.Icon;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
 
@@ -36,7 +36,7 @@
    * the undisclosed (show) symbol is shown.
    */
   public static void renderDisclosedStateSymbol(
-    RenderingContext context,
+    UIXRenderingContext context,
     boolean disclosed,
     String disclosedAltTextKey,
     String undisclosedAltTextKey) throws IOException
@@ -62,7 +62,7 @@
   // get property as to whether to render hideShow as inline rather
   // than block level element
   public static Boolean getIsInline(
-    RenderingContext context
+    UIXRenderingContext context
   )
   {
     return (Boolean)context.getProperty(UIConstants.MARLIN_NAMESPACE, 
@@ -73,7 +73,7 @@
   // Set property to say to render hideShow as inline rather
   // than block level element
   public static void setIsInline(
-    RenderingContext context,
+    UIXRenderingContext context,
     Boolean          isInline
   )
   {    
@@ -84,7 +84,7 @@
 
   // Returns the hideShow Icon
   private static Icon _getHideShowIcon(
-    RenderingContext context,
+    UIXRenderingContext context,
     boolean          disclosed
     )
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HtmlLafRenderer.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/desktop/HtmlLafRenderer.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/desktop/HtmlLafRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HtmlLafRenderer.java Wed Jul 26 23:44:58 2006
@@ -24,7 +24,7 @@
 
 import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils;
-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.LafIconProvider;
@@ -46,7 +46,7 @@
    * Returns true if the current user agent is a Netscape user agent.
    */
   public static boolean isNetscape(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     return (context.getAgent().getAgentApplication() ==
@@ -57,7 +57,7 @@
    * Returns true if the current user agent is a Safari user agent.
    */
   public static boolean isSafari(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     return (context.getAgent().getAgentApplication() ==
@@ -69,7 +69,7 @@
    * Returns true if the current user agent is a Gecko user agent.
    */
   public static boolean isGecko(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     return (context.getAgent().getAgentApplication() ==
@@ -80,7 +80,7 @@
    * Returns true if the current user agent is an Internet Explorer user agent.
    */
   public static boolean isIE(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     return (context.getAgent().getAgentApplication() ==
@@ -91,7 +91,7 @@
    * Renders a transparent gif using a script to save space.
    */
   protected void renderTransparent(
-    RenderingContext context,
+    UIXRenderingContext context,
     String           width,
     String           height,
     boolean          needsQuoting
@@ -102,7 +102,7 @@
   
 
   protected void renderRepeatingImage(
-    RenderingContext context,
+    UIXRenderingContext context,
     String           backgroundImageURL
     ) throws IOException
   {
@@ -111,7 +111,7 @@
   
 
   protected void renderRepeatingImage(
-    RenderingContext context,
+    UIXRenderingContext context,
     String           backgroundImageURL,
     Object           height
     ) throws IOException
@@ -142,7 +142,7 @@
 
 
   protected void renderRepeatingImage(
-    RenderingContext context,
+    UIXRenderingContext context,
     String           backgroundImageURL,
     Object           height,
     String           contentImageURL,
@@ -185,7 +185,7 @@
    * for trim, so the alt="".
    */
   protected void renderTableDataIcon(
-    RenderingContext context,
+    UIXRenderingContext context,
     Icon             icon,
     String           styleClass
     ) throws IOException
@@ -215,7 +215,7 @@
   }
 
   protected static void writeCacheImageURI(
-    RenderingContext context,
+    UIXRenderingContext context,
     String           attribute,
     String           uri) throws IOException
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/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/desktop/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/desktop/HtmlRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HtmlRenderer.java Wed Jul 26 23:44:58 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 package org.apache.myfaces.trinidadinternal.ui.laf.base.desktop;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 
 
 /**
@@ -29,7 +29,7 @@
    * Returns the name of the language attribute
    */
   protected String getLangAttrName(
-    RenderingContext context)
+    UIXRenderingContext context)
   {
     if (isXMLDocument(context))
       return super.getLangAttrName(context);

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/IconButtonRenderer.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/desktop/IconButtonRenderer.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/desktop/IconButtonRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/IconButtonRenderer.java Wed Jul 26 23:44:58 2006
@@ -22,7 +22,7 @@
 import org.apache.myfaces.trinidadinternal.skin.Skin;
 
 
-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;
@@ -44,7 +44,7 @@
 
   // Returns the elmenet name - "a"
   protected String getElementName(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -54,7 +54,7 @@
 
   // Renders the link attributes
   protected void renderAttributes(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -81,7 +81,7 @@
 
   // Renders the icon
   protected void renderContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -115,7 +115,7 @@
   }
 
   protected Object getSource(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -124,7 +124,7 @@
 
   // Gets the destination for the button
   protected Object getDestination(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -137,7 +137,7 @@
 
   // Returns the vertical alignment for the Icon
   protected Object getVAlign(
-    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/desktop/MenuListRenderer.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/desktop/MenuListRenderer.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/desktop/MenuListRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/MenuListRenderer.java Wed Jul 26 23:44:58 2006
@@ -23,7 +23,7 @@
 import org.apache.myfaces.trinidad.component.UIXHierarchy;
 import org.apache.myfaces.trinidad.component.UIXNavigationLevel;
 
-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.xhtml.LinkUtils;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.ModelRendererUtils;
@@ -41,7 +41,7 @@
 {
 
   protected void prerender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
   )throws IOException
   {
@@ -117,7 +117,7 @@
 
 
   protected UIXHierarchy getHierarchyBase(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
   )
   {
@@ -126,7 +126,7 @@
 
 
   protected UINode getStamp(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -135,7 +135,7 @@
 
 
   protected boolean setNewPath(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     UIXHierarchy    component
   )
@@ -148,7 +148,7 @@
   }
 
   protected void renderContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -188,7 +188,7 @@
 
 
   protected void postrender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
   )throws IOException
   {
@@ -213,7 +213,7 @@
   }
 
   protected void renderIndexedChild(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     int              childIndex
     ) throws IOException
@@ -226,7 +226,7 @@
   }
 
   protected void renderNode(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     boolean          selected
     ) throws IOException

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/MessageBoxRenderer.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/desktop/MessageBoxRenderer.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/desktop/MessageBoxRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/MessageBoxRenderer.java Wed Jul 26 23:44:58 2006
@@ -26,7 +26,7 @@
 import org.apache.myfaces.trinidad.component.core.output.CoreMessages;
 
 import org.apache.myfaces.trinidadinternal.ui.BaseMutableUINode;
-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.data.bind.ContextPropertyBoundValue;
@@ -40,7 +40,7 @@
  */
 public class MessageBoxRenderer extends HtmlLafRenderer
 {
-  public void render(RenderingContext context, UINode node) throws IOException
+  public void render(UIXRenderingContext context, UINode node) throws IOException
   {
     Object globalOnlyAttr = getAttributeValue(context, node,
                                        GLOBAL_ONLY_ATTR, null);
@@ -62,7 +62,7 @@
   }
 
   protected String getElementName(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -73,7 +73,7 @@
    * Returns the messageBox's style class.
    */
   protected Object getStyleClass(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -102,7 +102,7 @@
 
   // based on oracle.desktop.MessageBoxRenderer.renderChildren
   protected void renderContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode node
     ) throws IOException
   {
@@ -174,7 +174,7 @@
   }
 
   private void _renderMessages(
-    RenderingContext context,
+    UIXRenderingContext context,
     ResponseWriter writer,
     boolean isGlobal,
     boolean useList
@@ -210,7 +210,7 @@
   }
 
   private void _writeGlobalMsg(
-    RenderingContext context,
+    UIXRenderingContext context,
     ResponseWriter writer,
     String summary,
     String detail
@@ -225,7 +225,7 @@
 
 
   private BaseMutableUINode _writeClientMsg(
-    RenderingContext context,
+    UIXRenderingContext context,
     ResponseWriter writer,
     String summary,
     MessageWrapper msg,

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/MessageBoxUtils.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/desktop/MessageBoxUtils.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/desktop/MessageBoxUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/MessageBoxUtils.java Wed Jul 26 23:44:58 2006
@@ -19,7 +19,7 @@
 
 import javax.faces.application.FacesMessage;
 
-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,7 +32,7 @@
 public class MessageBoxUtils implements UIConstants
 {
 
-  public static FacesMessage.Severity sGetMaxSeverity(RenderingContext context)
+  public static FacesMessage.Severity sGetMaxSeverity(UIXRenderingContext context)
   {
     // This doesn't seem to work if there is a global message
     // return context.getFacesContext().getMaximumSeverity();
@@ -52,7 +52,7 @@
     return max;
   }
 
-  public static String sGetMaxType(RenderingContext context)
+  public static String sGetMaxType(UIXRenderingContext context)
   {
     String type = UIConstants.MESSAGE_TYPE_INFO;
     FacesMessage.Severity sev = sGetMaxSeverity(context);
@@ -68,7 +68,7 @@
   }
 
   public static boolean sIsRendered(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode node,
     boolean allMessages
     )
@@ -78,7 +78,7 @@
   }
 
   public static Iterator sGetIterator(
-    RenderingContext context,
+    UIXRenderingContext context,
     boolean allMessages)
   {
     return new AllMessageIterator(context.getFacesContext(),
@@ -86,20 +86,20 @@
   }
 
   public static Iterator sGetGlobalsIterator(
-    RenderingContext context)
+    UIXRenderingContext context)
   {
     return new AllMessageIterator(context.getFacesContext(), false, false);
   }
 
   public static Iterator sGetClientsIterator(
-    RenderingContext context)
+    UIXRenderingContext context)
   {
     return new AllMessageIterator(context.getFacesContext(), true, true);
   }
 
 
   public static Object sGetMessage(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -110,7 +110,7 @@
   }
 
   public static boolean sMultipleMessages(
-    RenderingContext context,
+    UIXRenderingContext context,
     boolean allMessages)
   {
     boolean isMult = false;

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/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/desktop/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/desktop/NavigationBarRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/NavigationBarRenderer.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;
 
 /**
  * Renderer for Navigation Bars showing either single or multiple records.
@@ -35,7 +35,7 @@
    * Writes the separator between two elements
    */
   protected void renderItemSpacer(
-    RenderingContext context
+    UIXRenderingContext context
     ) throws IOException
   {
     renderSpacer(context, 5, 1);
@@ -47,7 +47,7 @@
    * submit
    */
   protected boolean requiresForm(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     // Netscape requires forms in order to submit

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/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/desktop/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/desktop/NavigationPathRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/NavigationPathRenderer.java Wed Jul 26 23:44:58 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.trinidadinternal.ui.laf.base.desktop;
 
-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 @@
 {
 
   protected boolean renderLastChild(
-    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/laf/base/desktop/NavigationTreeRenderer.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/desktop/NavigationTreeRenderer.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/desktop/NavigationTreeRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/NavigationTreeRenderer.java Wed Jul 26 23:44:58 2006
@@ -22,7 +22,7 @@
 import org.apache.myfaces.trinidad.component.UIXHierarchy;
 import org.apache.myfaces.trinidad.component.UIXNavigationTree;
 import org.apache.myfaces.trinidad.model.RowKeySet;
-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.xhtml.ModelRendererUtils;
 
@@ -66,7 +66,7 @@
 
   // return whether to continue with rendering
   protected boolean setInitialPath(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     UIXHierarchy     tree)
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageHeaderLayoutRenderer.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/desktop/PageHeaderLayoutRenderer.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/desktop/PageHeaderLayoutRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageHeaderLayoutRenderer.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.laf.base.xhtml.XhtmlLafUtils;
 
@@ -31,7 +31,7 @@
 public class PageHeaderLayoutRenderer extends HtmlLafRenderer
 {
   protected void renderContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -479,7 +479,7 @@
   }
 
   protected void renderPageHeaderChild(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     UINode           globalHeader,
     boolean          hasQuickSearch
@@ -491,7 +491,7 @@
 
 
   protected String getElementName(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -508,7 +508,7 @@
    * @return void
    */
   private void _renderAds(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     ResponseWriter   writer,
     UINode           largeAd,
@@ -558,7 +558,7 @@
    * @return void
    */
   private void  _renderTabBar(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     ResponseWriter   writer,
     UINode           tabBar,
@@ -590,7 +590,7 @@
    * @return void
    */
   private void _renderGlobalHeader(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     ResponseWriter   writer,
     UINode           globalHeader,
@@ -620,7 +620,7 @@
    * @return void
    */
   private void _renderQuickSearch(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     ResponseWriter   writer,
     UINode           quickSearch,

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageLayoutRenderer.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/desktop/PageLayoutRenderer.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/desktop/PageLayoutRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageLayoutRenderer.java Wed Jul 26 23:44:58 2006
@@ -17,7 +17,7 @@
 
 import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
 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;
@@ -61,7 +61,7 @@
 
 
   protected UINode getRenderingUINode(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -612,7 +612,7 @@
       _elseObj = ifNotValue;
     }
 
-    public Object getValue(RenderingContext context)
+    public Object getValue(UIXRenderingContext context)
     {
       if (context.getAgent().getAgentApplication() ==
           AdfFacesAgent.APPLICATION_NETSCAPE)
@@ -651,7 +651,7 @@
     }
 
     public Object walkNode(
-      RenderingContext context,
+      UIXRenderingContext context,
       UINode           node,
       Object           previousValue,
       Path             path)
@@ -669,7 +669,7 @@
 
 
     public boolean walkChildren(
-      RenderingContext context,
+      UIXRenderingContext context,
       UINode           node,
       Object           value,
       Path             path)
@@ -681,7 +681,7 @@
     }
 
     public Object getValue(
-      RenderingContext context
+      UIXRenderingContext context
       )
     {
       UINode child = (UINode)_rootBoundValue.getValue( context );



Mime
View raw message