incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mat...@apache.org
Subject svn commit: r425942 [5/15] - in /incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src: main/java/org/apache/myfaces/trinidadinternal/agent/ main/java/org/apache/myfaces/trinidadinternal/agent/parse/ main/java/org/apache/my...
Date Thu, 27 Jul 2006 03:39:51 GMT
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/AutoSubmitUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/AutoSubmitUtils.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/AutoSubmitUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/AutoSubmitUtils.java Wed Jul 26 20:39:26 2006
@@ -17,7 +17,6 @@
 package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml;
 
 import java.io.IOException;
-
 import java.util.List;
 
 import javax.faces.component.UIComponent;
@@ -25,7 +24,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.renderkit.core.xhtml.jsLibs.XhtmlScriptletFactory;
 
@@ -39,7 +38,7 @@
 {
   public static void writeDependencies(
     FacesContext        context,
-    AdfRenderingContext arc
+    RenderingContext arc
     ) throws IOException
   {
     // Render our scriptlet
@@ -94,7 +93,7 @@
   }
     
   public static String getFullPageSubmitScript(
-     AdfRenderingContext arc,
+     RenderingContext arc,
      String              source,
      boolean             immediate,
      String              event,
@@ -174,7 +173,7 @@
   }
 
   public static String getSubmitScript(
-     AdfRenderingContext arc,
+     RenderingContext arc,
      String              source,
      boolean             immediate
      )
@@ -183,7 +182,7 @@
   }
 
   public static String getSubmitScript(
-     AdfRenderingContext arc,
+     RenderingContext arc,
      String              source,
      boolean             immediate,
      boolean             isRadio)
