incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mat...@apache.org
Subject svn commit: r425980 [3/5] - in /incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src: main/java/org/apache/myfaces/trinidadinternal/context/ main/java/org/apache/myfaces/trinidadinternal/convert/ main/java/org/apache/...
Date Thu, 27 Jul 2006 07:00:19 GMT
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormRenderer.java?rev=425980&r1=425979&r2=425980&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormRenderer.java Thu Jul 27 00:00:09 2006
@@ -39,7 +39,7 @@
 import org.apache.myfaces.trinidad.component.UIXPanel;
 
 import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 
 public class PanelFormRenderer extends XhtmlRenderer
 {
@@ -69,7 +69,7 @@
    */
   protected void renderStyleAttributes(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean           bean) throws IOException
   {
     renderStyleAttributes(context, arc, bean, 
@@ -132,7 +132,7 @@
 
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -199,7 +199,7 @@
   
   private void _encodeChildren(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
     List<UIComponent>   footerComponents,
@@ -570,7 +570,7 @@
 
   private void _encodeFormColumns(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     ResponseWriter      rw,
     boolean             startAlignedLabels,
     String              effectiveLabelWidth,
@@ -683,7 +683,7 @@
 
   private static void _encodeGroupDivider(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     ResponseWriter      rw,
     boolean             startAlignedLabels) throws IOException
   {
@@ -706,7 +706,7 @@
 
   private void _encodeFormItem(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     ResponseWriter      rw,
     boolean             startAlignedLabels,
     UIComponent         item) throws IOException
@@ -772,7 +772,7 @@
   
   private static void _encodeBeforeLabelTd(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     ResponseWriter      rw,
     boolean             startAlignedLabels) throws IOException
   {
@@ -799,7 +799,7 @@
    */
   protected static void encodeBetweenLabelAndFieldCells(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     ResponseWriter      rw) throws IOException
   {
     Map requestMap = context.getExternalContext().getRequestMap();

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelGroupRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelGroupRenderer.java?rev=425980&r1=425979&r2=425980&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelGroupRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelGroupRenderer.java Thu Jul 27 00:00:09 2006
@@ -27,7 +27,7 @@
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.core.layout.CorePanelGroup;
 
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 
 public class PanelGroupRenderer extends XhtmlRenderer
 {
@@ -50,7 +50,7 @@
 
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHeaderRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHeaderRenderer.java?rev=425980&r1=425979&r2=425980&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHeaderRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHeaderRenderer.java Thu Jul 27 00:00:09 2006
@@ -26,7 +26,7 @@
 import org.apache.myfaces.trinidad.component.core.layout.CorePanelHeader;
 
 
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
 
 import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
@@ -65,7 +65,7 @@
 
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -153,7 +153,7 @@
   // we use the icon specified via the header's ICON_ATTR.
   protected void renderIcon(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
     String              messageType) throws IOException
@@ -203,7 +203,7 @@
   * Returns text of header
   */
   protected String getText(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean           bean,
     String              messageType
     )
@@ -260,7 +260,7 @@
 
 
   protected static Number getContextHeaderSize(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     Number           defaultValue
     )
   {
@@ -275,7 +275,7 @@
    * Set the size of the header stored on the context
    */
   protected static void setContextHeaderSize(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     Number           size
     )
   {
@@ -288,7 +288,7 @@
    * Returns the current depth of the nesting.
    */
   protected static int getHeaderNestLevel(
-    AdfRenderingContext arc
+    RenderingContext arc
     )
   {
     Number n = (Number) arc.getProperties().get(HEADER_NEST_LEVEL);
@@ -299,7 +299,7 @@
 
 
   protected static void incrementHeaderNestLevel(
-    AdfRenderingContext arc
+    RenderingContext arc
     )throws IOException
   {
     arc.getProperties().put(HEADER_NEST_LEVEL,
@@ -307,7 +307,7 @@
   }
 
   protected static void decrementHeaderNestLevel(
-    AdfRenderingContext arc
+    RenderingContext arc
     )throws IOException
   {
     int headerNestLevel = getHeaderNestLevel(arc);
@@ -342,7 +342,7 @@
 
 
   private int _getAndStoreSize(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean           bean)
   {
     Number sizeNumber = getSize(bean);

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHorizontalRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHorizontalRenderer.java?rev=425980&r1=425979&r2=425980&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHorizontalRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHorizontalRenderer.java Thu Jul 27 00:00:09 2006
@@ -27,7 +27,7 @@
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.core.layout.CorePanelHorizontal;
 
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 
 public class PanelHorizontalRenderer extends XhtmlRenderer
 {
@@ -51,7 +51,7 @@
 
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -96,7 +96,7 @@
    */
   private void _encodeChildren(
     FacesContext context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent  component,
     Object       vAlign,
     Object       hAlign

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelLabelAndMessageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelLabelAndMessageRenderer.java?rev=425980&r1=425979&r2=425980&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelLabelAndMessageRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelLabelAndMessageRenderer.java Thu Jul 27 00:00:09 2006
@@ -26,7 +26,7 @@
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.core.layout.CorePanelLabelAndMessage;
 
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.util.MessageUtils;
 
 
@@ -60,7 +60,7 @@
   
   protected String getLabelFor(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean)
   {
@@ -73,7 +73,7 @@
 
   protected void renderFieldCellContents(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -126,7 +126,7 @@
 
   protected boolean hasMessage(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean)
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelListRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelListRenderer.java?rev=425980&r1=425979&r2=425980&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelListRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelListRenderer.java Thu Jul 27 00:00:09 2006
@@ -27,8 +27,8 @@
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.core.layout.CorePanelList;
 
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
-import org.apache.myfaces.trinidadinternal.renderkit.core.CoreAdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderingContext;
 import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
 
 public class PanelListRenderer extends XhtmlRenderer
@@ -53,7 +53,7 @@
    */
   protected void renderStyleAttributes(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean           bean) throws IOException
   {
     renderStyleAttributes(context, arc, bean,
@@ -68,7 +68,7 @@
 
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -85,13 +85,13 @@
     renderId(context, component);
     renderAllAttributes(context, arc, bean);
 
-    ((CoreAdfRenderingContext) arc).setDefaultLinkStyleDisabled(true);
+    ((CoreRenderingContext) arc).setDefaultLinkStyleDisabled(true);
 
     if (split >= childCount)
       _renderNoColumns(context, arc, component, bean, 0, childCount);
     else
       _renderColumns(context, arc, component, bean, split, childCount);
-    ((CoreAdfRenderingContext) arc).setDefaultLinkStyleDisabled(false);
+    ((CoreRenderingContext) arc).setDefaultLinkStyleDisabled(false);
     writer.endElement("div");
 
   }
@@ -128,7 +128,7 @@
   // multiple columns, and we are rendering a single column.
   private int _renderNoColumns(
     FacesContext context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent  component,
     FacesBean    bean,
     int          start,
@@ -170,7 +170,7 @@
   // render with columns
   private void _renderColumns(
     FacesContext context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent  component,
     FacesBean    bean,
     int          split,
@@ -225,7 +225,7 @@
   }
 
   private int _getMaxColumns(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean bean)
   {
     // get the number of columns
@@ -244,7 +244,7 @@
               SPLIT_DEFAULT;
   }
 
-  private int _getDefaultColumns(AdfRenderingContext arc)
+  private int _getDefaultColumns(RenderingContext arc)
   {
 
     Integer defaultColumns =

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelPartialRootRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelPartialRootRenderer.java?rev=425980&r1=425979&r2=425980&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelPartialRootRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelPartialRootRenderer.java Thu Jul 27 00:00:09 2006
@@ -33,7 +33,7 @@
 
 import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.ppr.PPRResponseWriter;
 import org.apache.myfaces.trinidadinternal.renderkit.core.ppr.ScriptBufferingResponseWriter;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.jsLibs.LibraryScriptlet;
@@ -66,7 +66,7 @@
 
   protected void renderContent(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -76,7 +76,7 @@
 
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -157,7 +157,7 @@
 
   protected void renderAtEnd(
     FacesContext context,
-    AdfRenderingContext arc) throws IOException
+    RenderingContext arc) throws IOException
   {
   }
 
@@ -179,7 +179,7 @@
    */
   private void _renderPartialScripts(
     FacesContext                  context,
-    AdfRenderingContext           arc,
+    RenderingContext           arc,
     ScriptBufferingResponseWriter scriptBufferingWriter) throws IOException
   {
     PartialPageContext pprContext = arc.getPartialPageContext();
@@ -324,14 +324,14 @@
   }
 
   // Is this a partial page rendering pass?
-  protected static boolean isPartialPass(AdfRenderingContext arc)
+  protected static boolean isPartialPass(RenderingContext arc)
   {
     return (PartialPageUtils.isPartialRenderingPass(arc));
   }
 
   protected void renderPPRSupport(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -353,7 +353,7 @@
   // Renders the iframe used to make partial page requests.
   private void _renderPartialIFrame(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component) throws IOException
   {
     // Note: For now we just use the simplest possible strategy -
@@ -440,7 +440,7 @@
   // handling of a partial update.
   private static void _renderPartialBlocking(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component)
     throws IOException
   {
@@ -471,7 +471,7 @@
   // for IE.
   private static void _renderLibraryDownloadElement(
     FacesContext context,
-    AdfRenderingContext arc) throws IOException
+    RenderingContext arc) throws IOException
   {
     // This is to download the libraries from the iframe into the
     // main page on IE.
@@ -503,7 +503,7 @@
 
     protected void outputScriptletContent(
       FacesContext context,
-      AdfRenderingContext arc) throws IOException
+      RenderingContext arc) throws IOException
     {
       ResponseWriter writer = context.getResponseWriter();
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PartialPageUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PartialPageUtils.java?rev=425980&r1=425979&r2=425980&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PartialPageUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PartialPageUtils.java Thu Jul 27 00:00:09 2006
@@ -24,7 +24,7 @@
 import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
 import org.apache.myfaces.trinidadinternal.context.RequestContextBean;
 
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.ppr.PartialPageContext;
 
 /**
@@ -73,7 +73,7 @@
    * Returns true if we are performing a partial page render.
    */
   public static boolean isPartialRenderingPass(
-    AdfRenderingContext arc
+    RenderingContext arc
     )
   {
     PartialPageContext pprContext = arc.getPartialPageContext();
@@ -93,7 +93,7 @@
    * (PPR is considered accessible, so we do not check the accessibility mode)
    */
   public static boolean supportsPartialRendering(
-    AdfRenderingContext arc
+    RenderingContext arc
     )
   {
 
@@ -107,7 +107,7 @@
   }
 
   public static boolean supportsBlocking(
-    AdfRenderingContext arc
+    RenderingContext arc
     )
   {
     // At the moment we have blocking solved on IE and Mozilla

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PdaPanelPageHeaderRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PdaPanelPageHeaderRenderer.java?rev=425980&r1=425979&r2=425980&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PdaPanelPageHeaderRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PdaPanelPageHeaderRenderer.java Thu Jul 27 00:00:09 2006
@@ -25,7 +25,7 @@
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.component.core.layout.CorePanelPageHeader;
 
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 
 
 /**
@@ -48,7 +48,7 @@
 
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/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/renderkit/core/xhtml/ProcessUtils.java?rev=425980&r1=425979&r2=425980&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ProcessUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ProcessUtils.java Thu Jul 27 00:00:09 2006
@@ -20,7 +20,7 @@
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.jsLibs.Scriptlet;
 import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
 
@@ -107,7 +107,7 @@
 
   public static void renderNavSubmitScript(
     FacesContext        context,
-    AdfRenderingContext arc
+    RenderingContext arc
     ) throws IOException
   {
     XhtmlUtils.addLib(context, arc, _NAV_SUBMIT_SCRIPTLET);
@@ -115,7 +115,7 @@
 
   public static void renderNavChoiceSubmitScript(
     FacesContext        context,
-    AdfRenderingContext arc
+    RenderingContext arc
     ) throws IOException
   {
     XhtmlUtils.addLib(context, arc,_NAV_CHOICE_SUBMIT_SCRIPTLET);
@@ -138,7 +138,7 @@
 
     protected void outputScriptletContent(
       FacesContext context,
-      AdfRenderingContext arc) throws IOException
+      RenderingContext arc) throws IOException
     {
       context.getResponseWriter().writeText(_NAV_SUBMIT_SCRIPT, null);
     }
@@ -162,7 +162,7 @@
 
     protected void outputScriptletContent(
       FacesContext context,
-      AdfRenderingContext arc) throws IOException
+      RenderingContext arc) throws IOException
     {
       ResponseWriter writer = context.getResponseWriter();
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectInputColorRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectInputColorRenderer.java?rev=425980&r1=425979&r2=425980&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectInputColorRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectInputColorRenderer.java Thu Jul 27 00:00:09 2006
@@ -20,7 +20,7 @@
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.core.input.CoreSelectInputColor;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 
 public class SelectInputColorRenderer extends InputLabelAndMessageRenderer
 {
@@ -42,7 +42,7 @@
   
   protected String getLabelFor(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean)
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.java?rev=425980&r1=425979&r2=425980&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.java Thu Jul 27 00:00:09 2006
@@ -39,7 +39,7 @@
 import org.apache.myfaces.trinidad.event.RangeChangeEvent;
 
 import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
 import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
 import org.apache.myfaces.trinidadinternal.util.Range;
@@ -271,7 +271,7 @@
    */
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -577,7 +577,7 @@
   /**
    * render form value needed values and javascript code.
    */
-  public static void addHiddenFields(AdfRenderingContext arc)
+  public static void addHiddenFields(RenderingContext arc)
   {
     FormData fData = arc.getFormData();
     fData.addNeededValue(XhtmlConstants.EVENT_PARAM);
@@ -588,7 +588,7 @@
 
   private void _renderChoice(
    FacesContext        context,
-   AdfRenderingContext arc,
+   RenderingContext arc,
    UIComponent         component,
    String              id,
    String              source,
@@ -718,7 +718,7 @@
    */
   private int _getItems(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     List                items,
     long                minValue, long maxValue, long value,
@@ -875,7 +875,7 @@
   }
 
   private SelectItem _createShowAllSelectItem(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     long                maxValue)
   {
     String[] parameters = new String[]{IntegerUtils.getString(maxValue)};
@@ -890,7 +890,7 @@
   // create a choice option when max value is known
   private SelectItem _createNavigationItem(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     long             blockStart,
     int              blockSize,
@@ -927,7 +927,7 @@
   // create one of the text links for navigation
   private void _renderLink(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     boolean             isNext,
     String              onclick,
     int                 records,
@@ -975,7 +975,7 @@
   /**
    */
   protected Icon getIcon(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     boolean             isNext,
     boolean             isEnabled
     )
@@ -1031,7 +1031,7 @@
    */
   private void _renderArrow(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     Icon                icon,
     boolean             isNext,
     String              onclick) throws IOException
@@ -1059,7 +1059,7 @@
    * in a table navigation bar.
    */
   protected String getBlockString(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     boolean             isNext,
     int                 numRecords
     )
@@ -1096,7 +1096,7 @@
    */
   private String _getRangeString(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent      component,
     long             start,
     int              visibleItemCount,
@@ -1249,7 +1249,7 @@
    */
   protected void renderItemSpacer(
    FacesContext context,
-   AdfRenderingContext arc) throws IOException
+   RenderingContext arc) throws IOException
   {
     if (arc.getAgent().getAgentType() == AdfFacesAgent.TYPE_PDA)
     {
@@ -1267,7 +1267,7 @@
    */
   private void _renderSpacerCell(
     FacesContext       context,
-    AdfRenderingContext arc
+    RenderingContext arc
     ) throws IOException
   {
     ResponseWriter writer = context.getResponseWriter();
@@ -1293,7 +1293,7 @@
   }
 
   private String _getIDForFocus(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     String              baseId
     )
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailHeaderRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailHeaderRenderer.java?rev=425980&r1=425979&r2=425980&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailHeaderRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailHeaderRenderer.java Thu Jul 27 00:00:09 2006
@@ -27,7 +27,7 @@
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.core.layout.CoreShowDetailHeader;
 
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderer;
 
 public class ShowDetailHeaderRenderer
@@ -55,7 +55,7 @@
 
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -75,7 +75,7 @@
     }
   }
 
-  protected void renderIcon(FacesContext context, AdfRenderingContext arc, 
+  protected void renderIcon(FacesContext context, RenderingContext arc, 
                             UIComponent component, FacesBean bean, String messageType)
     throws IOException
   {
@@ -116,7 +116,7 @@
     }
 
     protected void renderAllAttributes(FacesContext context, 
-                                       AdfRenderingContext arc, 
+                                       RenderingContext arc, 
                                        FacesBean bean)
       throws IOException
     {
@@ -127,7 +127,7 @@
       return true;
     }
 
-    protected String getDisclosureText(AdfRenderingContext arc, 
+    protected String getDisclosureText(RenderingContext arc, 
                                        FacesBean bean, boolean disclosed)
     {
       return null;

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailItemRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailItemRenderer.java?rev=425980&r1=425979&r2=425980&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailItemRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailItemRenderer.java Thu Jul 27 00:00:09 2006
@@ -27,7 +27,7 @@
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.core.layout.CoreShowDetailItem;
 
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidad.event.DisclosureEvent;
 import org.apache.myfaces.trinidad.context.RequestContext;
 
@@ -85,7 +85,7 @@
 
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailRenderer.java?rev=425980&r1=425979&r2=425980&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailRenderer.java Thu Jul 27 00:00:09 2006
@@ -25,7 +25,7 @@
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.core.layout.CoreShowDetail;
 
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
 import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 
@@ -58,7 +58,7 @@
    */
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -130,7 +130,7 @@
 
   protected void renderPromptStart(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -160,7 +160,7 @@
 
   static public void renderDisclosureIcon(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     boolean             disclosed,
     String              disclosedAltTextKey,
     String              undisclosedAltTextKey) throws IOException
@@ -183,7 +183,7 @@
 
   protected void renderDisclosureIcon(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     boolean             disclosed) throws IOException
   {
     renderDisclosureIcon(context, arc, disclosed,
@@ -203,7 +203,7 @@
 
   // Returns the disclosure Icon
   private static Icon _getDisclosureIcon(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     boolean             disclosed
     )
   {
@@ -215,7 +215,7 @@
   }
 
   protected String getDisclosureText(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean           bean,
     boolean             disclosed)
   {
@@ -252,7 +252,7 @@
 
   private void _renderScripts(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component) throws IOException
   {
     if (!supportsNavigation(arc))
@@ -338,7 +338,7 @@
 
   private void _renderLinkStart(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     String           onclickString ) throws IOException
   {
     if (!supportsNavigation(arc))
@@ -352,7 +352,7 @@
 
   private String _generateOnClickString(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
     boolean             disclosed)
@@ -406,7 +406,7 @@
 
   private void _renderLinkEnd(
     FacesContext        context,
-    AdfRenderingContext arc) throws IOException
+    RenderingContext arc) throws IOException
   {
     if (!supportsNavigation(arc))
       return;

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputFileRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputFileRenderer.java?rev=425980&r1=425979&r2=425980&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputFileRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputFileRenderer.java Thu Jul 27 00:00:09 2006
@@ -22,7 +22,7 @@
 
 import org.apache.myfaces.trinidad.component.core.input.CoreInputFile;
 
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.webapp.UploadedFiles;
 
 /**
@@ -136,7 +136,7 @@
     return "af|inputFile::content";
   }
 
-  protected Integer getDefaultColumns(AdfRenderingContext arc, FacesBean bean)
+  protected Integer getDefaultColumns(RenderingContext arc, FacesBean bean)
   {
     return null;
   }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java?rev=425980&r1=425979&r2=425980&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java Thu Jul 27 00:00:09 2006
@@ -29,7 +29,7 @@
 import org.apache.myfaces.trinidad.component.core.input.CoreInputText;
 
 import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
 
 /**
@@ -89,7 +89,7 @@
 
   protected void encodeAllAsElement(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -154,7 +154,7 @@
        
   protected void renderAllAttributes(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean           bean,
     boolean             renderStyleAttrs) throws IOException
   {
@@ -263,7 +263,7 @@
    * Returns the default number of text input columns
    * =-=AEW MOVE ONTO BEAN TYPE?
    */
-  protected Integer getDefaultColumns(AdfRenderingContext arc, FacesBean bean)
+  protected Integer getDefaultColumns(RenderingContext arc, FacesBean bean)
   {
     if (arc.getAgent().getAgentType() == AdfFacesAgent.TYPE_PDA)
       return _DEFAULT_PDA_COLUMNS;
@@ -292,7 +292,7 @@
 
   protected void encodeAllAsNonElement(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -333,7 +333,7 @@
    */
   protected void renderNonElementContent(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -343,7 +343,7 @@
 
   protected void renderContent(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
     boolean             renderAsElement,
@@ -555,7 +555,7 @@
     if (isTextArea(bean) &&
         getReadOnly(FacesContext.getCurrentInstance(), bean))
     {
-      AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+      RenderingContext arc = RenderingContext.getCurrentInstance();
       if (!supportsReadonlyFormElements(arc))
       {
         onfocus = (String) XhtmlUtils.getChainedJS("this.blur()",
@@ -574,7 +574,7 @@
     String onchange = super.getOnchange(bean);
     if (isAutoSubmit(bean))
     {
-      AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+      RenderingContext arc = RenderingContext.getCurrentInstance();
       String source = LabelAndMessageRenderer.__getCachedClientId(arc);
       boolean immediate = isImmediate(bean);
       String auto = AutoSubmitUtils.getSubmitScript(arc, source, immediate);
@@ -665,7 +665,7 @@
    * @todo RENABLE ONFOCUS HACK
    */
   protected boolean renderReadOnlyAsElement(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean           bean)
   {
     // We render read-only single-line input fields as plain text

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectBooleanCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectBooleanCheckboxRenderer.java?rev=425980&r1=425979&r2=425980&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectBooleanCheckboxRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectBooleanCheckboxRenderer.java Thu Jul 27 00:00:09 2006
@@ -20,7 +20,7 @@
 
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.component.core.input.CoreSelectBooleanCheckbox;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 
 /**
  */
@@ -55,7 +55,7 @@
   //encode
   //**********************
 
-  protected Object getValueAttr(AdfRenderingContext arc)
+  protected Object getValueAttr(RenderingContext arc)
   {
     // HTML 3.2 specification, default value for checkboxes
     return "t";

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectBooleanRadioRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectBooleanRadioRenderer.java?rev=425980&r1=425979&r2=425980&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectBooleanRadioRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectBooleanRadioRenderer.java Thu Jul 27 00:00:09 2006
@@ -23,7 +23,7 @@
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.core.input.CoreSelectBooleanRadio;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 
 /**
  */
@@ -71,7 +71,7 @@
   //encode
   //**********************
 
-  protected Object getValueAttr(AdfRenderingContext arc)
+  protected Object getValueAttr(RenderingContext arc)
   {
     return arc.getCurrentClientId();
   }
@@ -115,7 +115,7 @@
 
   protected void renderNameAttribute(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean           bean
     )throws IOException
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectBooleanRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectBooleanRenderer.java?rev=425980&r1=425979&r2=425980&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectBooleanRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectBooleanRenderer.java Thu Jul 27 00:00:09 2006
@@ -24,7 +24,7 @@
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRendererUtils;
 import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
 
@@ -50,7 +50,7 @@
   //**********************
 
 
-  abstract protected Object getValueAttr(AdfRenderingContext arc);
+  abstract protected Object getValueAttr(RenderingContext arc);
 
   abstract protected Object getType();
 
@@ -66,7 +66,7 @@
 
   protected void renderNameAttribute(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean           bean
     )throws IOException
   {
@@ -79,7 +79,7 @@
    */
   protected void encodeAllAsElement(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -175,7 +175,7 @@
 
   protected void encodeAllAsNonElement(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -254,7 +254,7 @@
 
   protected void renderAccessKeyAttribute(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean           bean) throws IOException
   {
   }  
@@ -264,7 +264,7 @@
    */
   protected void renderText(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
     boolean             renderAccessKeys,
@@ -301,7 +301,7 @@
     FacesBean bean
   )
   {
-    AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+    RenderingContext arc = RenderingContext.getCurrentInstance();
     String source = LabelAndMessageRenderer.__getCachedClientId(arc);
     boolean immediate = isImmediate(bean);
     boolean isRadio = isRadio();
@@ -347,7 +347,7 @@
    * it does not have any text.
    */
   private boolean _isLabelTagRendered(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     String              text,
     char                accessKey
     )
@@ -367,7 +367,7 @@
    */
   private void _renderPartialId(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     String              clientId
   )throws IOException
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputColorRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputColorRenderer.java?rev=425980&r1=425979&r2=425980&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputColorRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputColorRenderer.java Thu Jul 27 00:00:09 2006
@@ -38,7 +38,7 @@
 
 import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
 import org.apache.myfaces.trinidadinternal.convert.ColorConverter;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRendererUtils;
 import org.apache.myfaces.trinidadinternal.renderkit.core.pages.GenericEntry;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.jsLibs.AliasedScriptlet;
@@ -155,7 +155,7 @@
 
   protected void encodeAllAsElement(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -178,7 +178,7 @@
 
   protected void renderTextField(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -212,7 +212,7 @@
 
   protected void renderContent(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
     boolean             renderAsElement,
@@ -230,7 +230,7 @@
 
   protected void renderAfterTextField(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -251,7 +251,7 @@
 
   protected void renderIcon(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -281,7 +281,7 @@
 
   protected String getLaunchOnclick(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -313,7 +313,7 @@
   protected String getOnfocus(FacesBean bean)
   {
     String onfocus = super.getOnfocus(bean);
-    AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+    RenderingContext arc = RenderingContext.getCurrentInstance();
     if (!_supportsSwatchAndChooser(arc))
       return onfocus;
 
@@ -340,7 +340,7 @@
   protected String getOnblur(FacesBean bean)
   {
     String onblur = super.getOnblur(bean);
-    if (!_supportsSwatchAndChooser(AdfRenderingContext.getCurrentInstance()))
+    if (!_supportsSwatchAndChooser(RenderingContext.getCurrentInstance()))
       return XhtmlUtils.getChainedJS(_AUTO_FORMAT_SCRIPT,
                                      onblur, false);
 
@@ -351,7 +351,7 @@
 
 
 
-  protected Integer getDefaultColumns(AdfRenderingContext arc, FacesBean bean)
+  protected Integer getDefaultColumns(RenderingContext arc, FacesBean bean)
   {
     Converter converter = getConverter(bean);
 
@@ -403,7 +403,7 @@
     return "af|selectInputColor::content";
   }
 
-  private String _getChooseId(AdfRenderingContext arc)
+  private String _getChooseId(RenderingContext arc)
   {
     return (String) arc.getProperties().get(_CACHED_CHOOSE_ID);
   }
@@ -420,21 +420,21 @@
   }
 
   // On PDAs, we only support a simple text field
-  private boolean _supportsSwatchAndChooser(AdfRenderingContext arc)
+  private boolean _supportsSwatchAndChooser(RenderingContext arc)
   {
     return (arc.getAgent().getAgentType() != AdfFacesAgent.TYPE_PDA);
   }
 
   protected String getSearchDesc(FacesBean bean)
   {
-    AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+    RenderingContext arc = RenderingContext.getCurrentInstance();
     if (isInaccessibleMode(arc))
       return null;
 
     return arc.getTranslatedString(_LAUNCH_PICKER_TIP_KEY);
   }
 
-  private String _getColorSwatchId(AdfRenderingContext arc)
+  private String _getColorSwatchId(RenderingContext arc)
   {
     return arc.getCurrentClientId() + "$sw";
   }
@@ -442,7 +442,7 @@
 
   private void _renderColorSwatch(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
     boolean             editable) throws IOException
@@ -533,7 +533,7 @@
   // a given chooseId, and if so renders a script
   private void _renderFirstColorFieldScript(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     String              chooseId
     ) throws IOException

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputDateRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputDateRenderer.java?rev=425980&r1=425979&r2=425980&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputDateRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputDateRenderer.java Thu Jul 27 00:00:09 2006
@@ -42,7 +42,7 @@
 
 import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
 import org.apache.myfaces.trinidadinternal.convert.GenericConverterFactory;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRendererUtils;
 import org.apache.myfaces.trinidadinternal.renderkit.core.pages.GenericEntry;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.jsLibs.ConfigurationScriptlet;
@@ -172,7 +172,7 @@
 
   protected void encodeAllAsElement(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -193,7 +193,7 @@
 
   protected void renderIcon(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -261,7 +261,7 @@
   protected String getOnblur(FacesBean bean)
   {
     String onblur = super.getOnblur(bean);
-    AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+    RenderingContext arc = RenderingContext.getCurrentInstance();
     String chooseId = _getChooseId(arc);
 
     int length = _BLUR_PREFIX.length() + 4;
@@ -286,7 +286,7 @@
   protected String getOnfocus(FacesBean bean)
   {
     String onfocus = super.getOnfocus(bean);
-    AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+    RenderingContext arc = RenderingContext.getCurrentInstance();
     String chooseId = _getChooseId(arc);
 
     // The special _dff handler is only needed for date fields
@@ -320,7 +320,7 @@
 
   protected String getLaunchOnclick(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -380,7 +380,7 @@
   }
 
 
-  protected Integer getDefaultColumns(AdfRenderingContext arc, FacesBean bean)
+  protected Integer getDefaultColumns(RenderingContext arc, FacesBean bean)
   {
     Converter converter = getConverter(bean);
 
@@ -410,7 +410,7 @@
 
   protected String getSearchDesc(FacesBean bean)
   {
-    AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+    RenderingContext arc = RenderingContext.getCurrentInstance();
     if (isInaccessibleMode(arc))
       return null;
 
@@ -428,7 +428,7 @@
     return "af|selectInputDate::content";
   }
 
-  private String _getChooseId(AdfRenderingContext arc)
+  private String _getChooseId(RenderingContext arc)
   {
     return (String) arc.getProperties().get(_CACHED_CHOOSE_ID);
   }
@@ -449,7 +449,7 @@
   // it.
   private void _checkIfActive(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     String              chooseId
     ) throws IOException
@@ -599,7 +599,7 @@
 
     protected void outputScriptletContent(
       FacesContext context,
-      AdfRenderingContext arc)
+      RenderingContext arc)
       throws IOException
     {
       // get the tzOffset for the current date. I will compare this with

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputTextRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputTextRenderer.java?rev=425980&r1=425979&r2=425980&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputTextRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputTextRenderer.java Thu Jul 27 00:00:09 2006
@@ -35,7 +35,7 @@
 
 import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
 import org.apache.myfaces.trinidadinternal.agent.AgentUtil;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
 
 /**
@@ -127,7 +127,7 @@
 
   protected void encodeAllAsElement(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -149,7 +149,7 @@
   
   protected void encodeAllAsNonElement(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -178,7 +178,7 @@
   
   protected void renderTextField(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -187,7 +187,7 @@
 
   protected void renderAfterTextField(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -202,7 +202,7 @@
 
   protected void renderIcon(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -273,7 +273,7 @@
    */
   protected String getLaunchOnclick(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyCheckboxRenderer.java?rev=425980&r1=425979&r2=425980&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyCheckboxRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyCheckboxRenderer.java Thu Jul 27 00:00:09 2006
@@ -32,7 +32,7 @@
 import org.apache.myfaces.trinidad.component.core.input.CoreSelectManyCheckbox;
 
 import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
 
 /**
@@ -57,7 +57,7 @@
   //
   protected void encodeElementContent(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
     List                selectItems,
@@ -105,7 +105,7 @@
 
   protected void encodeSelectItems(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
     List                selectItems,
@@ -155,7 +155,7 @@
 
   protected boolean encodeSelectItem(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     SelectItem          item,
     Converter           converter,
@@ -239,7 +239,7 @@
 
   protected void renderBetweenNonElements(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -298,7 +298,7 @@
   /**
    * Get the onclick for the individual radio buttons.
    */
-  protected String getItemOnclick(AdfRenderingContext arc, FacesBean bean)
+  protected String getItemOnclick(RenderingContext arc, FacesBean bean)
   {
     // Get the overall onclick, and merge in any needed autosubmit script
     String onclick = super.getOnclick(bean);
@@ -328,7 +328,7 @@
 
   // Never render the "hidden label";  labels entirely go on the individual
   // items
-  protected boolean isHiddenLabelRequired(AdfRenderingContext arc)
+  protected boolean isHiddenLabelRequired(RenderingContext arc)
   {
     return false;
   } 
@@ -342,7 +342,7 @@
    return "af|selectManyCheckbox";
   }
   
-  private static boolean _applyFieldSetWrapper(AdfRenderingContext arc)
+  private static boolean _applyFieldSetWrapper(RenderingContext arc)
   {
     // Don't bother with the output in inaccessible mode
     if (isInaccessibleMode(arc))

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyListboxRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyListboxRenderer.java?rev=425980&r1=425979&r2=425980&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyListboxRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyListboxRenderer.java Thu Jul 27 00:00:09 2006
@@ -31,7 +31,7 @@
 
 import org.apache.myfaces.trinidad.component.core.input.CoreSelectManyListbox;
 
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
 
 /**
@@ -54,7 +54,7 @@
 
   protected void encodeElementContent(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
     List                selectItems,
@@ -103,7 +103,7 @@
     String onchange = super.getOnchange(bean);
     if (isAutoSubmit(bean))
     {
-      AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+      RenderingContext arc = RenderingContext.getCurrentInstance();
       String source = LabelAndMessageRenderer.__getCachedClientId(arc);
       boolean immediate = isImmediate(bean);
       String auto = AutoSubmitUtils.getSubmitScript(arc, source, immediate);

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyRenderer.java?rev=425980&r1=425979&r2=425980&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyRenderer.java Thu Jul 27 00:00:09 2006
@@ -42,7 +42,7 @@
 import org.apache.myfaces.trinidad.util.MessageFactory;
 
 import org.apache.myfaces.trinidadinternal.convert.ConverterUtils;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.uix.SelectItemSupport;
 
 /**
@@ -304,7 +304,7 @@
 
   protected void encodeAllAsElement(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -376,7 +376,7 @@
    */
   abstract protected void encodeElementContent(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
     List                selectItems,
@@ -386,7 +386,7 @@
 
   protected void renderNonElementContent(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -421,7 +421,7 @@
 
   protected void renderBetweenNonElements(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneChoiceRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneChoiceRenderer.java?rev=425980&r1=425979&r2=425980&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneChoiceRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneChoiceRenderer.java Thu Jul 27 00:00:09 2006
@@ -31,7 +31,7 @@
 
 import org.apache.myfaces.trinidad.component.core.input.CoreSelectOneChoice;
 
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 
 /**
  */
@@ -54,7 +54,7 @@
   // 
   protected void encodeElementContent(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
     List                selectItems,
@@ -76,7 +76,7 @@
 
   protected void encodeSelectItems(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
     List                selectItems,
@@ -130,7 +130,7 @@
   protected String getOnclick(
     FacesBean bean)
   {
-    AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+    RenderingContext arc = RenderingContext.getCurrentInstance();
     String onclick = super.getOnclick(bean);
     if (isIE(arc) && isAutoSubmit(bean))
     {
@@ -158,7 +158,7 @@
   protected String getOnblur(
     FacesBean bean)
   {
-    AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+    RenderingContext arc = RenderingContext.getCurrentInstance();
     String onblur = super.getOnblur(bean);
     if (isIE(arc) && isAutoSubmit(bean))
     {
@@ -179,7 +179,7 @@
     FacesBean bean
     )
   {
-    AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+    RenderingContext arc = RenderingContext.getCurrentInstance();
 
     String onchange = super.getOnchange(bean);
     String auto = null;
@@ -223,7 +223,7 @@
   }   
 
   // Is this choice in a branch of the tree that is repeated:
-  static private boolean _isRepeatingRegion(AdfRenderingContext arc)
+  static private boolean _isRepeatingRegion(RenderingContext arc)
   {
     // check to make sure that repeating property is set, and that this choice
     // has a name (see bug 3194812):

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneListboxRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneListboxRenderer.java?rev=425980&r1=425979&r2=425980&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneListboxRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneListboxRenderer.java Thu Jul 27 00:00:09 2006
@@ -31,7 +31,7 @@
 
 import org.apache.myfaces.trinidad.component.core.input.CoreSelectOneListbox;
 
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
 
 /**
@@ -73,7 +73,7 @@
   // 
   protected void encodeElementContent(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
     List                selectItems,
@@ -127,7 +127,7 @@
     String onchange = super.getOnchange(bean);
     if (isAutoSubmit(bean))
     {
-      AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+      RenderingContext arc = RenderingContext.getCurrentInstance();
       String auto = getAutoSubmitScript(arc, bean);
       return XhtmlUtils.getChainedJS(onchange, auto, true);
     }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRadioRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRadioRenderer.java?rev=425980&r1=425979&r2=425980&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRadioRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRadioRenderer.java Thu Jul 27 00:00:09 2006
@@ -32,7 +32,7 @@
 import org.apache.myfaces.trinidad.component.core.input.CoreSelectOneRadio;
 
 import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
 
 /**
@@ -58,7 +58,7 @@
   //
   protected void encodeElementContent(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
     List                selectItems,
@@ -106,7 +106,7 @@
 
   protected void encodeSelectItems(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
     List                selectItems,
@@ -158,7 +158,7 @@
 
   protected boolean encodeSelectItem(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     SelectItem          item,
     Converter           converter,
@@ -289,7 +289,7 @@
   /**
    * Get the onclick for the individual radio buttons.
    */
-  protected String getItemOnclick(AdfRenderingContext arc, FacesBean bean)
+  protected String getItemOnclick(RenderingContext arc, FacesBean bean)
   {
     // Get the overall onclick, and merge in any needed autosubmit script
     String onclick = super.getOnclick(bean);
@@ -324,7 +324,7 @@
 
   // Never render the "hidden label";  labels entirely go on the individual
   // items
-  protected boolean isHiddenLabelRequired(AdfRenderingContext arc)
+  protected boolean isHiddenLabelRequired(RenderingContext arc)
   {
     return false;
   }
@@ -339,7 +339,7 @@
     return "af|selectOneRadio";
   }     
 
-  private static boolean _applyFieldSetWrapper(AdfRenderingContext arc)
+  private static boolean _applyFieldSetWrapper(RenderingContext arc)
   {
     // Don't bother with the output in inaccessible mode
     if (isInaccessibleMode(arc))

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRenderer.java?rev=425980&r1=425979&r2=425980&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRenderer.java Thu Jul 27 00:00:09 2006
@@ -35,7 +35,7 @@
 import org.apache.myfaces.trinidad.component.UIXSelectOne;
 
 import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.uix.SelectItemSupport;
 import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
 
@@ -103,7 +103,7 @@
    */
   static public boolean encodeOption(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     SelectItem          item,
     Converter           converter,
@@ -221,7 +221,7 @@
    */
   protected void encodeAllAsElement(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -287,7 +287,7 @@
 
   abstract   protected void encodeElementContent(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
     List                selectItems,
@@ -297,7 +297,7 @@
 
   protected void renderNonElementContent(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -420,7 +420,7 @@
   }
 
   protected String getAutoSubmitScript(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean           bean)
   {
     String source = LabelAndMessageRenderer.__getCachedClientId(arc);

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StyleSheetRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StyleSheetRenderer.java?rev=425980&r1=425979&r2=425980&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StyleSheetRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StyleSheetRenderer.java Thu Jul 27 00:00:09 2006
@@ -26,8 +26,8 @@
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.component.core.CoreStyleSheet;
 
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
-import org.apache.myfaces.trinidadinternal.renderkit.core.CoreAdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderingContext;
 
 import org.apache.myfaces.trinidadinternal.style.StyleContext;
 import org.apache.myfaces.trinidadinternal.style.StyleProvider;
@@ -74,7 +74,7 @@
 
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     FacesBean           bean) throws IOException
   {
@@ -138,10 +138,10 @@
           context.getExternalContext().getInitParameter(
                                  DISABLE_CONTENT_COMPRESSION)))
       {
-        if (arc instanceof CoreAdfRenderingContext)
+        if (arc instanceof CoreRenderingContext)
         {
           Map shortStyles = StyleUtils.getShortStyleClasses(sContext, provider);
-          ((CoreAdfRenderingContext) arc).setStyleMap(shortStyles);
+          ((CoreRenderingContext) arc).setStyleMap(shortStyles);
         }
       }
     }



Mime
View raw message