You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by ma...@apache.org on 2006/07/27 07:00:19 UTC

svn commit: r425980 [2/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/...

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/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-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ChooseDateRenderer.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/ChooseDateRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ChooseDateRenderer.java Thu Jul 27 00:00:09 2006
@@ -39,7 +39,7 @@
 import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
 
 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;
@@ -95,7 +95,7 @@
 
   protected final void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -519,7 +519,7 @@
    */
   protected void renderNextPrev(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent      component,
     FacesBean        bean,
     boolean          isPrev,
@@ -620,7 +620,7 @@
    */
   private void _renderNextPrev(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
     boolean          isPrev,
@@ -690,7 +690,7 @@
    * Creates the base navigation URL
    */
   private String _createNavURL(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     String           destinationString,
     long             minTime,
     long             maxTime,
@@ -721,7 +721,7 @@
    * Creates the params for navigation URL
    */
   private String[] _createNavURLParams(
-    AdfRenderingContext  arc,
+    RenderingContext  arc,
     long                 minTime,
     long                 maxTime,
     long                 selectedTime,
@@ -771,7 +771,7 @@
 
   private void _renderMonthChoice(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     String[]          months,
     Calendar          currentTime,
     int               visibleMonth,
@@ -840,7 +840,7 @@
 
   private void _renderYearChoice(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     Calendar         currentTime,
     int              year,
     int              minimumYear,
@@ -1002,7 +1002,7 @@
    */
   private void _renderMonthAndYear(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     long              minTime,
     long              maxTime,
     Calendar          displayedCalendar,
@@ -1114,7 +1114,7 @@
 
 
   private static long _getTimeAttr(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean   bean,
     PropertyKey key,
     long        defaultTime
@@ -1194,7 +1194,7 @@
    * Returns a Calendar, given Locale information
    */
   private static Calendar _getCalendar(
-    AdfRenderingContext arc
+    RenderingContext arc
     )
   {
     LocaleContext localeContext = arc.getLocaleContext();
@@ -1215,7 +1215,7 @@
    * Returns a Calendar, given a time and Locale information
    */
   private static Calendar _getCalendar(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     long                time
     )
   {
@@ -1249,7 +1249,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 +1258,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 +1268,7 @@
    * Returns the Calendar to display
    */
   private Calendar _getDisplayedCalendar(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean           bean,
     long                minTime,
     long                maxTime,
@@ -1293,7 +1293,7 @@
    * Returns the time of the displayed day.
    */
   private long _getDisplayedTime(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean        bean,
     long             minTime,
     long             maxTime,
@@ -1312,7 +1312,7 @@
    * Returns the time of the selected day.
    */
   private long _getSelectedTime(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean bean,
     long      minTime,
     long      maxTime
@@ -1349,7 +1349,7 @@
 
 
   private FastMessageFormat _getTitleFormat(
-    AdfRenderingContext arc
+    RenderingContext arc
     )
   {
     return _getMessageFormat(arc,
@@ -1357,7 +1357,7 @@
   }
 
   private FastMessageFormat _getBeforeFormat(
-    AdfRenderingContext arc
+    RenderingContext arc
     )
   {
     return _getMessageFormat(arc,
@@ -1365,7 +1365,7 @@
   }
 
   private FastMessageFormat _getAfterFormat(
-    AdfRenderingContext arc
+    RenderingContext arc
     )
   {
     return _getMessageFormat(arc,
@@ -1373,7 +1373,7 @@
   }
 
   private FastMessageFormat _getMessageFormat(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     String              translationKey)
   {
     FastMessageFormat format =
@@ -1383,7 +1383,7 @@
   }
 
   private static DateFormatSymbols _getDateFormatSymbols(
-    AdfRenderingContext arc
+    RenderingContext arc
     )
   {
     DateFormatSymbols symbols = (DateFormatSymbols)
@@ -1457,7 +1457,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-save/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-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.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/ColumnGroupRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.java Thu Jul 27 00:00:09 2006
@@ -31,7 +31,7 @@
 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;
@@ -182,7 +182,7 @@
    */
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -217,7 +217,7 @@
 
   private void _renderHeaderMode(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     TableRenderingContext tContext,
     UIComponent           column) throws IOException
   {
@@ -291,7 +291,7 @@
    */
   private String _renderColumnHeader(
     FacesContext          context,
-    AdfRenderingContext   arc,
+    RenderingContext   arc,
     TableRenderingContext tContext,
     UIComponent           column,
     int                   rowSpan,
@@ -338,7 +338,7 @@
    */
   protected final String renderHeaderAndSpan(
     FacesContext          context,
-    AdfRenderingContext   arc,
+    RenderingContext   arc,
     TableRenderingContext tContext,
     UIComponent           column,
     int                   rowSpan,
@@ -443,7 +443,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 +452,7 @@
   /**
    */
   protected String getSortingOnclick(
-    AdfRenderingContext   arc,
+    RenderingContext   arc,
     TableRenderingContext tContext,
     UIComponent           column,
     int                   sortability)
@@ -521,7 +521,7 @@
 
   protected void renderHeaderContents(
     FacesContext          context,
-    AdfRenderingContext   arc,
+    RenderingContext   arc,
     TableRenderingContext tContext,
     UIComponent           column,
     int                   sortability,
@@ -543,7 +543,7 @@
    */
   protected void renderSortOrderSymbol(
     FacesContext       context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     int                 sortability,
     Icon                icon,
     String              sortOnclick
@@ -647,7 +647,7 @@
   }
 
   protected boolean hasSortingIcon(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     int                 sortability)
   {
     return sortability != SORT_NO;

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/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-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnRenderer.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/ColumnRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnRenderer.java Thu Jul 27 00:00:09 2006
@@ -30,7 +30,7 @@
 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.trinidadinternal.renderkit.RenderingContext;
 
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.BandingData;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.CellUtils;
@@ -52,7 +52,7 @@
    */
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -126,7 +126,7 @@
 
 
   protected void renderKids(FacesContext          context,
-                            AdfRenderingContext   arc,
+                            RenderingContext   arc,
                             TableRenderingContext trc,
                             UIComponent           column) throws IOException
   {
@@ -160,7 +160,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 +199,7 @@
 
   private void _renderDataMode(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     TableRenderingContext tContext,
     UIComponent           column)
     throws IOException
@@ -274,7 +274,7 @@
    * @todo Generate Unique IDs correctly!
    */
   private void _renderTD(FacesContext          context,
-                         AdfRenderingContext   arc,
+                         RenderingContext   arc,
                          TableRenderingContext tContext,
                          UIComponent           column,
                          int kidIndex,
@@ -370,7 +370,7 @@
   /**
    */
   private void _computeMode(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     TableRenderingContext tContext,
     UIComponent           component,
     FacesBean             bean)
@@ -426,7 +426,7 @@
 
   private void _renderFooterMode(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     TableRenderingContext tContext,
     UIComponent           column)
     throws IOException
@@ -475,7 +475,7 @@
 
   private void _renderHeaderMode(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     TableRenderingContext tContext,
     UIComponent           column)
     throws IOException
@@ -569,7 +569,7 @@
 
   public static String renderDataStyleClass(
     FacesContext          context,
-    AdfRenderingContext   arc,
+    RenderingContext   arc,
     TableRenderingContext tContext)
     throws IOException
   {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/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-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandLinkRenderer.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/CommandLinkRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandLinkRenderer.java Thu Jul 27 00:00:09 2006
@@ -29,7 +29,7 @@
 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
 {
@@ -73,7 +73,7 @@
   
   protected void encodeBegin(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     FacesBean           bean) throws IOException
   {
@@ -101,7 +101,7 @@
 
   public void encodeEnd(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     FacesBean           bean) throws IOException
   {
@@ -116,7 +116,7 @@
     UIComponent  component)
   {
     // Use the cached version
-    return AdfRenderingContext.getCurrentInstance().getCurrentClientId();
+    return RenderingContext.getCurrentInstance().getCurrentClientId();
   }
 
   protected String getDestination(FacesBean bean)
@@ -139,7 +139,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-save/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-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/DesktopPanelPageHeaderRenderer.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/DesktopPanelPageHeaderRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/DesktopPanelPageHeaderRenderer.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.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 +60,7 @@
 
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -79,7 +79,7 @@
 
   protected void encodeAllDesktop(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -422,7 +422,7 @@
    */
   private void  _renderNavigation1(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     ResponseWriter      writer,
     UIComponent         navigation1,
     boolean             isRTL
@@ -476,7 +476,7 @@
    */
   private void _renderSearch(
     FacesContext context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     ResponseWriter   writer,
     UIComponent           search,
     int              colSpan

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/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-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/DocumentRenderer.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/DocumentRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/DocumentRenderer.java Thu Jul 27 00:00:09 2006
@@ -23,7 +23,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 +60,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/EditableValueRenderer.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/EditableValueRenderer.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/EditableValueRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/EditableValueRenderer.java Thu Jul 27 00:00:09 2006
@@ -31,7 +31,7 @@
 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.trinidadinternal.renderkit.RenderingContext;
 
 abstract public class EditableValueRenderer extends ValueRenderer
 {
@@ -159,7 +159,7 @@
 
   protected void addOnSubmitConverterValidators(
     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/FormData.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/FormData.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/FormData.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormData.java Thu Jul 27 00:00:09 2006
@@ -37,7 +37,7 @@
 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 +735,7 @@
         (null == contentType))
     {
       XhtmlUtils.addLib(context,
-                        AdfRenderingContext.getCurrentInstance(),
+                        RenderingContext.getCurrentInstance(),
                         libReference);
     }
   }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/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-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormElementRenderer.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/FormElementRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormElementRenderer.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;
 
 abstract public class FormElementRenderer extends EditableValueRenderer
 {
@@ -51,7 +51,7 @@
 
   protected final void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -66,7 +66,7 @@
   }
 
 
-  protected boolean isHiddenLabelRequired(AdfRenderingContext arc)
+  protected boolean isHiddenLabelRequired(RenderingContext arc)
   {
     return true;
   }
@@ -75,7 +75,7 @@
    */
   protected void renderShortDescAsHiddenLabel(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean)
     throws IOException
@@ -102,7 +102,7 @@
 
   protected void encodeAllAsElement(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -113,7 +113,7 @@
    */
   protected void encodeAllAsNonElement(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -134,7 +134,7 @@
    */
   protected void renderNonElementContent(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -165,7 +165,7 @@
    */
   protected final boolean renderAsElement(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean           bean)
   {
     if (getReadOnly(context, bean) || !supportsEditing(arc))
@@ -184,7 +184,7 @@
   }
 
   protected boolean renderReadOnlyAsElement(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean           bean)
   {
     return false;

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/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-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormInputRenderer.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/FormInputRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormInputRenderer.java Thu Jul 27 00:00:09 2006
@@ -24,7 +24,7 @@
 
 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 +69,7 @@
 
   protected void renderDisabledAttribute(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean           bean) throws IOException
   {
    
@@ -92,7 +92,7 @@
    */
   protected void renderAllAttributes(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean           bean,
     boolean             renderStyleAttrs) throws IOException
   {
@@ -122,7 +122,7 @@
    */  
   protected void renderRootDomElementStyles(
   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/FormRenderer.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/FormRenderer.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/FormRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java Thu Jul 27 00:00:09 2006
@@ -38,7 +38,7 @@
 
 import org.apache.myfaces.trinidad.context.Agent;
 
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+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;
@@ -94,7 +94,7 @@
 
   protected void encodeBegin(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     FacesBean           bean) throws IOException
   {
@@ -196,7 +196,7 @@
 
   protected void encodeEnd(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     FacesBean           bean) throws IOException
   {
@@ -344,7 +344,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 +410,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
@@ -818,7 +818,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 +846,7 @@
     String           call
     )
   {
-    FormData fData = AdfRenderingContext.getCurrentInstance().getFormData();
+    FormData fData = RenderingContext.getCurrentInstance().getFormData();
     fData.addResetCall(call);
   }
 
@@ -860,7 +860,7 @@
     String           requiredMessageKey
     ) throws IOException
   {
-    FormData fData = AdfRenderingContext.getCurrentInstance().getFormData();
+    FormData fData = RenderingContext.getCurrentInstance().getFormData();
 
     fData.addOnSubmitConverterValidators(component,
                                          converter,
@@ -886,7 +886,7 @@
     String           label
     )
   {
-    FormData fData = AdfRenderingContext.getCurrentInstance().getFormData();
+    FormData fData = RenderingContext.getCurrentInstance().getFormData();
     fData.addLabel(targetID, label);
   }
 
@@ -904,14 +904,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 +919,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 +1068,7 @@
    */
   static private void _renderNeededValues(
     FacesContext        context,
-    AdfRenderingContext arc
+    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/GoLinkRenderer.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/GoLinkRenderer.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/GoLinkRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java Thu Jul 27 00:00:09 2006
@@ -26,8 +26,8 @@
 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 +56,7 @@
 
   protected void encodeBegin(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     FacesBean           bean) throws IOException
   {
@@ -113,7 +113,7 @@
 
   public void encodeEnd(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     FacesBean           bean) throws IOException
   {
@@ -201,8 +201,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-save/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-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GroupRenderer.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/GroupRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GroupRenderer.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.CoreGroup;
 
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 
 public class GroupRenderer extends XhtmlRenderer
 {
@@ -43,7 +43,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/HeadRenderer.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/HeadRenderer.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/HeadRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HeadRenderer.java Thu Jul 27 00:00:09 2006
@@ -31,7 +31,7 @@
 
 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;
 
 /**
@@ -60,7 +60,7 @@
 
   protected void encodeBegin(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     FacesBean           bean) throws IOException
   {
@@ -90,7 +90,7 @@
 
   protected void encodeEnd(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     FacesBean           bean) throws IOException
   {
@@ -106,7 +106,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 +131,7 @@
 
 
   static private void _writeCookieScript(
-   FacesContext context, AdfRenderingContext arc)
+   FacesContext context, RenderingContext arc)
     throws IOException
   { 
     if (_needsCookieScript(context, arc))
@@ -142,7 +142,7 @@
 
   static private boolean _needsCookieScript(
     FacesContext context,
-    AdfRenderingContext arc)
+    RenderingContext arc)
   {
     // Disable the Cookie script for portlets
     // =-=AEW Right or wrong?
@@ -177,7 +177,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-save/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-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HiddenLabelUtils.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/HiddenLabelUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HiddenLabelUtils.java Thu Jul 27 00:00:09 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-save/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-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HtmlRenderer.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/HtmlRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HtmlRenderer.java Thu Jul 27 00:00:09 2006
@@ -27,7 +27,7 @@
 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 +63,7 @@
 
   protected void encodeBegin(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     FacesBean           bean) throws IOException
   {
@@ -118,7 +118,7 @@
 
   public void encodeEnd(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     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/InputFileRenderer.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/InputFileRenderer.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/InputFileRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputFileRenderer.java Thu Jul 27 00:00:09 2006
@@ -24,7 +24,7 @@
 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 +36,7 @@
   
   protected final 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/InputHiddenRenderer.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/InputHiddenRenderer.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/InputHiddenRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputHiddenRenderer.java Thu Jul 27 00:00:09 2006
@@ -24,7 +24,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 +47,7 @@
 
   protected final 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/InputLabelAndMessageRenderer.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/InputLabelAndMessageRenderer.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/InputLabelAndMessageRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputLabelAndMessageRenderer.java Thu Jul 27 00:00:09 2006
@@ -25,7 +25,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.util.MessageUtils;
 
 
@@ -62,7 +62,7 @@
 
   protected String getLabelFor(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean)
   {
@@ -76,7 +76,7 @@
 
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -125,7 +125,7 @@
   
   protected void renderFieldCellContents(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -154,7 +154,7 @@
    */
   protected void renderRootDomElementStyles(
    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/LabelAndMessageRenderer.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/LabelAndMessageRenderer.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/LabelAndMessageRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/LabelAndMessageRenderer.java Thu Jul 27 00:00:09 2006
@@ -32,7 +32,7 @@
 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 +131,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 +161,7 @@
    */
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -281,7 +281,7 @@
    */
   private void _renderLabelCell(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
     boolean             labelExists) throws IOException
@@ -320,7 +320,7 @@
    */
   private void _renderFieldCell(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
     boolean             labelExists,
@@ -370,7 +370,7 @@
     rw.endElement("td");
   }
 
-  static String __getCachedClientId(AdfRenderingContext arc)
+  static String __getCachedClientId(RenderingContext arc)
   {
     String clientId = arc.getCurrentClientId();
     assert(clientId != null);
@@ -379,7 +379,7 @@
 
   protected boolean hasMessage(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean)
   {
@@ -394,7 +394,7 @@
 
   private void _renderMessageCellContents(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -420,7 +420,7 @@
 
   abstract protected void renderFieldCellContents(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException;
 
@@ -461,22 +461,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 +499,7 @@
 
     protected void renderAllAttributes(
       FacesContext        context,
-      AdfRenderingContext arc,
+      RenderingContext arc,
       FacesBean           bean) throws IOException
     {
       // Block everything
@@ -563,13 +563,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 +610,7 @@
 
     protected void renderAllAttributes(
       FacesContext        context,
-      AdfRenderingContext arc,
+      RenderingContext arc,
       FacesBean           bean) throws IOException
     {
     }
@@ -621,7 +621,7 @@
       FacesBean    bean)
     {
       return getLabelFor(context,
-                         AdfRenderingContext.getCurrentInstance(),
+                         RenderingContext.getCurrentInstance(),
                          component,
                          bean);
     }
@@ -691,7 +691,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-save/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-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageRenderer.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/MessageRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageRenderer.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.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 +60,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/NavigationLevelRenderer.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/NavigationLevelRenderer.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/NavigationLevelRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationLevelRenderer.java Thu Jul 27 00:00:09 2006
@@ -38,7 +38,7 @@
 import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 
 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 +62,7 @@
 
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -98,7 +98,7 @@
 
   protected void renderContent(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIXHierarchy        component,
     FacesBean           bean
     ) throws IOException
@@ -216,7 +216,7 @@
    */
   protected void _renderStyleAttributes(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean           bean) throws IOException
   {
     String renderingHint = _getHint(bean);
@@ -376,7 +376,7 @@
 
   private void _renderNavigationItem(
     FacesContext context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     ResponseWriter rw,
     Map itemData,
     String renderingHint,
@@ -439,7 +439,7 @@
   }
 
   private void _writeInlineTbodyStyles(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     ResponseWriter rw
     ) throws IOException
   {
@@ -453,7 +453,7 @@
 
   private void _appendIconAndText(
     FacesContext context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     ResponseWriter rw,
     String iconUri,
     Map itemData,
@@ -499,7 +499,7 @@
 
   private void _writeItemLink(
     FacesContext context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     ResponseWriter rw,
     Map itemData,
     boolean isDisabled
@@ -602,7 +602,7 @@
   }
 
   private void _writeOnclickProperty(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     ResponseWriter rw,
     UIXCommand commandChild,
     boolean actionSpecialCase,
@@ -624,7 +624,7 @@
   }
 
   private String _getAutoSubmitScript(
-    AdfRenderingContext arc,
+    RenderingContext arc,
     boolean immediate,
     boolean partialSubmit
     )
@@ -656,7 +656,7 @@
 
   private void _renderNonOverlappingItem(
     FacesContext context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     ResponseWriter rw,
     Map itemData,
     boolean isRtl,
@@ -843,7 +843,7 @@
 
   private void _renderChoiceItem(
     FacesContext context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     ResponseWriter rw,
     Map itemData
     ) throws IOException
@@ -937,7 +937,7 @@
 
   private void _renderChoiceLabel(
     FacesContext context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     ResponseWriter rw,
     boolean isRtl,
     FacesBean bean
@@ -969,7 +969,7 @@
 
   private void _renderChoiceButton(
     FacesContext context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     ResponseWriter rw,
     boolean isRtl,
     String choiceSelectId
@@ -1014,7 +1014,7 @@
 
   private void _renderTabItem(
     FacesContext context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     ResponseWriter rw,
     Map itemData,
     boolean isRtl
@@ -1204,7 +1204,7 @@
 
   private void _renderTabSection(
     FacesContext context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     ResponseWriter rw,
     String sectionStyleClass1,
     String sectionStyleClass2,

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/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-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPathRenderer.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/NavigationPathRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPathRenderer.java Thu Jul 27 00:00:09 2006
@@ -34,8 +34,8 @@
 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 +59,7 @@
   
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -87,7 +87,7 @@
    */
   protected UIComponent getStamp(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIXHierarchy        component,
     FacesBean           bean
     )
@@ -98,7 +98,7 @@
 
   protected void renderContent(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIXHierarchy        component,
     FacesBean           bean
     ) throws IOException
@@ -178,7 +178,7 @@
 
   protected void renderNode(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     Icon                separatorIcon,
     UIComponent         child,
     int                 renderedCount,
@@ -232,13 +232,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 +265,7 @@
         encodeChild(context, child);      
       
       if (isLastChild)
-        ((CoreAdfRenderingContext) arc).setLinkDisabled(false);       
+        ((CoreRenderingContext) arc).setLinkDisabled(false);       
     }
     finally
     {
@@ -274,7 +274,7 @@
   }
  
   protected boolean shouldRenderLastChild(
-    AdfRenderingContext arc
+    RenderingContext arc
   )
   {
     Object propValue = arc.getSkin().getProperty(
@@ -289,7 +289,7 @@
    */
   protected void renderStyleAttributes(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean           bean) throws IOException
   {
     renderStyleAttributes(context, arc, bean, 
@@ -313,7 +313,7 @@
    */
   private void _renderStartOfLink(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     boolean             isVertical,
     boolean             isLastChild) throws IOException
   {
@@ -358,7 +358,7 @@
   }
 
   private int _getMinItemCount(
-    AdfRenderingContext arc
+    RenderingContext arc
   )
   {
     int minChildCount = 0;

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/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-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ObjectIconRenderer.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/ObjectIconRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ObjectIconRenderer.java Thu Jul 27 00:00:09 2006
@@ -28,7 +28,7 @@
 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 +46,7 @@
 
   protected void encodeBegin(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     FacesBean           bean) throws IOException
   {
@@ -113,7 +113,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-save/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-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ObjectImageRenderer.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/ObjectImageRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ObjectImageRenderer.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.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 +45,7 @@
 
   protected void encodeBegin(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     FacesBean           bean) throws IOException
   {
@@ -59,7 +59,7 @@
 
   protected void renderAllAttributes(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean           bean) throws IOException
   {
     ResponseWriter rw = context.getResponseWriter();
@@ -74,7 +74,7 @@
 
   protected void renderShortDescAttribute(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean           bean) throws IOException
   {
     String shortDesc = getShortDesc(bean);
@@ -103,7 +103,7 @@
 
   protected void renderId(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     ResponseWriter      writer
     ) throws IOException

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/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-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ObjectSpacerRenderer.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/ObjectSpacerRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ObjectSpacerRenderer.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.output.CoreObjectSpacer;
 
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 
 public class ObjectSpacerRenderer extends XhtmlRenderer
 {
@@ -43,7 +43,7 @@
 
   protected void encodeBegin(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     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/OutputDocumentRenderer.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/OutputDocumentRenderer.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/OutputDocumentRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputDocumentRenderer.java Thu Jul 27 00:00:09 2006
@@ -29,7 +29,7 @@
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.core.output.CoreOutputDocument;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 
 /**
  * @author Simon Lessard, Fujitsu Consulting
@@ -47,7 +47,7 @@
   @Override
   protected void encodeBegin(
       FacesContext context,
-      AdfRenderingContext arc,
+      RenderingContext arc,
       UIComponent comp,
       FacesBean bean) throws IOException
   {
@@ -64,7 +64,7 @@
   @Override
   public void encodeEnd(
       FacesContext context,
-      AdfRenderingContext arc,
+      RenderingContext arc,
       UIComponent comp,
       FacesBean bean) throws IOException
   {
@@ -171,7 +171,7 @@
   @Override
   protected void renderStyleAttributes(
       FacesContext context,
-      AdfRenderingContext arc,
+      RenderingContext arc,
       FacesBean bean) throws IOException
   {
     renderStyleAttributes(context, arc, bean, _ROOT_SELECTOR);
@@ -191,7 +191,7 @@
    * @return the array of style classes to add to the current facet.
    */
   private String[] _getStyleClasses(
-      AdfRenderingContext arc,
+      RenderingContext arc,
       FacesBean bean,
       PropertyKey key,
       String skinSelector)
@@ -264,7 +264,7 @@
    */
   private void _renderParagraphStart(
       FacesContext context,
-      AdfRenderingContext arc,
+      RenderingContext arc,
       FacesBean bean) throws IOException
   {
     ResponseWriter rw = context.getResponseWriter();
@@ -287,7 +287,7 @@
    */
   private void _renderSeparator(
       FacesContext context,
-      AdfRenderingContext arc,
+      RenderingContext arc,
       UIComponent separator,
       FacesBean bean) throws IOException
   {
@@ -320,7 +320,7 @@
    */
   private void _renderTitle(
       FacesContext context,
-      AdfRenderingContext arc,
+      RenderingContext arc,
       UIComponent comp,
       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/OutputFormattedRenderer.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/OutputFormattedRenderer.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/OutputFormattedRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputFormattedRenderer.java Thu Jul 27 00:00:09 2006
@@ -28,7 +28,7 @@
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.core.output.CoreOutputFormatted;
 
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 
 public class OutputFormattedRenderer extends ValueRenderer
 {
@@ -46,7 +46,7 @@
 
   protected void encodeBegin(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     FacesBean           bean) throws IOException
   {
@@ -59,7 +59,7 @@
 
   public void encodeEnd(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     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/OutputLabelRenderer.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/OutputLabelRenderer.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/OutputLabelRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.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.output.CoreOutputLabel;
 
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.util.MessageUtils;
 import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
 
@@ -71,7 +71,7 @@
    */
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   { 
@@ -159,7 +159,7 @@
 
   protected boolean encodeIcons(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
     String              messageType,
@@ -198,7 +198,7 @@
   }
 
   protected boolean isLabelTagNeeded(
-    AdfRenderingContext arc, 
+    RenderingContext arc, 
     FacesBean           bean,
     String              forId, 
     int                 accessKeyIndex
@@ -214,7 +214,7 @@
    */
   protected boolean renderMessageSymbol(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     Object              type,
     Object              destination,
     Object              anchor,
@@ -275,7 +275,7 @@
   
    protected void renderAllAttributes(
      FacesContext        context,
-     AdfRenderingContext arc,
+     RenderingContext arc,
      FacesBean           bean) throws IOException
    {
      renderAllAttributes(context, arc, bean, false);
@@ -289,7 +289,7 @@
 
   private void _renderIcon(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     Icon             icon,
     Object           destination,
     Object           anchor,

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputTextRenderer.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/OutputTextRenderer.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/OutputTextRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputTextRenderer.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.output.CoreOutputText;
 
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.util.nls.StringUtils;
 
 public class OutputTextRenderer extends ValueRenderer
@@ -46,7 +46,7 @@
 
   protected void encodeBegin(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     FacesBean           bean) throws IOException
   {
@@ -62,7 +62,7 @@
 
   public void encodeEnd(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         comp,
     FacesBean           bean) throws IOException
   {
@@ -119,7 +119,7 @@
 
   private void _renderDescription(
     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/OutputUtils.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/OutputUtils.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/OutputUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputUtils.java Thu Jul 27 00:00:09 2006
@@ -28,7 +28,7 @@
 import org.apache.myfaces.trinidad.util.ArrayMap;
 
 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;
 
 /**
@@ -60,7 +60,7 @@
 
   public static void renderLayoutTableAttributes(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     Object              cellspacing,
     Object              tableWidth
     ) throws IOException
@@ -71,7 +71,7 @@
 
   public static void renderLayoutTableAttributes(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     Object              cellpadding,
     Object              cellspacing,
     Object              tableWidth
@@ -87,7 +87,7 @@
    */
   public static void renderLayoutTableAttributes(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     Object              cellpadding,
     Object              cellspacing,
     Object              border,
@@ -104,7 +104,7 @@
    */
   public static void renderLayoutTableAttributes(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     Object              cellpadding,
     Object              cellspacing,
     Object              border,
@@ -130,7 +130,7 @@
   */
   public static void renderAltAndTooltipForImage(
      FacesContext        context,
-     AdfRenderingContext afc,
+     RenderingContext afc,
      Object              textValue
      ) throws IOException
   {
@@ -161,7 +161,7 @@
    * Returns true if the agent supports alt as a tooltip on images
    */
   public static boolean supportsAltRendersTooltipOnImage(
-    AdfRenderingContext     afc
+    RenderingContext     afc
     )
   {
     return Boolean.TRUE.equals(afc.getAgent().getCapability(
@@ -173,7 +173,7 @@
    * vertically with text on the same line.
    */
   public static String getMiddleIconAlignment(
-    AdfRenderingContext arc)
+    RenderingContext arc)
   {
     // =-= AEW I haven't been able to find an image alignment
     // that works well for all browsers.  "absmiddle" looks
@@ -208,7 +208,7 @@
    */
   public static void renderIcon(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     Icon                icon,
     Object              shortDesc,
     Object              align
@@ -222,7 +222,7 @@
    */
   public static void renderIcon(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     Icon                icon,
     Object              shortDesc,
     Object              align,
@@ -252,7 +252,7 @@
    */
   static public void renderImage(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     Object              absoluteUri,
     Object              width,
     Object              height,
@@ -266,7 +266,7 @@
 
   static public void renderImage(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     Object              absoluteUri,
     Object              width,
     Object              height,
@@ -301,7 +301,7 @@
    * @todo Add real mechanism for getting the background color
    * if needed.
    */
-  static public Color getBackgroundColor(AdfRenderingContext arc)
+  static public Color getBackgroundColor(RenderingContext arc)
   {
     return Color.WHITE;
   }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelBoxRenderer.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/PanelBoxRenderer.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/PanelBoxRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelBoxRenderer.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.CorePanelBox;
 
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 
 public class PanelBoxRenderer
   extends XhtmlRenderer
@@ -57,7 +57,7 @@
 
   protected void encodeAll(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -80,7 +80,7 @@
   }
   
   protected void renderAllAttributes(FacesContext context, 
-    AdfRenderingContext arc, 
+    RenderingContext arc, 
     FacesBean bean) throws IOException
   {
     super.renderAllAttributes(context, arc, bean); 
@@ -89,7 +89,7 @@
   
   protected void renderStyleAttributes(
     FacesContext        context,
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean           bean) throws IOException
   {
     renderStyleAttributes(context, arc, bean, _getDefaultStyleClass(bean));
@@ -137,7 +137,7 @@
   
   private void _renderHeaderRow (
     FacesContext context, 
-    AdfRenderingContext arc,
+    RenderingContext arc,
     FacesBean bean, 
     Object text,
     Object icon)
@@ -170,7 +170,7 @@
   // contentContainer's child contents.
   private void _renderContentRow(
     FacesContext context, 
-    AdfRenderingContext arc,
+    RenderingContext arc,
     UIComponent         component,    
     FacesBean bean
   ) throws IOException