@@ -195,7 +194,7 @@
    * TODO: remove "isRadio", which shouldn't be necessary
    */
   public static String getSubmitScript(
-     AdfRenderingContext arc,
+     RenderingContext arc,
      String              source,
      boolean             immediate,
      boolean             isRadio,
@@ -290,7 +289,7 @@
 
     protected void outputScriptletContent(
       FacesContext context,
-      AdfRenderingContext arc)
+      RenderingContext arc)
       throws IOException
     {
       // Make sure we have a form

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java Wed Jul 26 20:39:26 2006
@@ -16,10 +16,8 @@
 package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml;
 
 import java.beans.Beans;
-
 import java.io.IOException;
 
-
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
@@ -27,10 +25,8 @@
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.html.HtmlBody;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
-
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.skin.Skin;
 
 
@@ -64,7 +60,7 @@
 
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -80,7 +76,7 @@
 
   protected void renderAtEnd(
     FacesContext context,
-    AdfRenderingContext arc) throws IOException
+    RenderingContext arc) throws IOException
   {
     context.getResponseWriter().endElement("body");
 
@@ -89,7 +85,7 @@
 
   protected void renderPPRSupport(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -107,7 +103,7 @@
 
   protected void renderContent(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -147,7 +143,7 @@
     FacesBean    bean) throws IOException
   {
     super.renderEventHandlers(context, bean);
-    AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+    RenderingContext arc = RenderingContext.getCurrentInstance();
     ResponseWriter rw = context.getResponseWriter();
 
     if (PartialPageUtils.isPartialRenderingPass(arc))
@@ -190,7 +186,7 @@
     return toString(bean.getProperty(_initialFocusIdKey));
   }
 
-  protected String getOnload(AdfRenderingContext arc, FacesBean bean)
+  protected String getOnload(RenderingContext arc, FacesBean bean)
   {
     String onload = toString(bean.getProperty(_onloadKey));
     if (PartialPageUtils.supportsPartialRendering(arc))
@@ -202,7 +198,7 @@
     return onload;
   }
 
-  protected String getOnunload(AdfRenderingContext arc, FacesBean bean)
+  protected String getOnunload(RenderingContext arc, FacesBean bean)
   {
     String onunload = toString(bean.getProperty(_onunloadKey));
     if (PartialPageUtils.supportsPartialRendering(arc))
@@ -235,7 +231,7 @@
 
   private void _renderNoScript(
     FacesContext        context,
-    AdfRenderingContext arc) throws IOException
+    RenderingContext arc) throws IOException
   {
     // Some accessibility standards rather oddly claim that NOSCRIPT
     // tags are essential for compliance.  So, render NOSCRIPT, at
@@ -256,7 +252,7 @@
   }
 
   private void _storeInitialFocus(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean           bean)
   {
 
@@ -291,7 +287,7 @@
   //
   private void _renderInitialFocusScript(
     FacesContext        context,
-    AdfRenderingContext arc
+    RenderingContext arc
     ) throws IOException
   {
 
@@ -327,7 +323,7 @@
   // the user used the Back button to go back to the page.
   private static void _renderPartialBackSupportSpan(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     boolean             isStart
     ) throws IOException
   {
@@ -374,7 +370,7 @@
 
 
   private static boolean _isPartialBackSupported(
-    AdfRenderingContext arc
+    RenderingContext arc
     )
   {
     /*
@@ -394,7 +390,7 @@
   //
   static private void _writeVersionInformation(
     FacesContext context,
-    AdfRenderingContext arc)
+    RenderingContext arc)
     throws IOException
   {
     String comment = _VERSION_COMMENT;
@@ -428,7 +424,7 @@
       comment += ", skin:" + skinId;
 
       // Also log preferred Skin if we have one
-      AdfFacesContext adfFacesContext = AdfFacesContext.getCurrentInstance();
+      RequestContext adfFacesContext = RequestContext.getCurrentInstance();
       String preferredSkin = adfFacesContext.getSkinFamily();
       if (preferredSkin != null)
         comment += (" (" + preferredSkin.toString() + ")");

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ChooseDateRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ChooseDateRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ChooseDateRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ChooseDateRenderer.java Wed Jul 26 20:39:26 2006
@@ -16,9 +16,7 @@
 package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml;
 
 import java.io.IOException;
-
 import java.text.DateFormatSymbols;
-
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
@@ -27,23 +25,18 @@
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 
-import org.apache.myfaces.trinidad.logging.ADFLogger;
-
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.core.input.CoreChooseDate;
-
-import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
-
-
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
+import org.apache.myfaces.trinidad.logging.ADFLogger;
 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.core.pages.GenericEntry;
 import org.apache.myfaces.trinidadinternal.share.nls.LocaleContext;
 import org.apache.myfaces.trinidadinternal.share.url.EncoderUtils;
 import org.apache.myfaces.trinidadinternal.share.util.FastMessageFormat;
+import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
+import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
 
 /**
  * Renders the calendar.
@@ -95,7 +88,7 @@
 
   protected final void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -519,7 +512,7 @@
    */
   protected void renderNextPrev(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent      component,
     FacesBean        bean,
     boolean          isPrev,
@@ -620,7 +613,7 @@
    */
   private void _renderNextPrev(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
     boolean          isPrev,
@@ -690,7 +683,7 @@
    * Creates the base navigation URL
    */
   private String _createNavURL(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     String           destinationString,
     long             minTime,
     long             maxTime,
@@ -721,7 +714,7 @@
    * Creates the params for navigation URL
    */
   private String[] _createNavURLParams(
-    AdfRenderingContext  arc,
+    RenderingContext  arc,
     long                 minTime,
     long                 maxTime,
     long                 selectedTime,
@@ -771,7 +764,7 @@
 
   private void _renderMonthChoice(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     String[]          months,
     Calendar          currentTime,
     int               visibleMonth,
@@ -840,7 +833,7 @@
 
   private void _renderYearChoice(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     Calendar         currentTime,
     int              year,
     int              minimumYear,
@@ -1002,7 +995,7 @@
    */
   private void _renderMonthAndYear(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     long              minTime,
     long              maxTime,
     Calendar          displayedCalendar,
@@ -1114,7 +1107,7 @@
 
 
   private static long _getTimeAttr(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean   bean,
     PropertyKey key,
     long        defaultTime
@@ -1194,7 +1187,7 @@
    * Returns a Calendar, given Locale information
    */
   private static Calendar _getCalendar(
-    AdfRenderingContext arc
+    RenderingContext arc
     )
   {
     LocaleContext localeContext = arc.getLocaleContext();
@@ -1215,7 +1208,7 @@
    * Returns a Calendar, given a time and Locale information
    */
   private static Calendar _getCalendar(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     long                time
     )
   {
@@ -1249,7 +1242,7 @@
    * Returns the minimum pickable time
    */
 
-  private long _getMinTime(AdfRenderingContext arc, FacesBean bean)
+  private long _getMinTime(RenderingContext arc, FacesBean bean)
   {
     return _getTimeAttr(arc, bean, _minValueKey, _MIN_TIME);
   }
@@ -1258,7 +1251,7 @@
   /**
    * Returns the maximum pickable time
    */
-  private long _getMaxTime(AdfRenderingContext arc, FacesBean bean)
+  private long _getMaxTime(RenderingContext arc, FacesBean bean)
   {
     return _getTimeAttr(arc, bean, _maxValueKey, _MAX_TIME);
   }
@@ -1268,7 +1261,7 @@
    * Returns the Calendar to display
    */
   private Calendar _getDisplayedCalendar(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean           bean,
     long                minTime,
     long                maxTime,
@@ -1293,7 +1286,7 @@
    * Returns the time of the displayed day.
    */
   private long _getDisplayedTime(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean        bean,
     long             minTime,
     long             maxTime,
@@ -1312,7 +1305,7 @@
    * Returns the time of the selected day.
    */
   private long _getSelectedTime(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean bean,
     long      minTime,
     long      maxTime
@@ -1349,7 +1342,7 @@
 
 
   private FastMessageFormat _getTitleFormat(
-    AdfRenderingContext arc
+    RenderingContext arc
     )
   {
     return _getMessageFormat(arc,
@@ -1357,7 +1350,7 @@
   }
 
   private FastMessageFormat _getBeforeFormat(
-    AdfRenderingContext arc
+    RenderingContext arc
     )
   {
     return _getMessageFormat(arc,
@@ -1365,7 +1358,7 @@
   }
 
   private FastMessageFormat _getAfterFormat(
-    AdfRenderingContext arc
+    RenderingContext arc
     )
   {
     return _getMessageFormat(arc,
@@ -1373,7 +1366,7 @@
   }
 
   private FastMessageFormat _getMessageFormat(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     String              translationKey)
   {
     FastMessageFormat format =
@@ -1383,7 +1376,7 @@
   }
 
   private static DateFormatSymbols _getDateFormatSymbols(
-    AdfRenderingContext arc
+    RenderingContext arc
     )
   {
     DateFormatSymbols symbols = (DateFormatSymbols)
@@ -1457,7 +1450,7 @@
   }
 
   // Tests whether the current environment supports inline mode
-  protected static boolean isInlineSupported(AdfRenderingContext arc)
+  protected static boolean isInlineSupported(RenderingContext arc)
   {
     // Inline mode is only supported if partial page rendering is
     // supported and we are not running in screen reader mode.

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.java Wed Jul 26 20:39:26 2006
@@ -16,7 +16,6 @@
 package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml;
 
 import java.io.IOException;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -28,20 +27,16 @@
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.UIXCollection;
 import org.apache.myfaces.trinidad.component.core.data.CoreColumn;
+import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidad.model.SortCriterion;
-
 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.core.xhtml.table.CellUtils;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.ColumnData;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.RenderStage;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.TableRenderingContext;
-
 import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
-
 import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-import org.apache.myfaces.trinidad.logging.ADFLogger;
 
 /**
  * @todo Kill the now-strange "compute mode", since we can
@@ -182,7 +177,7 @@
    */
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -217,7 +212,7 @@
 
   private void _renderHeaderMode(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     TableRenderingContext tContext,
     UIComponent           column) throws IOException
   {
@@ -291,7 +286,7 @@
    */
   private String _renderColumnHeader(
     FacesContext          context,
-    AdfRenderingContext   arc,
+    RenderingContext   arc,
     TableRenderingContext tContext,
     UIComponent           column,
     int                   rowSpan,
@@ -338,7 +333,7 @@
    */
   protected final String renderHeaderAndSpan(
     FacesContext          context,
-    AdfRenderingContext   arc,
+    RenderingContext   arc,
     TableRenderingContext tContext,
     UIComponent           column,
     int                   rowSpan,
@@ -443,7 +438,7 @@
    * @return an inline style String to be rendered on headers (used on
    *  special subclasses)
    */
-  protected String getHeaderInlineStyle(AdfRenderingContext arc)
+  protected String getHeaderInlineStyle(RenderingContext arc)
   {
     return null;
   }
@@ -452,7 +447,7 @@
   /**
    */
   protected String getSortingOnclick(
-    AdfRenderingContext   arc,
+    RenderingContext   arc,
     TableRenderingContext tContext,
     UIComponent           column,
     int                   sortability)
@@ -521,7 +516,7 @@
 
   protected void renderHeaderContents(
     FacesContext          context,
-    AdfRenderingContext   arc,
+    RenderingContext   arc,
     TableRenderingContext tContext,
     UIComponent           column,
     int                   sortability,
@@ -543,7 +538,7 @@
    */
   protected void renderSortOrderSymbol(
     FacesContext       context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     int                 sortability,
     Icon                icon,
     String              sortOnclick
@@ -647,7 +642,7 @@
   }
 
   protected boolean hasSortingIcon(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     int                 sortability)
   {
     return sortability != SORT_NO;

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnRenderer.java Wed Jul 26 20:39:26 2006
@@ -16,7 +16,6 @@
 package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml;
 
 import java.io.IOException;
-
 import java.util.Iterator;
 import java.util.List;
 
@@ -24,14 +23,11 @@
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 
-import org.apache.myfaces.trinidad.logging.ADFLogger;
-
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.component.UIXColumn;
 import org.apache.myfaces.trinidad.component.core.data.CoreColumn;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
-
+import org.apache.myfaces.trinidad.logging.ADFLogger;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.BandingData;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.CellUtils;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.ColumnData;
@@ -52,7 +48,7 @@
    */
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -126,7 +122,7 @@
 
 
   protected void renderKids(FacesContext          context,
-                            AdfRenderingContext   arc,
+                            RenderingContext   arc,
                             TableRenderingContext trc,
                             UIComponent           column) throws IOException
   {
@@ -160,7 +156,7 @@
    * @todo This dual-purpose method is creepy.
    */
   private void _renderKids(FacesContext          context,
-                           AdfRenderingContext   arc,
+                           RenderingContext   arc,
                            TableRenderingContext tContext,
                            UIComponent           column,
                            int          kid) throws IOException
@@ -199,7 +195,7 @@
 
   private void _renderDataMode(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     TableRenderingContext tContext,
     UIComponent           column)
     throws IOException
@@ -274,7 +270,7 @@
    * @todo Generate Unique IDs correctly!
    */
   private void _renderTD(FacesContext          context,
-                         AdfRenderingContext   arc,
+                         RenderingContext   arc,
                          TableRenderingContext tContext,
                          UIComponent           column,
                          int kidIndex,
@@ -370,7 +366,7 @@
   /**
    */
   private void _computeMode(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     TableRenderingContext tContext,
     UIComponent           component,
     FacesBean             bean)
@@ -426,7 +422,7 @@
 
   private void _renderFooterMode(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     TableRenderingContext tContext,
     UIComponent           column)
     throws IOException
@@ -475,7 +471,7 @@
 
   private void _renderHeaderMode(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     TableRenderingContext tContext,
     UIComponent           column)
     throws IOException
@@ -569,7 +565,7 @@
 
   public static String renderDataStyleClass(
     FacesContext          context,
-    AdfRenderingContext   arc,
+    RenderingContext   arc,
     TableRenderingContext tContext)
     throws IOException
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandLinkRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandLinkRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandLinkRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandLinkRenderer.java Wed Jul 26 20:39:26 2006
@@ -16,7 +16,6 @@
 package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml;
 
 import java.io.IOException;
-
 import java.util.Map;
 
 import javax.faces.component.UIComponent;
@@ -26,10 +25,9 @@
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.core.nav.CoreCommandLink;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 import org.apache.myfaces.trinidad.event.ReturnEvent;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 
 public class CommandLinkRenderer extends GoLinkRenderer
 {
@@ -47,7 +45,7 @@
 
   public void decode(FacesContext context, UIComponent component)
   {
-    AdfFacesContext afContext = AdfFacesContext.getCurrentInstance();
+    RequestContext afContext = RequestContext.getCurrentInstance();
     ReturnEvent returnEvent =
       afContext.getDialogService().getReturnEvent(component);
     if (returnEvent != null)
@@ -73,7 +71,7 @@
   
   protected void encodeBegin(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     FacesBean           bean) throws IOException
   {
@@ -101,7 +99,7 @@
 
   public void encodeEnd(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     FacesBean           bean) throws IOException
   {
@@ -116,7 +114,7 @@
     UIComponent  component)
   {
     // Use the cached version
-    return AdfRenderingContext.getCurrentInstance().getCurrentClientId();
+    return RenderingContext.getCurrentInstance().getCurrentClientId();
   }
 
   protected String getDestination(FacesBean bean)
@@ -139,7 +137,7 @@
   protected String getOnclick(FacesBean bean)
   {
     String onclick = super.getOnclick(bean);
-    AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+    RenderingContext arc = RenderingContext.getCurrentInstance();
     String id = arc.getCurrentClientId();
     boolean immediate = getImmediate(bean);
     

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/DesktopPanelPageHeaderRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/DesktopPanelPageHeaderRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/DesktopPanelPageHeaderRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/DesktopPanelPageHeaderRenderer.java Wed Jul 26 20:39:26 2006
@@ -25,8 +25,7 @@
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.core.layout.CorePanelPageHeader;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderer;
 import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
 
@@ -60,7 +59,7 @@
 
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -79,7 +78,7 @@
 
   protected void encodeAllDesktop(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -422,7 +421,7 @@
    */
   private void  _renderNavigation1(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     ResponseWriter      writer,
     UIComponent         navigation1,
     boolean             isRTL
@@ -476,7 +475,7 @@
    */
   private void _renderSearch(
     FacesContext context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     ResponseWriter   writer,
     UIComponent           search,
     int              colSpan

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/DocumentRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/DocumentRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/DocumentRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/DocumentRenderer.java Wed Jul 26 20:39:26 2006
@@ -22,8 +22,7 @@
 
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.component.core.CoreDocument;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderer;
 
 
@@ -60,7 +59,7 @@
 
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/EditableValueRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/EditableValueRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/EditableValueRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/EditableValueRenderer.java Wed Jul 26 20:39:26 2006
@@ -16,7 +16,6 @@
 package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml;
 
 import java.io.IOException;
-
 import java.util.Iterator;
 
 import javax.faces.component.EditableValueHolder;
@@ -26,12 +25,11 @@
 import javax.faces.convert.ConverterException;
 import javax.faces.el.ValueBinding;
 
-import org.apache.myfaces.trinidad.logging.ADFLogger;
-
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.UIXEditableValue;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidad.logging.ADFLogger;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 
 abstract public class EditableValueRenderer extends ValueRenderer
 {
@@ -159,7 +157,7 @@
 
   protected void addOnSubmitConverterValidators(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean
   )throws IOException

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormData.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormData.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormData.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormData.java Wed Jul 26 20:39:26 2006
@@ -15,7 +15,6 @@
  */
 package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml;
 import java.io.IOException;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -23,21 +22,20 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-
 import java.util.Set;
+
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.convert.Converter;
 import javax.faces.validator.Validator;
 
-import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidad.component.UIXEditableValue;
 import org.apache.myfaces.trinidad.convert.ClientConverter;
+import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidad.util.MessageFactory;
 import org.apache.myfaces.trinidad.validator.ClientValidator;
-
 import org.apache.myfaces.trinidadinternal.convert.InternalClientConverter;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.share.data.ServletRequestParameters;
 import org.apache.myfaces.trinidadinternal.share.util.FastMessageFormat;
 import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
@@ -735,7 +733,7 @@
         (null == contentType))
     {
       XhtmlUtils.addLib(context,
-                        AdfRenderingContext.getCurrentInstance(),
+                        RenderingContext.getCurrentInstance(),
                         libReference);
     }
   }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormElementRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormElementRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormElementRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormElementRenderer.java Wed Jul 26 20:39:26 2006
@@ -23,8 +23,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;
 
 abstract public class FormElementRenderer extends EditableValueRenderer
 {
@@ -51,7 +50,7 @@
 
   protected final void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -66,7 +65,7 @@
   }
 
 
-  protected boolean isHiddenLabelRequired(AdfRenderingContext arc)
+  protected boolean isHiddenLabelRequired(RenderingContext arc)
   {
     return true;
   }
@@ -75,7 +74,7 @@
    */
   protected void renderShortDescAsHiddenLabel(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean)
     throws IOException
@@ -102,7 +101,7 @@
 
   protected void encodeAllAsElement(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -113,7 +112,7 @@
    */
   protected void encodeAllAsNonElement(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -134,7 +133,7 @@
    */
   protected void renderNonElementContent(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -165,7 +164,7 @@
    */
   protected final boolean renderAsElement(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean           bean)
   {
     if (getReadOnly(context, bean) || !supportsEditing(arc))
@@ -184,7 +183,7 @@
   }
 
   protected boolean renderReadOnlyAsElement(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean           bean)
   {
     return false;

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormInputRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormInputRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormInputRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormInputRenderer.java Wed Jul 26 20:39:26 2006
@@ -16,15 +16,13 @@
 package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml;
 
 import java.io.IOException;
+
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 
-
 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;
 
 abstract public class FormInputRenderer extends FormElementRenderer
 {
@@ -69,7 +67,7 @@
 
   protected void renderDisabledAttribute(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean           bean) throws IOException
   {
    
@@ -92,7 +90,7 @@
    */
   protected void renderAllAttributes(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean           bean,
     boolean             renderStyleAttrs) throws IOException
   {
@@ -122,7 +120,7 @@
    */  
   protected void renderRootDomElementStyles(
   FacesContext        context,
-  AdfRenderingContext arc,
+  RenderingContext arc,
   UIComponent         component,
   FacesBean           bean) throws IOException
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java Wed Jul 26 20:39:26 2006
@@ -16,7 +16,6 @@
 package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml;
 
 import java.io.IOException;
-
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -29,23 +28,19 @@
 import javax.faces.context.ResponseWriter;
 import javax.faces.convert.Converter;
 
-import org.apache.myfaces.trinidad.logging.ADFLogger;
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.UIXForm;
 import org.apache.myfaces.trinidad.component.core.CoreForm;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
-
 import org.apache.myfaces.trinidad.context.Agent;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
+import org.apache.myfaces.trinidad.logging.ADFLogger;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.CoreResponseStateManager;
 import org.apache.myfaces.trinidadinternal.renderkit.core.ppr.PartialPageContext;
 import org.apache.myfaces.trinidadinternal.renderkit.uix.SubformRenderer;
-
-// TODO: Remove this class
 import org.apache.myfaces.trinidadinternal.share.data.ServletRequestParameters;
-
+import org.apache.myfaces.trinidadinternal.ui.UINode;
 import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
 
 /**
@@ -94,7 +89,7 @@
 
   protected void encodeBegin(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     FacesBean           bean) throws IOException
   {
@@ -196,7 +191,7 @@
 
   protected void encodeEnd(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     FacesBean           bean) throws IOException
   {
@@ -344,7 +339,7 @@
   // Renders reset call code
   private static void _renderResetCalls(
     FacesContext context,
-    AdfRenderingContext arc) throws IOException
+    RenderingContext arc) throws IOException
   {
 
     // if scripting isn't supported, no need to do the rest
@@ -410,7 +405,7 @@
   // Renders validation code
   private static void _renderValidationScripts(
     FacesContext        context,
-    AdfRenderingContext arc
+    RenderingContext arc
     ) throws IOException
   {
     // if scripting isn't supported, no need to do the rest
@@ -453,7 +448,7 @@
     boolean hasImmediateComponent = fData.hasImmediateComponent();
 
     boolean isClientValidationDisabled =
-      AdfFacesContext.getCurrentInstance().isClientValidationDisabled();
+      RequestContext.getCurrentInstance().isClientValidationDisabled();
 
     if (isClientValidationDisabled || hasImmediateComponent)
     {
@@ -818,7 +813,7 @@
   // this script should be rendered at the very end of the form.
   private static void _renderSubmitFormCheck(
     FacesContext        context,
-    AdfRenderingContext arc
+    RenderingContext arc
     ) throws IOException
   {
     // if scripting isn't supported, no need to do the rest
@@ -846,7 +841,7 @@
     String           call
     )
   {
-    FormData fData = AdfRenderingContext.getCurrentInstance().getFormData();
+    FormData fData = RenderingContext.getCurrentInstance().getFormData();
     fData.addResetCall(call);
   }
 
@@ -860,7 +855,7 @@
     String           requiredMessageKey
     ) throws IOException
   {
-    FormData fData = AdfRenderingContext.getCurrentInstance().getFormData();
+    FormData fData = RenderingContext.getCurrentInstance().getFormData();
 
     fData.addOnSubmitConverterValidators(component,
                                          converter,
@@ -886,7 +881,7 @@
     String           label
     )
   {
-    FormData fData = AdfRenderingContext.getCurrentInstance().getFormData();
+    FormData fData = RenderingContext.getCurrentInstance().getFormData();
     fData.addLabel(targetID, label);
   }
 
@@ -904,14 +899,14 @@
     String           pattern
     )
   {
-    FormData fData = AdfRenderingContext.getCurrentInstance().getFormData();
+    FormData fData = RenderingContext.getCurrentInstance().getFormData();
     fData.addPattern(targetID, pattern);
   }
 
   public static String getDefaultCommandId(
   )
   {
-    FormData fData = AdfRenderingContext.getCurrentInstance().getFormData();
+    FormData fData = RenderingContext.getCurrentInstance().getFormData();
     return fData.getDefaultCommandId();
   }
 
@@ -919,20 +914,20 @@
   public static int getInputTextCount(
   )
   {
-    FormData fData = AdfRenderingContext.getCurrentInstance().getFormData();
+    FormData fData = RenderingContext.getCurrentInstance().getFormData();
     return fData.getInputTextCount();
   }
 
   public static void incrementInputTextCount(
   )
   {
-    FormData fData = AdfRenderingContext.getCurrentInstance().getFormData();
+    FormData fData = RenderingContext.getCurrentInstance().getFormData();
     fData.incrementInputTextCount();
   }
 
   // Returns the ID to use for our postscript if PPR is supported
   private static String _getPostscriptId(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     String formName
     )
   {
@@ -1068,7 +1063,7 @@
    */
   static private void _renderNeededValues(
     FacesContext        context,
-    AdfRenderingContext arc
+    RenderingContext arc
     ) throws IOException
   {
     ResponseWriter writer = context.getResponseWriter();

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java Wed Jul 26 20:39:26 2006
@@ -24,10 +24,9 @@
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.core.nav.CoreGoLink;
-
 import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
-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;
 
 public class GoLinkRenderer extends XhtmlRenderer
 {
@@ -56,7 +55,7 @@
 
   protected void encodeBegin(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     FacesBean           bean) throws IOException
   {
@@ -113,7 +112,7 @@
 
   public void encodeEnd(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     FacesBean           bean) throws IOException
   {
@@ -201,8 +200,8 @@
     String styleClass = super.getStyleClass(bean);
     if (styleClass == null)
     {
-      AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
-      if (!((CoreAdfRenderingContext) arc).isDefaultLinkStyleDisabled())
+      RenderingContext arc = RenderingContext.getCurrentInstance();
+      if (!((CoreRenderingContext) arc).isDefaultLinkStyleDisabled())
         styleClass = getDefaultStyleClass(bean);
     }
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GroupRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GroupRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GroupRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GroupRenderer.java Wed Jul 26 20:39:26 2006
@@ -17,17 +17,13 @@
 
 import java.io.IOException;
 
-import java.util.List;
-
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 
 import org.apache.myfaces.trinidad.bean.FacesBean;
-import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.core.CoreGroup;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 
 public class GroupRenderer extends XhtmlRenderer
 {
@@ -43,7 +39,7 @@
 
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HeadRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HeadRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HeadRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HeadRenderer.java Wed Jul 26 20:39:26 2006
@@ -21,18 +21,15 @@
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.html.HtmlHead;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.myfaces.trinidadinternal.share.config.UIXCookie;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderer;
+import org.apache.myfaces.trinidadinternal.share.config.UIXCookie;
 
 /**
  * Renderer for meta data section of the document--a.k.a <head>.
@@ -60,7 +57,7 @@
 
   protected void encodeBegin(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     FacesBean           bean) throws IOException
   {
@@ -90,7 +87,7 @@
 
   protected void encodeEnd(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     FacesBean           bean) throws IOException
   {
@@ -106,7 +103,7 @@
     return toString(bean.getProperty(_titleKey));
   }
 
-  private boolean _skipRendering(AdfRenderingContext arc)
+  private boolean _skipRendering(RenderingContext arc)
   {
     return (PartialPageUtils.isPartialRenderingPass(arc) &&
             PartialPageUtils.supportsPartialRendering(arc) &&
@@ -131,7 +128,7 @@
 
 
   static private void _writeCookieScript(
-   FacesContext context, AdfRenderingContext arc)
+   FacesContext context, RenderingContext arc)
     throws IOException
   { 
     if (_needsCookieScript(context, arc))
@@ -142,7 +139,7 @@
 
   static private boolean _needsCookieScript(
     FacesContext context,
-    AdfRenderingContext arc)
+    RenderingContext arc)
   {
     // Disable the Cookie script for portlets
     // =-=AEW Right or wrong?
@@ -177,7 +174,7 @@
             tz.getID().startsWith("GMT"));
   }
 
-  static private boolean _supportsUIXCookie(AdfRenderingContext arc)
+  static private boolean _supportsUIXCookie(RenderingContext arc)
   {
     // =-=AEW We used to have a configuration hook for disabling
     // the cookie.

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HiddenLabelUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HiddenLabelUtils.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HiddenLabelUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HiddenLabelUtils.java Wed Jul 26 20:39:26 2006
@@ -22,7 +22,7 @@
 import javax.faces.context.ResponseWriter;
 
 import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 
 public class HiddenLabelUtils
 {
@@ -30,7 +30,7 @@
    * Identifies whether the current agent supports the hidden label
    * trick.
    */
-  static public boolean supportsHiddenLabels(AdfRenderingContext arc)
+  static public boolean supportsHiddenLabels(RenderingContext arc)
   {
     if (XhtmlRenderer.isInaccessibleMode(arc))
       return false;
@@ -72,7 +72,7 @@
    * a particular ID.
    */
   static public boolean wantsHiddenLabel(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     String              id)
   {
     if (id == null)
@@ -93,7 +93,7 @@
    */
   static public void outputHiddenLabelIfNeeded(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     String              id,
     Object              text,
     UIComponent         component
@@ -111,7 +111,7 @@
    */
   static public void outputHiddenLabel(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     String              id,
     Object              text,
     UIComponent         component
@@ -131,7 +131,7 @@
    * Remembers that a "normal" hidden label has already been outputted.
    */
   static public void rememberLabel(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     Object              id)
   {
     if (id != null)

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HtmlRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HtmlRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HtmlRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HtmlRenderer.java Wed Jul 26 20:39:26 2006
@@ -16,7 +16,6 @@
 package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml;
 
 import java.io.IOException;
-
 import java.util.List;
 
 import javax.faces.component.UIComponent;
@@ -26,8 +25,7 @@
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.component.html.HtmlFrameBorderLayout;
 import org.apache.myfaces.trinidad.component.html.HtmlHtml;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 
 
 /**
@@ -63,7 +61,7 @@
 
   protected void encodeBegin(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     FacesBean           bean) throws IOException
   {
@@ -118,7 +116,7 @@
 
   public void encodeEnd(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     FacesBean           bean) throws IOException
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputFileRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputFileRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputFileRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputFileRenderer.java Wed Jul 26 20:39:26 2006
@@ -22,9 +22,8 @@
 
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.component.core.input.CoreInputFile;
-
 import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 
 public class InputFileRenderer extends InputLabelAndMessageRenderer
 {
@@ -36,7 +35,7 @@
   
   protected final void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputHiddenRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputHiddenRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputHiddenRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputHiddenRenderer.java Wed Jul 26 20:39:26 2006
@@ -23,8 +23,7 @@
 
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.component.core.input.CoreInputHidden;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 
 public class InputHiddenRenderer extends EditableValueRenderer
 {
@@ -47,7 +46,7 @@
 
   protected final void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputLabelAndMessageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputLabelAndMessageRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputLabelAndMessageRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputLabelAndMessageRenderer.java Wed Jul 26 20:39:26 2006
@@ -20,12 +20,11 @@
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
-
 import javax.faces.context.ResponseWriter;
-import org.apache.myfaces.trinidad.bean.FacesBean;
 
+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.util.MessageUtils;
 
 
@@ -62,7 +61,7 @@
 
   protected String getLabelFor(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean)
   {
@@ -76,7 +75,7 @@
 
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -125,7 +124,7 @@
   
   protected void renderFieldCellContents(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -154,7 +153,7 @@
    */
   protected void renderRootDomElementStyles(
    FacesContext        context,
-   AdfRenderingContext arc,
+   RenderingContext arc,
    UIComponent         component,
    FacesBean           bean) throws IOException
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/LabelAndMessageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/LabelAndMessageRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/LabelAndMessageRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/LabelAndMessageRenderer.java Wed Jul 26 20:39:26 2006
@@ -16,7 +16,6 @@
 package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml;
 
 import java.io.IOException;
-
 import java.util.Map;
 
 import javax.faces.component.UIComponent;
@@ -24,15 +23,12 @@
 import javax.faces.context.ResponseWriter;
 
 import org.apache.myfaces.trinidad.bean.FacesBean;
-
 import org.apache.myfaces.trinidad.bean.PropertyKey;
-
 import org.apache.myfaces.trinidad.component.UIXGroup;
 import org.apache.myfaces.trinidad.component.UIXPanel;
 import org.apache.myfaces.trinidad.component.html.HtmlTableLayout;
-
 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.core.xhtml.table.TableRenderingContext;
 
 
@@ -131,7 +127,7 @@
   // inlineStyle, 'state' styles like p_AFDisabled, etc.  
   protected void renderRootDomElementStyles(
    FacesContext        context,
-   AdfRenderingContext arc,
+   RenderingContext arc,
    UIComponent         component,
    FacesBean           bean) throws IOException
   {
@@ -161,7 +157,7 @@
    */
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -281,7 +277,7 @@
    */
   private void _renderLabelCell(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
     boolean             labelExists) throws IOException
@@ -320,7 +316,7 @@
    */
   private void _renderFieldCell(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
     boolean             labelExists,
@@ -370,7 +366,7 @@
     rw.endElement("td");
   }
 
-  static String __getCachedClientId(AdfRenderingContext arc)
+  static String __getCachedClientId(RenderingContext arc)
   {
     String clientId = arc.getCurrentClientId();
     assert(clientId != null);
@@ -379,7 +375,7 @@
 
   protected boolean hasMessage(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean)
   {
@@ -394,7 +390,7 @@
 
   private void _renderMessageCellContents(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -420,7 +416,7 @@
 
   abstract protected void renderFieldCellContents(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException;
 
@@ -461,22 +457,22 @@
    */
   abstract protected String getLabelFor(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean);
 
-  static void __setLabelWidth(AdfRenderingContext arc, Object width)
+  static void __setLabelWidth(RenderingContext arc, Object width)
   {
     arc.getProperties().put(_LABEL_CELL_WIDTH_KEY, width);
   }
 
-  static void __setFieldWidth(AdfRenderingContext arc, Object width)
+  static void __setFieldWidth(RenderingContext arc, Object width)
   {
     arc.getProperties().put(_FIELD_CELL_WIDTH_KEY, width);
   }
 
 
-  static void __clearProperties(AdfRenderingContext arc)
+  static void __clearProperties(RenderingContext arc)
   {
     arc.getProperties().remove(_LABEL_CELL_WIDTH_KEY);
     arc.getProperties().remove(_FIELD_CELL_WIDTH_KEY);
@@ -499,7 +495,7 @@
 
     protected void renderAllAttributes(
       FacesContext        context,
-      AdfRenderingContext arc,
+      RenderingContext arc,
       FacesBean           bean) throws IOException
     {
       // Block everything
@@ -563,13 +559,13 @@
       FacesBean    bean)
     {
       return getLabelFor(context,
-                         AdfRenderingContext.getCurrentInstance(),
+                         RenderingContext.getCurrentInstance(),
                          component,
                          bean);
     }
 
     protected boolean isLabelTagNeeded(
-      AdfRenderingContext arc,
+      RenderingContext arc,
       FacesBean           bean,
       String              forId,
       int                 accessKeyIndex
@@ -610,7 +606,7 @@
 
     protected void renderAllAttributes(
       FacesContext        context,
-      AdfRenderingContext arc,
+      RenderingContext arc,
       FacesBean           bean) throws IOException
     {
     }
@@ -621,7 +617,7 @@
       FacesBean    bean)
     {
       return getLabelFor(context,
-                         AdfRenderingContext.getCurrentInstance(),
+                         RenderingContext.getCurrentInstance(),
                          component,
                          bean);
     }
@@ -691,7 +687,7 @@
   // If we have mapped this style (like in panelForm), 
   // then return the style, otherwise return null
   private String _getDefaultLabelStyleClass(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     String              styleClass)  
   {
     Map keyMap = arc.getSkinResourceKeyMap();

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageRenderer.java Wed Jul 26 20:39:26 2006
@@ -25,8 +25,7 @@
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.core.output.CoreMessage;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.util.MessageUtils;
 
 /**
@@ -60,7 +59,7 @@
 
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationLevelRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationLevelRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationLevelRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationLevelRenderer.java Wed Jul 26 20:39:26 2006
@@ -16,11 +16,9 @@
 package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml;
 
 import java.io.IOException;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-
 import java.util.Map;
 
 import javax.faces.application.Application;
@@ -36,9 +34,8 @@
 import org.apache.myfaces.trinidad.component.core.nav.CoreNavigationLevel;
 import org.apache.myfaces.trinidad.context.Agent;
 import org.apache.myfaces.trinidad.logging.ADFLogger;
-
 import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 
 public class NavigationLevelRenderer extends XhtmlRenderer
 {
@@ -62,7 +59,7 @@
 
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -98,7 +95,7 @@
 
   protected void renderContent(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIXHierarchy        component,
     FacesBean           bean
     ) throws IOException
@@ -216,7 +213,7 @@
    */
   protected void _renderStyleAttributes(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean           bean) throws IOException
   {
     String renderingHint = _getHint(bean);
@@ -376,7 +373,7 @@
 
   private void _renderNavigationItem(
     FacesContext context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     ResponseWriter rw,
     Map itemData,
     String renderingHint,
@@ -439,7 +436,7 @@
   }
 
   private void _writeInlineTbodyStyles(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     ResponseWriter rw
     ) throws IOException
   {
@@ -453,7 +450,7 @@
 
   private void _appendIconAndText(
     FacesContext context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     ResponseWriter rw,
     String iconUri,
     Map itemData,
@@ -499,7 +496,7 @@
 
   private void _writeItemLink(
     FacesContext context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     ResponseWriter rw,
     Map itemData,
     boolean isDisabled
@@ -602,7 +599,7 @@
   }
 
   private void _writeOnclickProperty(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     ResponseWriter rw,
     UIXCommand commandChild,
     boolean actionSpecialCase,
@@ -624,7 +621,7 @@
   }
 
   private String _getAutoSubmitScript(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     boolean immediate,
     boolean partialSubmit
     )
@@ -656,7 +653,7 @@
 
   private void _renderNonOverlappingItem(
     FacesContext context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     ResponseWriter rw,
     Map itemData,
     boolean isRtl,
@@ -843,7 +840,7 @@
 
   private void _renderChoiceItem(
     FacesContext context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     ResponseWriter rw,
     Map itemData
     ) throws IOException
@@ -937,7 +934,7 @@
 
   private void _renderChoiceLabel(
     FacesContext context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     ResponseWriter rw,
     boolean isRtl,
     FacesBean bean
@@ -969,7 +966,7 @@
 
   private void _renderChoiceButton(
     FacesContext context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     ResponseWriter rw,
     boolean isRtl,
     String choiceSelectId
@@ -1014,7 +1011,7 @@
 
   private void _renderTabItem(
     FacesContext context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     ResponseWriter rw,
     Map itemData,
     boolean isRtl
@@ -1204,7 +1201,7 @@
 
   private void _renderTabSection(
     FacesContext context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     ResponseWriter rw,
     String sectionStyleClass1,
     String sectionStyleClass2,

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPathRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPathRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPathRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPathRenderer.java Wed Jul 26 20:39:26 2006
@@ -16,12 +16,10 @@
 package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml;
 
 import java.io.IOException;
-
 import java.text.Bidi;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-
 import java.util.Map;
 
 import javax.faces.component.UIComponent;
@@ -33,9 +31,8 @@
 import org.apache.myfaces.trinidad.component.UIXHierarchy;
 import org.apache.myfaces.trinidad.component.core.nav.CoreCommandLink;
 import org.apache.myfaces.trinidad.component.core.nav.CoreNavigationPath;
-
-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.skin.icon.Icon;
 
 public class NavigationPathRenderer extends XhtmlRenderer
@@ -59,7 +56,7 @@
   
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -87,7 +84,7 @@
    */
   protected UIComponent getStamp(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIXHierarchy        component,
     FacesBean           bean
     )
@@ -98,7 +95,7 @@
 
   protected void renderContent(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIXHierarchy        component,
     FacesBean           bean
     ) throws IOException
@@ -178,7 +175,7 @@
 
   protected void renderNode(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     Icon                separatorIcon,
     UIComponent         child,
     int                 renderedCount,
@@ -232,13 +229,13 @@
 
   protected void renderLink(
     FacesContext context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent child,
     int renderedCount,
     boolean isLastChild) throws IOException
   {
     if (isLastChild)
-      ((CoreAdfRenderingContext) arc).setLinkDisabled(true);    
+      ((CoreRenderingContext) arc).setLinkDisabled(true);    
   
     boolean isBidi = false;
     String text = toString(child.getAttributes().get(CoreCommandLink.TEXT_KEY.getName()));
@@ -265,7 +262,7 @@
         encodeChild(context, child);      
       
       if (isLastChild)
-        ((CoreAdfRenderingContext) arc).setLinkDisabled(false);       
+        ((CoreRenderingContext) arc).setLinkDisabled(false);       
     }
     finally
     {
@@ -274,7 +271,7 @@
   }
  
   protected boolean shouldRenderLastChild(
-    AdfRenderingContext arc
+    RenderingContext arc
   )
   {
     Object propValue = arc.getSkin().getProperty(
@@ -289,7 +286,7 @@
    */
   protected void renderStyleAttributes(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean           bean) throws IOException
   {
     renderStyleAttributes(context, arc, bean, 
@@ -313,7 +310,7 @@
    */
   private void _renderStartOfLink(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     boolean             isVertical,
     boolean             isLastChild) throws IOException
   {
@@ -358,7 +355,7 @@
   }
 
   private int _getMinItemCount(
-    AdfRenderingContext arc
+    RenderingContext arc
   )
   {
     int minChildCount = 0;

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ObjectIconRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ObjectIconRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ObjectIconRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ObjectIconRenderer.java Wed Jul 26 20:39:26 2006
@@ -16,7 +16,6 @@
 package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml;
 
 import java.io.IOException;
-
 import java.util.Map;
 
 import javax.faces.component.UIComponent;
@@ -27,8 +26,7 @@
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.core.output.CoreObjectIcon;
 import org.apache.myfaces.trinidad.util.ArrayMap;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
 
 public class ObjectIconRenderer extends XhtmlRenderer
@@ -46,7 +44,7 @@
 
   protected void encodeBegin(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     FacesBean           bean) throws IOException
   {
@@ -113,7 +111,7 @@
 
   protected void renderShortDescAttribute(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean           bean) throws IOException
   {
     // do nothing, handled by the icon renderer

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ObjectImageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ObjectImageRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ObjectImageRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ObjectImageRenderer.java Wed Jul 26 20:39:26 2006
@@ -24,8 +24,7 @@
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.core.output.CoreObjectImage;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRendererUtils;
 
 public class ObjectImageRenderer extends XhtmlRenderer
@@ -45,7 +44,7 @@
 
   protected void encodeBegin(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     FacesBean           bean) throws IOException
   {
@@ -59,7 +58,7 @@
 
   protected void renderAllAttributes(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean           bean) throws IOException
   {
     ResponseWriter rw = context.getResponseWriter();
@@ -74,7 +73,7 @@
 
   protected void renderShortDescAttribute(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean           bean) throws IOException
   {
     String shortDesc = getShortDesc(bean);
@@ -103,7 +102,7 @@
 
   protected void renderId(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     ResponseWriter      writer
     ) throws IOException

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ObjectSpacerRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ObjectSpacerRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ObjectSpacerRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ObjectSpacerRenderer.java Wed Jul 26 20:39:26 2006
@@ -19,13 +19,12 @@
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
-
 import javax.faces.context.ResponseWriter;
+
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.core.output.CoreObjectSpacer;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 
 public class ObjectSpacerRenderer extends XhtmlRenderer
 {
@@ -43,7 +42,7 @@
 
   protected void encodeBegin(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     FacesBean           bean) throws IOException
   {



Mime
View raw message