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 [8/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/ProcessChoiceBarRenderer.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/ProcessChoiceBarRenderer.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/ProcessChoiceBarRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ProcessChoiceBarRenderer.java Wed Jul 26 23:44:58 2006
@@ -28,7 +28,7 @@
 import org.apache.myfaces.trinidadinternal.share.url.URLEncoder;
 import org.apache.myfaces.trinidadinternal.ui.MutableUINode;
 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;
@@ -46,7 +46,7 @@
 {
 
  protected UIXHierarchy getHierarchyBase(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
   )
   {
@@ -55,7 +55,7 @@
 
 
   protected UINode getStamp(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -64,7 +64,7 @@
 
 
   protected boolean setNewPath(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     UIXHierarchy    component
   )
@@ -77,7 +77,7 @@
   }
 
   protected void renderContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -105,7 +105,7 @@
 
 
   protected void selectItemsRenderContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -117,7 +117,7 @@
    * @param node the current UINode
    */
   protected void prerender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -152,7 +152,7 @@
    * @param node the current UINode
    */
   protected void renderPreChoice(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -415,7 +415,7 @@
    * @param node the current UINode
    */
   protected void postrender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -432,7 +432,7 @@
   }
 
   protected void renderPostChoice(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -467,7 +467,7 @@
   }
 
   protected Object getOnChange(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
   )throws IOException
   {
@@ -532,7 +532,7 @@
    * Returns true if disabled navigation items should be shown
    */
   protected boolean disabledNavigationShown(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     return true;
@@ -540,7 +540,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);
@@ -556,7 +556,7 @@
    * Writes the separator between two elements
    */
   protected void renderItemSpacer(
-    RenderingContext context
+    UIXRenderingContext context
     ) throws IOException
   {
     char[] chars = new char[NBSP_CHAR];
@@ -568,7 +568,7 @@
    * Writes the separator between two elements
    */
   private void _renderSpacerCell(
-    RenderingContext context
+    UIXRenderingContext context
     ) throws IOException
   {
     ResponseWriter writer = context.getResponseWriter();
@@ -586,7 +586,7 @@
    * the pieces are one UINode. See bug 2222541.
    */
   private void _renderStartTableCell(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     ResponseWriter   writer,
     boolean          renderAsTable,
@@ -606,7 +606,7 @@
 
   // Gets the encoded partial targets for the specified node
   private static String _getPartialTargets(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -621,7 +621,7 @@
   }
 
   private String _getIDForFocus(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -665,7 +665,7 @@
    * render form value needed values and javascript code.
    */
   private void _renderHiddenFields(
-    RenderingContext context,
+    UIXRenderingContext context,
     String           formName,
     String           eventKey,
     String           sourceKey,

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ProcessUtils.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/ProcessUtils.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/ProcessUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ProcessUtils.java Wed Jul 26 23:44:58 2006
@@ -24,7 +24,7 @@
 import org.apache.myfaces.trinidad.component.UIXCollection;
 
 import org.apache.myfaces.trinidadinternal.share.url.FormEncoder;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 import org.apache.myfaces.trinidadinternal.ui.beans.MarlinBean;
@@ -47,7 +47,7 @@
    * Creates the submit button bean
    */
   public static UINode createSubmitButton(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object           buttonText,
     Object           buttonAccessKey,
     String           buttonID,
@@ -100,7 +100,7 @@
    * @return
    */
   public static String getSubmitScriptCall(
-    RenderingContext context,
+    UIXRenderingContext context,
     String  form,
     String  eventKey,
     String  sourceKey,
@@ -189,7 +189,7 @@
   }
 
   public static String getChoiceOnChangeFormSubmitted(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     String           form,
     String           eventKey,
@@ -315,14 +315,14 @@
   }
 
   public static void renderNavSubmitScript(
-    RenderingContext context
+    UIXRenderingContext context
     ) throws IOException
   {
     XhtmlLafUtils.addLib(context, _NAV_SUBMIT_SCRIPTLET);
   }
 
   public static void renderNavChoiceSubmitScript(
-    RenderingContext context
+    UIXRenderingContext context
     ) throws IOException
   {
     XhtmlLafUtils.addLib(context, _NAV_CHOICE_SUBMIT_SCRIPTLET);

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/RepeatIdContextPropertyUINode.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/RepeatIdContextPropertyUINode.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/RepeatIdContextPropertyUINode.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/RepeatIdContextPropertyUINode.java Wed Jul 26 23:44:58 2006
@@ -20,7 +20,7 @@
 
 import org.apache.myfaces.trinidadinternal.io.RepeatIdResponseWriter;
 
-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.composite.ContextPropertyUINode;
@@ -52,7 +52,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/xhtml/ResetButtonRenderer.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/ResetButtonRenderer.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/ResetButtonRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ResetButtonRenderer.java Wed Jul 26 23:44:58 2006
@@ -22,7 +22,7 @@
 import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 
 import org.apache.myfaces.trinidadinternal.ui.UINode;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 
 
 /**
@@ -35,7 +35,7 @@
 {
 
   protected void prerender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )throws IOException
   {
@@ -48,7 +48,7 @@
    * subclassers to override
    */
   protected boolean useButtonTags(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     // we always use button tags
@@ -70,7 +70,7 @@
    *         org.apache.myfaces.trinidadinternal.ui.blaf.RestButtonRenderer
    */
   protected Object getOnClick(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -113,7 +113,7 @@
    * =-= bts bogus copied code from org.apache.myfaces.trinidadinternal.ui.laf.browser.ResetButtonRenderer
    */
   protected String getFunctionCall(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     String           formName
     )

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/RowLayoutRenderer.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/RowLayoutRenderer.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/RowLayoutRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/RowLayoutRenderer.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.laf.base.NodeRoleUtils;
@@ -30,7 +30,7 @@
 public class RowLayoutRenderer extends XhtmlLafRenderer
 {
   protected void prerender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node) throws IOException
   {
     super.prerender(context, node);
@@ -43,7 +43,7 @@
   }
 
   protected void postrender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node) throws IOException
   {
     if (_shouldRenderTable(context))
@@ -56,7 +56,7 @@
    * Renders attributes of the current node.
    */
   protected void renderAttributes(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -84,7 +84,7 @@
    * @param child the child under consideration
    */
   protected void renderChild(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           child
     ) throws IOException
   {
@@ -107,13 +107,13 @@
   }
 
   protected void renderDefaultCellAttributes(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           child) throws IOException
   {
   }
 
   protected boolean renderCellElement(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           child
     )
   {
@@ -121,7 +121,7 @@
   }
 
   protected void renderBetweenIndexedChildren(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -129,7 +129,7 @@
   }
 
   protected String getElementName(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -148,7 +148,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);
     
@@ -160,7 +160,7 @@
    * @param context
    * @return true if the <table> html element should be rendered.
    */
-  private boolean _shouldRenderTable(RenderingContext context)
+  private boolean _shouldRenderTable(UIXRenderingContext context)
   {
     return !hasTableParent(context);
   }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ScriptRenderer.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/ScriptRenderer.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/ScriptRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ScriptRenderer.java Wed Jul 26 23:44:58 2006
@@ -20,7 +20,7 @@
 import javax.faces.context.ResponseWriter;
 
 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;
@@ -38,14 +38,14 @@
 
 {
   public NodeRole getNodeRole(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node)
   {
     return USER_INVISIBLE_ROLE;
   }
 
   protected String getElementName(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -53,7 +53,7 @@
   }
 
   public void prerender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -87,7 +87,7 @@
   }
 
   public void postrender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node) throws IOException
   {
     super.postrender(context, node);
@@ -95,7 +95,7 @@
 
     
   protected void renderAttributes(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -108,7 +108,7 @@
 
 
   private boolean _hasText(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node)
   {
     // If there's no "source" attribute, then let's guess that
@@ -125,7 +125,7 @@
   * generating content means the script calls document.write/writeln.
   */
   private void _renderDeferAttribute(
-    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/SelectOptionRenderer.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/SelectOptionRenderer.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/SelectOptionRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SelectOptionRenderer.java Wed Jul 26 23:44:58 2006
@@ -20,7 +20,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;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.BaseLafUtils;
 
@@ -32,7 +32,7 @@
        extends OptionContainerRenderer.OptionRenderer
 {
   public void render(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -68,7 +68,7 @@
   }
 
   public boolean render(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     boolean          isDisabled,
     boolean          isReadOnly
@@ -80,7 +80,7 @@
   }
 
   protected void renderAsNonElement(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node) throws IOException
   {
     if (isOptionSelected(context, node))
@@ -90,7 +90,7 @@
   }
 
   protected boolean doRenderStyleAttrs(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -98,14 +98,14 @@
   }
 
   protected void renderContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node) throws IOException
   {
     renderText(context, node);
   }
 
   protected void renderSelectedAttribute(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -115,7 +115,7 @@
   }
 
   protected String getElementName(
-    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/SeparatorRenderer.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/SeparatorRenderer.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/SeparatorRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SeparatorRenderer.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;
 
 /**
@@ -29,7 +29,7 @@
 public class SeparatorRenderer extends XhtmlLafRenderer
 {
   protected void renderContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -37,7 +37,7 @@
   }
   
   protected String getElementName(
-    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/ShowItemRenderer.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/ShowItemRenderer.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/ShowItemRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ShowItemRenderer.java Wed Jul 26 23:44:58 2006
@@ -18,7 +18,7 @@
 import java.io.IOException;
 
 import org.apache.myfaces.trinidadinternal.share.url.URLEncoder;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.BaseLafUtils;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.desktop.SubTabBarUtils;
@@ -33,7 +33,7 @@
 {
 
   protected void renderIndexedChild(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     int              currVisChildIndex,
     int              prevVisChildIndex,
@@ -47,7 +47,7 @@
   
   // Returns the partial change script that is usually rendered for onClick
   protected String getPartialChangeScript(
-    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/SpacerRenderer.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/SpacerRenderer.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/SpacerRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SpacerRenderer.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;
 
 
@@ -32,7 +32,7 @@
 public class SpacerRenderer extends XhtmlLafRenderer
 {
   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/StackLayoutRenderer.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/StackLayoutRenderer.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/StackLayoutRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/StackLayoutRenderer.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;
 
 
@@ -30,7 +30,7 @@
 public class StackLayoutRenderer extends XhtmlLafRenderer
 {  
   protected void renderBetweenIndexedChildren(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     int              nextIndex
     ) throws IOException
@@ -62,7 +62,7 @@
 
 
   protected String getElementName(
-    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/StyledTextRenderer.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/StyledTextRenderer.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/StyledTextRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/StyledTextRenderer.java Wed Jul 26 23:44:58 2006
@@ -21,7 +21,7 @@
 
 import org.apache.myfaces.trinidad.component.UIXValue;
 
-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 @@
 {
 
   protected void renderContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -141,7 +141,7 @@
    * @see #doRenderStyleAttrs
    */
   protected void renderStyleAttrs(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -151,7 +151,7 @@
   }
 
   protected void renderScripts(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode node
     )
     throws IOException
@@ -165,7 +165,7 @@
    * The literal or data bound attribute value should be used instead.
    */
   protected boolean shouldUseFormData(
-    RenderingContext  context,
+    UIXRenderingContext  context,
     UINode            node
     )
   {
@@ -173,7 +173,7 @@
   }
 
   protected Object getInheritedStyleClass(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -181,7 +181,7 @@
   }
 
   protected Object getText(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -192,7 +192,7 @@
 
 
   protected boolean doRenderStyleAttrs(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -201,7 +201,7 @@
 
 
   protected Object getLabeledNodeID(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -212,7 +212,7 @@
 
 
   protected String getElementName(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -239,7 +239,7 @@
   }
 
   private boolean _isEmpty(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     Object           text
     )
@@ -251,7 +251,7 @@
   // Renders an empty span with an ID - this gets rendered if we
   // have no text
   private void _renderEmptySpan(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object          id
     ) throws IOException
   {
@@ -270,7 +270,7 @@
    * @throws IOException
    */
   private void _renderDescription(
-    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/SubmitButtonRenderer.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/SubmitButtonRenderer.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/SubmitButtonRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SubmitButtonRenderer.java Wed Jul 26 23:44:58 2006
@@ -19,7 +19,7 @@
 
 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;
 import org.apache.myfaces.trinidadinternal.ui.action.ClientAction;
 import org.apache.myfaces.trinidadinternal.ui.action.ClientActionUtils;
 import org.apache.myfaces.trinidadinternal.ui.collection.Parameter;
@@ -35,7 +35,7 @@
 public class SubmitButtonRenderer extends ResetButtonRenderer
 {
   protected void renderAttributes(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -69,7 +69,7 @@
    * Returns the Object storing the name value pairs
    */
   public static String[] getNameValues(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -176,7 +176,7 @@
    * of the SubmitButton
    */
   public static String createJSFunctionCall(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     String           formName
     )
@@ -228,7 +228,7 @@
    * Returns the Javascript function call to return for this button.
    */
   protected String getFunctionCall(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     String           formName
     )

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/TableLayoutRenderer.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/TableLayoutRenderer.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/TableLayoutRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/TableLayoutRenderer.java Wed Jul 26 23:44:58 2006
@@ -19,7 +19,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;
 
 
@@ -33,7 +33,7 @@
    * Renders attributes of the current node.
    */
   protected void renderAttributes(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -77,7 +77,7 @@
   }
 
   protected String getElementName(
-    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/TextInputRenderer.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/TextInputRenderer.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/TextInputRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/TextInputRenderer.java Wed Jul 26 23:44:58 2006
@@ -25,7 +25,7 @@
 
 import org.apache.myfaces.trinidadinternal.ui.AttributeKey;
 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.UIConstants;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 import org.apache.myfaces.trinidadinternal.ui.action.ClientAction;
@@ -44,14 +44,14 @@
 {
 
   protected void renderAsNonElement(
-    RenderingContext context, UINode node) throws IOException
+    UIXRenderingContext context, UINode node) throws IOException
   {
     renderContent(context, node, false);
   }
 
 
   protected void renderAttributes(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -184,7 +184,7 @@
    * Returns true if the passed in columns should be shrunken when displaying
    */
   protected boolean shrinkColumns(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     // assume that columns don't need to be shrunken
@@ -214,7 +214,7 @@
    * Renders event handlers for the node.
    */
   protected void renderEventHandlers(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -230,7 +230,7 @@
    * the name.
    */
   protected Object getNodeName(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -249,7 +249,7 @@
   }
 
   protected Object getOnKeyPress(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -295,7 +295,7 @@
 
 
   protected Object getOnChange(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -333,7 +333,7 @@
    * Override to write any client JavaScript dependencies for the validater.
    */
   protected void prerender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -371,14 +371,14 @@
 
 
   protected void renderContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node) throws IOException
   {
     renderContent(context, node, true);
   }
 
   protected void renderContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     boolean          renderAsElement) throws IOException
   {
@@ -467,7 +467,7 @@
   }
 
   protected void postrender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node) throws IOException
   {
     super.postrender(context, node);
@@ -482,7 +482,7 @@
   }
 
   private void _writeTextWithBreaks(
-    RenderingContext context,
+    UIXRenderingContext context,
     BreakIterator    breaks,
     String           textString,
     int              columns) throws IOException
@@ -509,7 +509,7 @@
   }
 
   private void _writeTextLineWithBreaks(
-    RenderingContext context,
+    UIXRenderingContext context,
     BreakIterator    breaks,
     String           textString,
     int              columns) throws IOException
@@ -554,7 +554,7 @@
 
 
   protected Object getColumns(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -562,7 +562,7 @@
   }
 
   protected String getElementName(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -573,7 +573,7 @@
 
 
   protected Object getDefaultStyleClass(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -584,7 +584,7 @@
 
 
   protected Object getDefaultDisabledStyleClass(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -617,7 +617,7 @@
 
   // map this node to <input type="text"> or <textarea>?
   protected boolean isTextArea(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -631,7 +631,7 @@
   }
 
   protected boolean renderReadOnlyAsElement(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node)
   {
     // jrf: hack, hack, hack
@@ -648,7 +648,7 @@
 
 
   protected boolean isNoAutoComplete(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node)
   {
     return (Boolean.TRUE.equals(node.getAttributeValue(context,

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/UniqueCompositeId.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/UniqueCompositeId.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/UniqueCompositeId.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/UniqueCompositeId.java Wed Jul 26 23:44:58 2006
@@ -18,7 +18,7 @@
 import java.util.Hashtable;
 
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlUtils;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
 
 /**
@@ -36,13 +36,13 @@
     return XhtmlUtils.getCompositeId(baseid, suffix);
   }
 
-  public UniqueCompositeId(RenderingContext context,
+  public UniqueCompositeId(UIXRenderingContext context,
                            String baseid)
   {
     this(context, 0, baseid);
   }
 
-  public UniqueCompositeId(RenderingContext context,
+  public UniqueCompositeId(UIXRenderingContext context,
                            int    depth,
                            String baseid)
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.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/XhtmlLafRenderer.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/XhtmlLafRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java Wed Jul 26 23:44:58 2006
@@ -39,7 +39,7 @@
 import org.apache.myfaces.trinidadinternal.ui.AttributeKey;
 import org.apache.myfaces.trinidadinternal.ui.NodeRole;
 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.UIConstants;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 import org.apache.myfaces.trinidadinternal.ui.beans.MarlinBean;
@@ -68,7 +68,7 @@
    * of the current user agent
    */
   public void render(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -92,7 +92,7 @@
    * on a module of XHTML that isn't supported by the current user agent.
    */
   public boolean isSupportedNode(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -105,7 +105,7 @@
    * @param expectedRole the role that must be satisfied
    * @return true iff the structural role of node satisfies the expectedRole.
    * */
-  public static boolean structureSatisfiesRole(RenderingContext context,
+  public static boolean structureSatisfiesRole(UIXRenderingContext context,
                                                UINode node,
                                                NodeRole expectedRole)
   {
@@ -121,7 +121,7 @@
    * Returns true if the agent supports partial rendering of content.
    */
   public static boolean supportsPartialRendering(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     return PartialPageRendererUtils.supportsPartialRendering(context);
@@ -131,7 +131,7 @@
    * Returns true if the agent supports the <code>button</code> tag.
    */
   public static boolean supportsAdvancedButtons(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     return getBooleanAgentCapability(context, AdfFacesAgent.CAP_ADVANCED_BUTTONS);
@@ -141,7 +141,7 @@
    * Returns true if the agent supports vertical alignment
    */
   public static boolean supportsVAlign(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     return getBooleanAgentCapability(context, AdfFacesAgent.CAP_VALIGN);
@@ -151,7 +151,7 @@
    * Returns true if the agent supports wrapping
    */
   public static boolean supportsWrappingDisabled(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     return getBooleanAgentCapability(context, AdfFacesAgent.CAP_NOWRAP);
@@ -161,7 +161,7 @@
    * Returns true if the agent supports alt as a tooltip on images
    */
   public static boolean supportsAltRendersTooltipOnImage(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     return getBooleanAgentCapability(context,
@@ -173,7 +173,7 @@
    * style attributes
    */
   public static boolean renderStyleElements(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
 
@@ -186,7 +186,7 @@
    * Override to add support for rendering syle elements
    */
   protected void prerender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -217,7 +217,7 @@
    * Override to add support for rendering syle elements
    */
   protected void postrender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -234,7 +234,7 @@
     super.postrender(context, node);
   }
 
-  protected void renderShortDesc(RenderingContext context,
+  protected void renderShortDesc(UIXRenderingContext context,
                                  UINode node) throws IOException
   {
     // there is a certain amount of controversy about writing this attribute.
@@ -244,7 +244,7 @@
 
 
   protected void renderAttributesExceptID(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -266,7 +266,7 @@
 
 
   protected void renderAttributes(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -289,7 +289,7 @@
    * @see #getIDOrName
    * @see #getCachedIDOrName */
   protected final void renderNameAndID(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -311,7 +311,7 @@
   }
 
   public static void renderScriptOnce(
-    RenderingContext context,
+    UIXRenderingContext context,
     String script,
     Object key
     ) throws IOException
@@ -343,7 +343,7 @@
    * that this method has been previously called.
    * @return The first time this method is called with a specific context and
    * key, it returns false. On each subsequent call, it returns true.  */
-  public static boolean isPreviouslyRendered(RenderingContext context,
+  public static boolean isPreviouslyRendered(UIXRenderingContext context,
                                              Object key)
   {
     if (context.getProperty(MARLIN_NAMESPACE, key) == null)
@@ -366,7 +366,7 @@
    * @see #renderNameAndID
    * @see #getCachedIDOrName */
   protected final Object getIDOrName(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -387,7 +387,7 @@
    * @see #getIDOrName
    */
   protected final Object getCachedIDOrName(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -413,7 +413,7 @@
   /**
    * Returns the value associated with the text attribute
    */
-  protected Object getText(RenderingContext context,  UINode  node)
+  protected Object getText(UIXRenderingContext context,  UINode  node)
   {
     Object o = node.getAttributeValue(context, TEXT_ATTR);
 
@@ -428,7 +428,7 @@
    * Returns the StyleClass to use to render this node.
    */
   protected Object getStyleClass(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -440,7 +440,7 @@
    * Returns the inline Style used to render this node.
    */
   protected Object getInlineStyle(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -458,7 +458,7 @@
    * @see #renderStyleAttrs
    */
   protected boolean doRenderStyleAttrs(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -466,7 +466,7 @@
   }
 
   public static void renderStyleAndClass(
-    RenderingContext context,
+    UIXRenderingContext context,
     String           inlineStyle,
     Object           styleClass
     ) throws IOException
@@ -509,7 +509,7 @@
    * @see #supportsStyleAttributes
    */
   protected void renderStyleAttrs(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     String           defaultStyleClass
     ) throws IOException
@@ -547,7 +547,7 @@
    * @see #supportsStyleAttributes
    */
   protected void renderStyleAttrs(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -559,7 +559,7 @@
    * Renders the inline style attribute for the specified node
    */
   protected final void renderInlineStyleAttribute(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -570,7 +570,7 @@
    * Renders the inline style attribute for the specified node
    */
   public static void renderInlineStyleAttribute(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object            inlineStyle
     ) throws IOException
   {
@@ -600,7 +600,7 @@
    *   other inline style is rendered.
    */
   public static void renderStyleClassAttributes(
-    RenderingContext context,
+    UIXRenderingContext context,
     String           styleClass1,
     String           styleClass2,
     String           inlineStyleString
@@ -693,7 +693,7 @@
    * If multiple selectors not supported, renders as inline style
    */
   public static void renderStyleClassAttributes(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object[]         styleClasses
     ) throws IOException
   {
@@ -711,7 +711,7 @@
    *   other inline style is rendered.
    */
   public static void renderStyleClassAttributes(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object[]         styleClasses,
     String           inlineStyleString
     ) throws IOException
@@ -789,7 +789,7 @@
    * if one is available.
    */
   public static void renderStyleClassAttribute(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object           styleClass
     ) throws IOException
   {
@@ -816,7 +816,7 @@
    * if one is available.
    */
   private static void _renderStyleClassAttributeImpl(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object           styleClass
     ) throws IOException
   {
@@ -836,7 +836,7 @@
    * @see XhtmlLafUtils#getShortStyleClass
    */
   public static void renderShortStyleClassAttribute(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object           shortStyleClass
     ) throws IOException
   {
@@ -864,7 +864,7 @@
    * @param context the <code>RenderingContext</code>
    * @throws IOException
    */
-  public static void renderOnePixelLine(RenderingContext context) throws IOException {
+  public static void renderOnePixelLine(UIXRenderingContext context) throws IOException {
       final String style = "p_OraOnePixelLine";
       ResponseWriter writer = context.getResponseWriter();
       writer.startElement("div",null);
@@ -886,7 +886,7 @@
    * Note: ResponseWriter.startElement("script", null) must be called
    * before calling this method.
    */
-  public static void renderScriptDeferAttribute(RenderingContext context)
+  public static void renderScriptDeferAttribute(UIXRenderingContext context)
     throws IOException
   {
     // At the moment we only render the defer attribute if
@@ -916,7 +916,7 @@
    * [ =-= mll added 20-Apr-04 to address bug 3426092 ]
    *
    */
-  public static void renderScriptTypeAttribute(RenderingContext context)
+  public static void renderScriptTypeAttribute(UIXRenderingContext context)
     throws IOException
   {
     if (isScreenReaderMode(context))
@@ -931,7 +931,7 @@
    * as elements
    */
   protected final void startRenderingStyleElements(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -946,7 +946,7 @@
    * as elements
    */
   protected final void startRenderingStyleElements(
-    RenderingContext context,
+    UIXRenderingContext context,
     Style            inlineStyle,
     Object           className
     ) throws IOException
@@ -962,7 +962,7 @@
    * Renders event handlers for the node.
    */
   protected void renderEventHandlers(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -986,7 +986,7 @@
 
 
   protected Object getOnClick(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -994,7 +994,7 @@
   }
 
   protected Object getOnDoubleClick(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -1002,7 +1002,7 @@
   }
 
   protected Object getOnKeyDown(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -1010,7 +1010,7 @@
   }
 
   protected Object getOnKeyPress(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -1018,7 +1018,7 @@
   }
 
   protected Object getOnKeyUp(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -1026,7 +1026,7 @@
   }
 
   protected Object getOnMouseDown(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -1034,7 +1034,7 @@
   }
 
   protected Object getOnMouseUp(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -1042,7 +1042,7 @@
   }
 
   protected Object getOnMouseOver(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -1050,7 +1050,7 @@
   }
 
   protected Object getOnMouseMove(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -1058,7 +1058,7 @@
   }
 
   protected Object getOnMouseOut(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -1066,7 +1066,7 @@
   }
 
   protected void renderSpacer(
-    RenderingContext      context,
+    UIXRenderingContext      context,
     Object                width,
     Object                height,
     Object                id
@@ -1080,7 +1080,7 @@
 
 
   protected void renderSpacer(
-    RenderingContext      context,
+    UIXRenderingContext      context,
     Object                width,
     Object                height
     ) throws IOException
@@ -1089,7 +1089,7 @@
   }
 
   protected void renderSpacer(
-    RenderingContext context,
+    UIXRenderingContext context,
     Integer          width,
     Integer          height
     ) throws IOException
@@ -1107,7 +1107,7 @@
 
 
   protected void renderSpacer(
-    RenderingContext context,
+    UIXRenderingContext context,
     int              width,
     int              height
     ) throws IOException
@@ -1130,7 +1130,7 @@
    * @param width
    * @throws IOException
    */
-  protected void renderHorizontalSpacer(RenderingContext context, String width)
+  protected void renderHorizontalSpacer(UIXRenderingContext context, String width)
       throws IOException
   {
     ResponseWriter writer = context.getResponseWriter();
@@ -1139,7 +1139,7 @@
     writer.endElement("b");
   }
 
-  protected void renderVerticalSpacer(RenderingContext context, Object height)
+  protected void renderVerticalSpacer(UIXRenderingContext context, Object height)
       throws IOException
   {
     if (height != null)
@@ -1155,7 +1155,7 @@
    * Renders a transparent gif using a script to save space.
    */
   protected void renderTransparent(
-    RenderingContext context,
+    UIXRenderingContext context,
     String           width,
     String           height,
     boolean          needsQuoting
@@ -1168,7 +1168,7 @@
    * Renders a transparent gif using a script to save space.
    */
   protected void renderTransparent(
-    RenderingContext context,
+    UIXRenderingContext context,
     String           width,
     String           height,
     boolean          needsQuoting,
@@ -1200,7 +1200,7 @@
    * then an html IMG tag will be used.
    */
   private void _renderTransparent(
-    RenderingContext context,
+    UIXRenderingContext context,
     String           width,
     String           height,
     boolean          needsQuoting,
@@ -1320,7 +1320,7 @@
    * the Configuration to form an absolute path.
    */
   protected void renderIcon(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object           iconURL,
     Object           width,
     Object           height
@@ -1335,7 +1335,7 @@
    * the Configuration to form an absolute path.
    */
   protected void renderIcon(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object           iconURL,
     Object           width,
     Object           height,
@@ -1351,7 +1351,7 @@
    * the Configuration to form an absolute path.
    */
   protected final void renderIcon(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object           iconURL,
     Object           width,
     Object           height,
@@ -1388,7 +1388,7 @@
 
 
   protected void renderIcon(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object           iconURL,
     int              width,
     int              height
@@ -1406,7 +1406,7 @@
  * @param isBlock wether the icon should be rendered in block mode
    */
   protected void renderIcon(
-    RenderingContext context,
+    UIXRenderingContext context,
     String           iconAbsoluteURI,
     String           altTextKey,
     Object           destination,
@@ -1472,7 +1472,7 @@
     }
   }
 
-  protected void renderIcon(RenderingContext context, Object iconURL,
+  protected void renderIcon(UIXRenderingContext context, Object iconURL,
       Object width, Object height, boolean isBlock) throws IOException
   {
     String fulluri = getBaseImageURI(context) + iconURL.toString();
@@ -1482,7 +1482,7 @@
 
 
   protected void renderStretchedImage(
-    RenderingContext context,
+    UIXRenderingContext context,
     String           imageURL,
     int              height
     ) throws IOException
@@ -1492,7 +1492,7 @@
 
 
   public static void writeAbsoluteImageURI(
-    RenderingContext context,
+    UIXRenderingContext context,
     String           attribute,
     String           uri) throws IOException
   {
@@ -1508,7 +1508,7 @@
 
 
   protected static void renderHAlign(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object           hAlign) throws IOException
   {
     if (hAlign != null)
@@ -1534,7 +1534,7 @@
 
 
   protected void renderHAlign(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -1546,7 +1546,7 @@
    * Renders the text with the access key highlighted as appropriate.
    */
   protected void renderAccessKeyText(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object           textValue,
     int              keyIndex,
     String           highlightElement
@@ -1594,7 +1594,7 @@
    * Renders the text with the access key highlighted as appropriate.
    */
   protected void renderAccessKeyText(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     Object           textValue,
     String           highlightElement
@@ -1617,7 +1617,7 @@
    * property on first call, and retrieve from cache on subsequent calls.
    */
   protected int getResolvedSelectedIndexFromCache(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode node
     )
   {
@@ -1644,7 +1644,7 @@
    */
 
   public int getResolvedSelectedIndex(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode node )
   {
     //
@@ -1699,7 +1699,7 @@
    * Returns the index of the access key in the specified node's text.
    */
   protected static int getAccessKeyIndex(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     Object           textValue
     )
@@ -1740,7 +1740,7 @@
 
 
   protected static void renderLayoutTableAttributes(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object           cellspacing,
     Object           tableWidth
     ) throws IOException
@@ -1750,7 +1750,7 @@
 
 
   protected static void renderLayoutTableAttributes(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object           cellpadding,
     Object           cellspacing,
     Object           tableWidth
@@ -1765,7 +1765,7 @@
    * (which silences OAC) is rendered
    */
   protected static void renderLayoutTableAttributes(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object           cellpadding,
     Object           cellspacing,
     Object           border,
@@ -1781,7 +1781,7 @@
    * out
    */
   protected static void renderLayoutTableAttributes(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object           cellpadding,
     Object           cellspacing,
     Object           border,
@@ -1802,7 +1802,7 @@
   }
 
   protected static void renderLayoutTableHeader(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object           cellspacing,
     Object           tableWidth
     ) throws IOException
@@ -1817,7 +1817,7 @@
   * Otherwise it renders both the alt and the title attributes.
   */
   public static void renderAltAndTooltipForImage(
-     RenderingContext context,
+     UIXRenderingContext context,
      Object           textValue
      ) throws IOException
   {
@@ -1858,7 +1858,7 @@
   }
 
   final protected void renderPossiblyFormattedText(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object           textValue
     ) throws IOException
   {
@@ -1872,7 +1872,7 @@
   }
 
   final protected void renderFormattedText(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object           textValue) throws IOException
   {
     if (textValue != null)
@@ -1890,7 +1890,7 @@
    * @param blockTitleKey The resource key for this blocks title
    */
   protected final void renderRelatedLinksBlockStart(
-    RenderingContext context,
+    UIXRenderingContext context,
     String blockTitleKey
     ) throws IOException
   {
@@ -1920,7 +1920,7 @@
    * happen.
    */
   protected final void renderRelatedLinksBlockEnd(
-    RenderingContext context
+    UIXRenderingContext context
     ) throws IOException
   {
     if (isScreenReaderMode(context))
@@ -1936,7 +1936,7 @@
   }
 
   protected FormattedTextParser getFormattedTextParser(
-    RenderingContext context)
+    UIXRenderingContext context)
   {
     return XhtmlFormattedText.getFormattedTextParser();
   }
@@ -1946,7 +1946,7 @@
    * Renders the node text using the relevant style information.
    */
   final protected void renderStyledText(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -1957,7 +1957,7 @@
    * Renders the node text using the relevant style information.
    */
   protected void renderStyledText(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     boolean          renderAccessKeys,
     boolean          renderID
@@ -2032,7 +2032,7 @@
   }
 
   protected void addOnSubmitConverterValidators(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     String           requiredMessageKey
   )throws IOException
@@ -2082,7 +2082,7 @@
   }
 
   protected void addOnSubmitRequiredValidator(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     String           requiredMessageKey
   )throws IOException
@@ -2109,7 +2109,7 @@
    * Returns an image from the ImageProvider
    */
   public static String getFlippedIconURI(
-    RenderingContext context,
+    UIXRenderingContext context,
     String           source
     )
   {
@@ -2129,7 +2129,7 @@
   * Get the URI of an image that might need to be flipped
   */
   protected Object getFlippableURI(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     AttributeKey    attrKey
     )
@@ -2161,7 +2161,7 @@
    * Returns an image from the ImageProvider
    */
   public static ImageProviderResponse getFlippedIcon(
-    RenderingContext context,
+    UIXRenderingContext context,
     String           sourceURI
     )
   {
@@ -2196,7 +2196,7 @@
   // Returns the style class, first looking for a local style class
   // property.
   private Object _getLocalStyleClass(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -2235,7 +2235,7 @@
    * @param altText Translated alt text value (ScreenReaders' speak this out)
    */
   private static void _renderSkipNavigationLink(
-    RenderingContext context,
+    UIXRenderingContext context,
     String skipNavigationAnchor,
     String altText
     ) throws IOException

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtils.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/XhtmlLafUtils.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/XhtmlLafUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtils.java Wed Jul 26 23:44:58 2006
@@ -53,7 +53,7 @@
 import org.apache.myfaces.trinidadinternal.style.util.StyleUtils;
 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.UIConstants;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
@@ -76,7 +76,7 @@
    * Copies an attribute from a source node to a destination UINode
    */
   public static void copyAttr(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           sourceNode,
     AttributeKey     attrKey,
     MutableUINode    destNode
@@ -103,7 +103,7 @@
    * initializer, creating any needed form values.
    */
   public static String encodeJSEventObject(
-    RenderingContext context,
+    UIXRenderingContext context,
     String           formName,
     Iterator      keyValues,
     int              keyValueSize
@@ -187,7 +187,7 @@
    * initializer, creating any needed form values.
    */
   public static String encodeJSEventObject(
-    RenderingContext context,
+    UIXRenderingContext context,
     String           formName,
     Object[]         keyValues
     )
@@ -213,7 +213,7 @@
    * Resolves the class name to the appropriate Style object
    */
   public static Style getClassStyle(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object           className
     )
   {
@@ -236,7 +236,7 @@
    * then get a property from the Style
    */
   public static String getClassStyleProperty(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object           className,
     String           propertyName
     )
@@ -255,7 +255,7 @@
    * Resolves the class name to the appropriate Style object
    */
   public static Style getStyleSelector(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object           styleSelector
     )
   {
@@ -277,7 +277,7 @@
    * then get a property from the Style
    */
   public static String getStyleSelectorProperty(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object           selectorName,
     String           propertyName
     )
@@ -296,7 +296,7 @@
    * Returns the short version of the specified style class.
    */
   public static Object getShortStyleClass(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object           styleClass
     )
   {
@@ -361,7 +361,7 @@
    * Returns the mapping of a css vertical-align to a valign attribute value.
    */
   public static String mapVerticalAlignToVAlign(
-    RenderingContext context,
+    UIXRenderingContext context,
     String           verticalAlign
     )
   {
@@ -380,7 +380,7 @@
    * Closes any tags started by startRenderingStyleElements
    */
   public static void endRenderingStyleElements(
-    RenderingContext context
+    UIXRenderingContext context
     ) throws IOException
   {
     Stack[] styleInfo = _getStyleInfo(context);
@@ -426,7 +426,7 @@
    * as elements
    */
   public static void startRenderingStyleElements(
-    RenderingContext context,
+    UIXRenderingContext context,
     Style            inlineStyle,
     Style            classStyle
     ) throws IOException
@@ -660,7 +660,7 @@
 
 
   public static String createCompoundName(
-    RenderingContext context,
+    UIXRenderingContext context,
     String           formName,
     Object           keyValues
     )
@@ -670,7 +670,7 @@
   }
 
   public static String createCompoundName(
-    RenderingContext context,
+    UIXRenderingContext context,
     String           formName,
     Object           keyValues,
     Object           keyExchanges
@@ -779,7 +779,7 @@
   }
 
   public static void addOnSubmitRequiredValidator(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     String           requiredMessageKey,
     Object           nodeName
@@ -836,7 +836,7 @@
    * if needed).
    */
   public static void addLib(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object           libKey
     ) throws IOException
   {
@@ -850,7 +850,7 @@
    * Write out a script element importing a library.
    */
   public static void writeLibImport(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object           libURL) throws IOException
   {
     XhtmlUtils.writeLibImport(context.getFacesContext(),
@@ -862,7 +862,7 @@
    * Returns the partial targets associated with the specified node
    */
   public static String[] getPartialTargets(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -874,7 +874,7 @@
    * including the specified ID.
    */
   public static String[] getPartialTargets(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     Object           id
     )
@@ -922,7 +922,7 @@
    * Returns true if the agent supports transparent images.
    */
   public static boolean supportsTransparentImages(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     AdfFacesAgent agent = context.getAgent();
@@ -958,7 +958,7 @@
    * Renders the specified Icon with the provided attributes.
    */
   public static void renderIcon(
-    RenderingContext context,
+    UIXRenderingContext context,
     Icon             icon,
     Object           shortDesc,
     Object           align
@@ -971,7 +971,7 @@
    * Renders the specified Icon with the provided attributes.
    */
   public static void renderIcon(
-    RenderingContext context,
+    UIXRenderingContext context,
     Icon             icon,
     Object           shortDesc,
     Object           align,
@@ -987,7 +987,7 @@
    * Returns the valign vAlign value for aligning image icons
    * vertically with text on the same line.
    */
-  public static Object getMiddleIconAlignment(RenderingContext context)
+  public static Object getMiddleIconAlignment(UIXRenderingContext context)
   {
     // =-= AEW I haven't been able to find an image alignment
     // that works well for all browsers.  "absmiddle" looks
@@ -1025,7 +1025,7 @@
    * currently scoped form.
    */
   public static Object getFormEncodedValue(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object           transName,
     Object           value)
   {
@@ -1053,7 +1053,7 @@
   /**
    *  Return true if readOnly attribute exists and set to true
    */
-  public static boolean isReadOnly(RenderingContext context, UINode node)
+  public static boolean isReadOnly(UIXRenderingContext context, UINode node)
   {
     Object readOnly = node.getAttributeValue(context, READ_ONLY_ATTR);
     return Boolean.TRUE.equals(readOnly);
@@ -1186,7 +1186,7 @@
    * which provides access to the current RenderingContext.
    */
   static void __pushCurrentRenderingContext(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     assert (context != null);
@@ -1218,7 +1218,7 @@
    * by popping the current RenderingContext off of the stack.
    */
   static void __popCurrentRenderingContext(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     Stack stack = (Stack)context.getProperty(MARLIN_NAMESPACE,
@@ -1234,8 +1234,8 @@
    * Retrieves the current RenderingContext as specified
    * by the last call to __pushCurrentRenderingContext().
    */
-  static RenderingContext __getCurrentRenderingContext(
-    RenderingContext context
+  static UIXRenderingContext __getCurrentRenderingContext(
+    UIXRenderingContext context
     )
   {
     Stack stack = (Stack)context.getProperty(MARLIN_NAMESPACE,
@@ -1244,7 +1244,7 @@
     if ((stack == null) || (stack.empty()))
       return null;
 
-    return (RenderingContext)stack.peek();
+    return (UIXRenderingContext)stack.peek();
   }
 
 
@@ -1365,7 +1365,7 @@
    * necessary.
    */
   private static Stack[] _getStyleInfo(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     XhtmlLafUtils.StyleInfo styleInfo = (StyleInfo)

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/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/simple/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/simple/desktop/ButtonRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ButtonRenderer.java Wed Jul 26 23:44:58 2006
@@ -22,7 +22,7 @@
 
 import org.apache.myfaces.trinidadinternal.image.ImageProviderRequest;
 
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 
 /**
@@ -38,7 +38,7 @@
    * Tests whether the button should be rendered as an image.
    */
   protected boolean doRenderImageContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -56,7 +56,7 @@
    * button image.
    */ 
   protected ImageProviderRequest createImageProviderRequest(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object       name,
     Object       text,
     Color        foreground,
@@ -92,7 +92,7 @@
    * button text.
    */
   protected String getServerStyleName(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     boolean          disabled
     )

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/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/simple/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/simple/desktop/ContentContainerRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ContentContainerRenderer.java Wed Jul 26 23:44:58 2006
@@ -32,7 +32,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;
 
 import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
@@ -53,7 +53,7 @@
    * renderContent().
    */
   protected void renderContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -85,7 +85,7 @@
    * value.
    */
   protected Object getBackground(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -98,7 +98,7 @@
 
   // Get the IconData to use for rendering this contentContainer
   private IconData _getIconData(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -201,7 +201,7 @@
 
   // Renders the header row
   private void _renderHeaderRow(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     IconData         icons,
     Object           text,
@@ -280,7 +280,7 @@
   // Writes out the height attribute for header table cells which
   // contain the header start/end icons.
   private void _writeHeaderIconCellHeight(
-    RenderingContext context,
+    UIXRenderingContext context,
     Icon             icon
     ) throws IOException
   {
@@ -301,7 +301,7 @@
   }
 
   private void _renderContents(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     IconData         icons,
     Object           text,
@@ -324,7 +324,7 @@
 
   // Render the table row with the contents
   private void _renderContentsRow(
-    RenderingContext context,
+    UIXRenderingContext context,
     FacesContext     fContext,
     AdfRenderingContext arc,
     UINode           node,
@@ -558,7 +558,7 @@
   // Tests whether the browser requires a height to be specified
   // in order for a stretched image to show up
   private static boolean _requiresStretchedImageHeight(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     // IE does not display stretched images unless the containing table
@@ -569,7 +569,7 @@
 
   // Gets the Map for stetched icons, and sets alt attribute to "".
   private static Map _getStretchedIconAttrs(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     AdfFacesAgent agent = context.getAgent();

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/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/simple/desktop/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/simple/desktop/GlobalButtonBarRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/GlobalButtonBarRenderer.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.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.skin.Skin;
@@ -53,7 +53,7 @@
    * renders the separator Icon.
    */
   protected void renderBetweenNodes(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -78,7 +78,7 @@
 
   // Returns the separator Icon to render between global buttons
   private static Icon _getSeparatorIcon(
-    RenderingContext context
+    UIXRenderingContext context
     )
   {
     // First, check to see if the Icon has been stored

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/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/simple/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/simple/desktop/GlobalHeaderRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/GlobalHeaderRenderer.java Wed Jul 26 23:44:58 2006
@@ -25,7 +25,7 @@
 
 import org.apache.myfaces.trinidadinternal.skin.Skin;
 import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
-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;
@@ -56,7 +56,7 @@
 public class GlobalHeaderRenderer extends SimpleDesktopRenderer
 {
   protected String getElementName(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -64,7 +64,7 @@
   }
 
   protected void renderAttributes(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )throws IOException
   {
@@ -76,7 +76,7 @@
   }
 
   protected void prerender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
     throws IOException
@@ -126,7 +126,7 @@
   }
 
   protected void renderContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -146,7 +146,7 @@
   }
 
   protected void postrender(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
     throws IOException
@@ -170,7 +170,7 @@
   }
 
   protected void renderIndexedChild(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     int              index
     )throws IOException
@@ -193,7 +193,7 @@
 
 
     protected void renderStamp(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           stamp,
     boolean          selected
     )throws IOException
@@ -219,7 +219,7 @@
    * renders the separator Icon.
    */
   protected void renderBetweenIndexedChildren(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -231,7 +231,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
@@ -246,7 +246,7 @@
    * to OraGlobalHeader.
    */
   protected Object getStyleClass(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -264,7 +264,7 @@
    * Renders the style attributes for global header items
    */
   protected void renderItemStyleAttrs(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     int              index,
     boolean          selected
@@ -282,7 +282,7 @@
 
  // Tests whether the globalHeader has any children
   protected boolean isEmpty(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -303,7 +303,7 @@
   }
 
   protected UIXHierarchy getHierarchyBase(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
   )
   {
@@ -312,7 +312,7 @@
 
 
   protected UINode getStamp(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -321,7 +321,7 @@
 
 
   protected boolean setNewPath(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node,
     UIXHierarchy    component
   )
@@ -335,7 +335,7 @@
 
   // Render child links if we have any
   private void _renderChildren(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
@@ -419,7 +419,7 @@
   // Render the globalHeader's title.  Only called when
   // globalHeader has no children but does have text.
   private void _renderTitle(
-    RenderingContext context,
+    UIXRenderingContext context,
     Object           text
     ) throws IOException
   {
@@ -428,7 +428,7 @@
 
   // Gets the style class for the inner content
   private Object _getContentStyleClass(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -443,7 +443,7 @@
 
   // Gets the title text
   private Object _getText(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -454,7 +454,7 @@
   // Checks to see whether we have some content - either
   // some children or a title
   private boolean _hasContent(
-    RenderingContext context,
+    UIXRenderingContext context,
     UINode           node
     )
   {
@@ -463,7 +463,7 @@
 
 
   // Retrieve the Icons used by this globalHeader
-  private static IconData _getIconData(RenderingContext context)
+  private static IconData _getIconData(UIXRenderingContext context)
   {
     // First check for a local property
     IconData icons = (IconData)context.getLocalProperty(0, _ICONS_KEY, null);
@@ -495,7 +495,7 @@
 
   // Create the IconData for the specified Skin
   private static IconData _createIconData(
-    RenderingContext context)
+    UIXRenderingContext context)
   {
     Icon start = context.getIcon(AF_MENU_BAR_START_ICON_NAME);
     Icon end = context.getIcon(AF_MENU_BAR_END_ICON_NAME);



Mime
View raw message