incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mat...@apache.org
Subject svn commit: r426189 [1/3] - in /incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal: agent/ context/ image/ image/cache/ renderkit/ renderkit/core/ renderkit/core/pages/ ...
Date Thu, 27 Jul 2006 18:31:41 GMT
Author: matzew
Date: Thu Jul 27 11:31:36 2006
New Revision: 426189

URL: http://svn.apache.org/viewvc?rev=426189&view=rev
Log:
renaming the agent clazz(es)

Added:
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java
      - copied, changed from r425955, incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AdfFacesAgent.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgentImpl.java
      - copied, changed from r425972, incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AdfFacesAgentImpl.java
Removed:
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AdfFacesAgent.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AdfFacesAgentImpl.java
Modified:
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentNameUtil.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentUtil.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageContext.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/Cache.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/FileSystemImageCache.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderingContext.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRendererUtils.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarDialogJSP.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MacOSSwitcherIcon.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ChooseDateRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HiddenLabelUtils.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputFileRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/LabelAndMessageRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationLevelRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputUtils.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PartialPageUtils.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputColorRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputDateRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputTextRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyCheckboxRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRadioRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TableRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/CellUtils.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectManyShuttleRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinCSSDocumentHandler.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/StyleContext.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/NameUtils.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNode.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNodeParser.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIXRenderingContext.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/CompositeRenderingContext.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/expl/UIFunctions.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/NameAndAgentScorer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ApplicationSwitcherRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopUtils.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ButtonRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HeaderRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HtmlLafRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageLayoutRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/SelectManyShuttleRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/SideBarRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/TextInputRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/TreeRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PdaHtmlLafUtils.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ChoiceRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/CommandItemRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FormElementRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/GlobalButtonBarRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/HiddenLabelUtils.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/MediaRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/OptionContainerRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SelectOptionRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/TableLayoutRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtils.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ContentContainerRenderer.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/pda/SimplePdaUtils.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/partial/PartialPageRendererUtils.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/FacesRenderingContext.java
    incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/FormattedTextParser.java

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java?rev=426189&r1=426188&r2=426189&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java Thu Jul 27 11:31:36 2006
@@ -341,7 +341,7 @@
   private void _populateNetFrontAgentImpl(String agent, AgentImpl agentObj)
   {
     agentObj.setType(Agent.TYPE_PDA);
-    agentObj.setAgent(AdfFacesAgent.AGENT_NETFRONT);
+    agentObj.setAgent(TrinidadAgent.AGENT_NETFRONT);
 
     int start = agent.indexOf("NetFront/");
 
@@ -381,7 +381,7 @@
   private void _populatePalmWebBrowserProAgentImpl(String agent,AgentImpl agentObj)
   {
     agentObj.setType(Agent.TYPE_PDA);
-    agentObj.setAgent(AdfFacesAgent.AGENT_WEBPRO);
+    agentObj.setAgent(TrinidadAgent.AGENT_WEBPRO);
 
     int start = agent.indexOf("WebPro/");
 
@@ -432,7 +432,7 @@
 
     String version = _getVersion(agent, agent.indexOf('/'));
     agentObj.setType(Agent.TYPE_PHONE);
-    agentObj.setAgent(AdfFacesAgent.AGENT_PTG);
+    agentObj.setAgent(TrinidadAgent.AGENT_PTG);
     agentObj.setAgentVersion(version);
   }
 
@@ -444,9 +444,9 @@
     agentObj.setType(Agent.TYPE_PDA);
 
     if (userAgent.indexOf("Blazer") != -1)
-      agentObj.setAgent(AdfFacesAgent.AGENT_BLAZER);
+      agentObj.setAgent(TrinidadAgent.AGENT_BLAZER);
     else if (userAgent.indexOf("Xiino") != -1)
-      agentObj.setAgent(AdfFacesAgent.AGENT_XIINO);
+      agentObj.setAgent(TrinidadAgent.AGENT_XIINO);
 
     agentObj.setPlatform(Agent.PLATFORM_PALM);
 
@@ -459,7 +459,7 @@
   {
     int slashIndex = agent.indexOf('/');
     agentObj.setType(Agent.TYPE_DESKTOP);
-    agentObj.setAgent(AdfFacesAgent.AGENT_ICE_BROWSER);
+    agentObj.setAgent(TrinidadAgent.AGENT_ICE_BROWSER);
     agentObj.setAgentVersion(_getVersion(agent, slashIndex));
     agentObj.setPlatform(_getJavaOS(agent, slashIndex));
   }
@@ -470,7 +470,7 @@
   private void  _populatePixoAgentImpl(String agent,AgentImpl agentObj)
   {
     agentObj.setType(Agent.TYPE_PHONE);
-    agentObj.setAgent(AdfFacesAgent.AGENT_PIXO);
+    agentObj.setAgent(TrinidadAgent.AGENT_PIXO);
     agentObj.setAgentVersion(_getVersion(agent, agent.indexOf('/')));
   }
 
@@ -586,7 +586,7 @@
     // No section to qualify the agent;  assume Mozilla/Netscape
     if (paren == -1)
     {
-      agentObj.setAgent(AdfFacesAgent.AGENT_NETSCAPE);
+      agentObj.setAgent(TrinidadAgent.AGENT_NETSCAPE);
       agentObj.setAgentVersion(_getVersion(agent, agent.indexOf('/')));
     }
     else
@@ -608,7 +608,7 @@
           if (palmIndex > 0)
           {
             agentObj.setType(Agent.TYPE_PDA);
-            agentObj.setAgent(AdfFacesAgent.AGENT_ELAINE);
+            agentObj.setAgent(TrinidadAgent.AGENT_ELAINE);
             agentObj.setAgentVersion(_getVersion(agent, palmIndex));
             agentObj.setPlatform(Agent.PLATFORM_PALM);
           }
@@ -621,7 +621,7 @@
       }
       else
       {
-        agentObj.setAgent(AdfFacesAgent.AGENT_NETSCAPE);
+        agentObj.setAgent(TrinidadAgent.AGENT_NETSCAPE);
         agentObj.setAgentVersion(_getVersion(agent, agent.indexOf('/')));
       }
 
@@ -650,11 +650,11 @@
 
       if (isJDevVE)
       {
-        agentObj.__addRequestCapability(AdfFacesAgent.CAP_IS_JDEV_VE,
+        agentObj.__addRequestCapability(TrinidadAgent.CAP_IS_JDEV_VE,
                                         Boolean.TRUE);
         if (isJDevJSVE)
         {
-          agentObj.__addRequestCapability(AdfFacesAgent.CAP_IS_JDEV_JAVASCRIPT_VE,
+          agentObj.__addRequestCapability(TrinidadAgent.CAP_IS_JDEV_JAVASCRIPT_VE,
                                           Boolean.TRUE);
         }
           

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentNameUtil.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentNameUtil.java?rev=426189&r1=426188&r2=426189&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentNameUtil.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentNameUtil.java Thu Jul 27 11:31:36 2006
@@ -33,48 +33,48 @@
    */
   public static int getAgent(String agentName)
   {
-    if (AdfFacesAgent.AGENT_NETSCAPE.equals(agentName))
+    if (TrinidadAgent.AGENT_NETSCAPE.equals(agentName))
     {
-      return AdfFacesAgent.APPLICATION_NETSCAPE;
+      return TrinidadAgent.APPLICATION_NETSCAPE;
     }
 
-    if (AdfFacesAgent.AGENT_IE.equals(agentName))
+    if (TrinidadAgent.AGENT_IE.equals(agentName))
     {
-      return AdfFacesAgent.APPLICATION_IEXPLORER;
+      return TrinidadAgent.APPLICATION_IEXPLORER;
     }
 
-    if (AdfFacesAgent.AGENT_GECKO.equals(agentName))
+    if (TrinidadAgent.AGENT_GECKO.equals(agentName))
     {
-      return AdfFacesAgent.APPLICATION_GECKO;
+      return TrinidadAgent.APPLICATION_GECKO;
     }
 
-    if (AdfFacesAgent.AGENT_ELAINE.equals(agentName))
+    if (TrinidadAgent.AGENT_ELAINE.equals(agentName))
     {
-      return AdfFacesAgent.APPLICATION_WEB_CLIPPING;
+      return TrinidadAgent.APPLICATION_WEB_CLIPPING;
     }
 
-    if (AdfFacesAgent.AGENT_ICE_BROWSER.equals(agentName))
+    if (TrinidadAgent.AGENT_ICE_BROWSER.equals(agentName))
     {
-      return AdfFacesAgent.APPLICATION_ICE;
+      return TrinidadAgent.APPLICATION_ICE;
     }
 
-    if (AdfFacesAgent.AGENT_PIXO.equals(agentName))
+    if (TrinidadAgent.AGENT_PIXO.equals(agentName))
     {
-      return AdfFacesAgent.APPLICATION_PIXO;
+      return TrinidadAgent.APPLICATION_PIXO;
     }
 
-    if ((AdfFacesAgent.AGENT_NETFRONT.equals(agentName)) ||
-        (AdfFacesAgent.AGENT_WEBPRO.equals(agentName)))
+    if ((TrinidadAgent.AGENT_NETFRONT.equals(agentName)) ||
+        (TrinidadAgent.AGENT_WEBPRO.equals(agentName)))
     {
-      return AdfFacesAgent.APPLICATION_NET_FRONT;
+      return TrinidadAgent.APPLICATION_NET_FRONT;
     }
 
-    if (AdfFacesAgent.AGENT_WEBKIT.equals(agentName))
+    if (TrinidadAgent.AGENT_WEBKIT.equals(agentName))
     {
-      return AdfFacesAgent.APPLICATION_SAFARI;
+      return TrinidadAgent.APPLICATION_SAFARI;
     }
 
-    return AdfFacesAgent.APPLICATION_UNKNOWN;
+    return TrinidadAgent.APPLICATION_UNKNOWN;
   }
 
   /**
@@ -85,38 +85,38 @@
    */
   public static int getPlatform(String platformName)
   {
-    if (AdfFacesAgent.PLATFORM_WINDOWS.equals(platformName))
+    if (TrinidadAgent.PLATFORM_WINDOWS.equals(platformName))
     {
-      return AdfFacesAgent.OS_WINDOWS;
+      return TrinidadAgent.OS_WINDOWS;
     }
 
-    if (AdfFacesAgent.PLATFORM_MAC.equals(platformName))
+    if (TrinidadAgent.PLATFORM_MAC.equals(platformName))
     {
-      return AdfFacesAgent.OS_MACOS;
+      return TrinidadAgent.OS_MACOS;
     }
 
-    if (AdfFacesAgent.PLATFORM_LINUX.equals(platformName))
+    if (TrinidadAgent.PLATFORM_LINUX.equals(platformName))
     {
-      return AdfFacesAgent.OS_LINUX;
+      return TrinidadAgent.OS_LINUX;
     }
 
-    if (AdfFacesAgent.PLATFORM_SOLARIS.equals(platformName))
+    if (TrinidadAgent.PLATFORM_SOLARIS.equals(platformName))
     {
-      return AdfFacesAgent.OS_SOLARIS;
+      return TrinidadAgent.OS_SOLARIS;
     }
 
-    if (AdfFacesAgent.PLATFORM_PALM.equals(platformName))
+    if (TrinidadAgent.PLATFORM_PALM.equals(platformName))
     {
-      return AdfFacesAgent.OS_PALM;
+      return TrinidadAgent.OS_PALM;
     }
 
-    if (AdfFacesAgent.PLATFORM_PPC.equals(platformName))
+    if (TrinidadAgent.PLATFORM_PPC.equals(platformName))
     {
       //return unknown for now
-      return AdfFacesAgent.OS_PPC;
+      return TrinidadAgent.OS_PPC;
     }
 
-    return AdfFacesAgent.OS_UNKNOWN;
+    return TrinidadAgent.OS_UNKNOWN;
   }
 
   /**
@@ -129,16 +129,16 @@
   {
     if (otype == Agent.TYPE_PDA)
     {
-      return AdfFacesAgent.TYPE_PDA;
+      return TrinidadAgent.TYPE_PDA;
     }
 
     if (otype == Agent.TYPE_PHONE)
     {
-      return AdfFacesAgent.TYPE_PHONE;
+      return TrinidadAgent.TYPE_PHONE;
     }
 
     //Default to desktop (This is UIX 2.2 logic)
-    return AdfFacesAgent.TYPE_DESKTOP;
+    return TrinidadAgent.TYPE_DESKTOP;
   }
 
   /**
@@ -150,24 +150,24 @@
   public static String getAgentName(int agentId)
   {
     switch (agentId) {
-      case AdfFacesAgent.APPLICATION_UNKNOWN:
+      case TrinidadAgent.APPLICATION_UNKNOWN:
         return null;
-      case AdfFacesAgent.APPLICATION_NETSCAPE:
-        return AdfFacesAgent.AGENT_NETSCAPE;
-      case AdfFacesAgent.APPLICATION_IEXPLORER:
-        return AdfFacesAgent.AGENT_IE;
-      case AdfFacesAgent.APPLICATION_GECKO:
-        return AdfFacesAgent.AGENT_GECKO;
-      case AdfFacesAgent.APPLICATION_WEB_CLIPPING:
-        return AdfFacesAgent.AGENT_ELAINE;
-      case AdfFacesAgent.APPLICATION_ICE:
-        return AdfFacesAgent.AGENT_ICE_BROWSER;
-      case AdfFacesAgent.APPLICATION_PIXO:
-        return AdfFacesAgent.AGENT_PIXO;
-      case AdfFacesAgent.APPLICATION_NET_FRONT:
-        return AdfFacesAgent.AGENT_NETFRONT;
-      case AdfFacesAgent.APPLICATION_SAFARI:
-        return AdfFacesAgent.AGENT_WEBKIT;
+      case TrinidadAgent.APPLICATION_NETSCAPE:
+        return TrinidadAgent.AGENT_NETSCAPE;
+      case TrinidadAgent.APPLICATION_IEXPLORER:
+        return TrinidadAgent.AGENT_IE;
+      case TrinidadAgent.APPLICATION_GECKO:
+        return TrinidadAgent.AGENT_GECKO;
+      case TrinidadAgent.APPLICATION_WEB_CLIPPING:
+        return TrinidadAgent.AGENT_ELAINE;
+      case TrinidadAgent.APPLICATION_ICE:
+        return TrinidadAgent.AGENT_ICE_BROWSER;
+      case TrinidadAgent.APPLICATION_PIXO:
+        return TrinidadAgent.AGENT_PIXO;
+      case TrinidadAgent.APPLICATION_NET_FRONT:
+        return TrinidadAgent.AGENT_NETFRONT;
+      case TrinidadAgent.APPLICATION_SAFARI:
+        return TrinidadAgent.AGENT_WEBKIT;
        default:
         return null;
     }
@@ -184,20 +184,20 @@
   public static String getPlatformName(int platformId)
   {
     switch (platformId) {
-      case AdfFacesAgent.OS_UNKNOWN:
+      case TrinidadAgent.OS_UNKNOWN:
         return null;
-      case AdfFacesAgent.OS_WINDOWS:
-        return AdfFacesAgent.PLATFORM_WINDOWS;
-      case AdfFacesAgent.OS_MACOS:
-        return AdfFacesAgent.PLATFORM_MAC;
-      case AdfFacesAgent.OS_LINUX:
-        return AdfFacesAgent.PLATFORM_LINUX;
-      case AdfFacesAgent.OS_SOLARIS:
-        return AdfFacesAgent.PLATFORM_SOLARIS;
-      case AdfFacesAgent.OS_PALM:
-        return AdfFacesAgent.PLATFORM_PALM;
-      case AdfFacesAgent.OS_PPC:
-        return AdfFacesAgent.PLATFORM_PPC;
+      case TrinidadAgent.OS_WINDOWS:
+        return TrinidadAgent.PLATFORM_WINDOWS;
+      case TrinidadAgent.OS_MACOS:
+        return TrinidadAgent.PLATFORM_MAC;
+      case TrinidadAgent.OS_LINUX:
+        return TrinidadAgent.PLATFORM_LINUX;
+      case TrinidadAgent.OS_SOLARIS:
+        return TrinidadAgent.PLATFORM_SOLARIS;
+      case TrinidadAgent.OS_PALM:
+        return TrinidadAgent.PLATFORM_PALM;
+      case TrinidadAgent.OS_PPC:
+        return TrinidadAgent.PLATFORM_PPC;
       default:
         return null;
     }
@@ -211,13 +211,13 @@
    */
   public Object getType (int type) {
     switch (type) {
-      case AdfFacesAgent.TYPE_DESKTOP:
+      case TrinidadAgent.TYPE_DESKTOP:
         return null;
-      case AdfFacesAgent.TYPE_PDA:
+      case TrinidadAgent.TYPE_PDA:
         return Agent.TYPE_PDA;
-      case AdfFacesAgent.TYPE_PHONE:
+      case TrinidadAgent.TYPE_PHONE:
         return Agent.TYPE_PHONE;
-      case AdfFacesAgent.TYPE_VOICE:
+      case TrinidadAgent.TYPE_VOICE:
       default:
         return Agent.TYPE_UNKNOWN;
     }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentUtil.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentUtil.java?rev=426189&r1=426188&r2=426189&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentUtil.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentUtil.java Thu Jul 27 11:31:36 2006
@@ -39,7 +39,7 @@
    * @param platform
    * @return
    */
-  public static AdfFacesAgent getAgent(int type, int browser, String agentVersion, int platform)
+  public static TrinidadAgent getAgent(int type, int browser, String agentVersion, int platform)
   {
     final int fType = type;
     final int fBrowser = browser;
@@ -65,7 +65,7 @@
                 return AgentNameUtil.getPlatformName(fPlatform);
               }
             };
-    return new AdfFacesAgentImpl(agent);
+    return new TrinidadAgentImpl(agent);
   }
 
   /**
@@ -73,10 +73,10 @@
    *
    * @return
    */
-  public static AdfFacesAgent getUnknownAgent()
+  public static TrinidadAgent getUnknownAgent()
   {
     DefaultAgent adfAgent = new DefaultAgent();
-    return new AdfFacesAgentImpl(adfAgent);
+    return new TrinidadAgentImpl(adfAgent);
   }
 
   /**
@@ -85,13 +85,13 @@
    * @param context
    * @return
    */
-  public static AdfFacesAgent getAgent(FacesContext context)
+  public static TrinidadAgent getAgent(FacesContext context)
   {
     Agent agent = RequestContext.getCurrentInstance().getAgent();
-    if (agent instanceof AdfFacesAgent)
-      return (AdfFacesAgent) agent;
+    if (agent instanceof TrinidadAgent)
+      return (TrinidadAgent) agent;
 
-    return new AdfFacesAgentImpl(context, agent);
+    return new TrinidadAgentImpl(context, agent);
   }
 
 
@@ -110,19 +110,19 @@
   //=-=AEW: I don't believe this is a repository thing:  the concept
   //of output mode is entirely renderkit specific, and the tweaks
   //that are made to the capabilities are also renderkit specific.
-  public static AdfFacesAgent mergeCapabilities(AdfFacesAgent agent, Map capabilities)
+  public static TrinidadAgent mergeCapabilities(TrinidadAgent agent, Map capabilities)
   {
-    if (!(agent instanceof AdfFacesAgentImpl))
+    if (!(agent instanceof TrinidadAgentImpl))
       throw new IllegalArgumentException("mergeCapabilities() may only be " +
                                          "used with Agents created by this " +
                                          "class.");
     // Make a copy of the agent first
-    agent = (AdfFacesAgent) agent.clone();
+    agent = (TrinidadAgent) agent.clone();
 
     // Then merge in the capabilities
     // =-=AEW This codepath ends up creating copies of the
     // capability map twice, once in clone(), once in __mergeCapabilities()
-    ((AdfFacesAgentImpl)agent).__mergeCapabilities(capabilities);
+    ((TrinidadAgentImpl)agent).__mergeCapabilities(capabilities);
 
     return agent;
   }

Copied: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java (from r425955, incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AdfFacesAgent.java)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java?p2=incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java&p1=incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AdfFacesAgent.java&r1=425955&r2=426189&rev=426189&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AdfFacesAgent.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java Thu Jul 27 11:31:36 2006
@@ -24,7 +24,7 @@
  *
  * @author The Oracle ADF Faces Team
  */
-public interface AdfFacesAgent extends Agent
+public interface TrinidadAgent extends Agent
 {
   static public final CapabilityKey CAP_DOM =
           CapabilityKey.getCapabilityKey("dom", true);

Copied: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgentImpl.java (from r425972, incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AdfFacesAgentImpl.java)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgentImpl.java?p2=incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgentImpl.java&p1=incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AdfFacesAgentImpl.java&r1=425972&r2=426189&rev=426189&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AdfFacesAgentImpl.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgentImpl.java Thu Jul 27 11:31:36 2006
@@ -31,17 +31,17 @@
  * implementation that supports the AdfFacesAgent
  *
  */
-public class AdfFacesAgentImpl implements AdfFacesAgent, Cloneable
+public class TrinidadAgentImpl implements TrinidadAgent, Cloneable
 {
 
-  public AdfFacesAgentImpl(FacesContext context, Agent agent)
+  public TrinidadAgentImpl(FacesContext context, Agent agent)
   {
     _delegate = agent;
     _initialize(context);
   }
 
 
-  public AdfFacesAgentImpl(Agent agent)
+  public TrinidadAgentImpl(Agent agent)
   {
     this (null, agent);
   }
@@ -158,7 +158,7 @@
   {
     try
     {
-      AdfFacesAgentImpl that = (AdfFacesAgentImpl) super.clone();
+      TrinidadAgentImpl that = (TrinidadAgentImpl) super.clone();
       that._capMap = (CapabilityMap) _capMap.clone();
       return that;
     }
@@ -289,7 +289,7 @@
     }
 
     URL path = null;
-    synchronized (AdfFacesAgentImpl.class)
+    synchronized (TrinidadAgentImpl.class)
     {
       if (_capUrl != null)
         return _capUrl;
@@ -299,7 +299,7 @@
       {
         ClassLoader loader = Thread.currentThread().getContextClassLoader();
         if (loader == null)
-          loader = AdfFacesAgentImpl.class.getClassLoader();
+          loader = TrinidadAgentImpl.class.getClassLoader();
         path =  loader.getResource(_CAPABILITIES_FILE);
       }
       
@@ -385,7 +385,7 @@
 
 
   static final private TrinidadLogger _LOG =
-    TrinidadLogger.createTrinidadLogger(AdfFacesAgentImpl.class);
+    TrinidadLogger.createTrinidadLogger(TrinidadAgentImpl.class);
 
   private static boolean _deviceRepositoryLoaded;
   private static DeviceRepository _deviceRepository;

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java?rev=426189&r1=426188&r2=426189&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java Thu Jul 27 11:31:36 2006
@@ -43,7 +43,7 @@
 import org.apache.myfaces.trinidad.util.ClassLoaderUtils;
 import org.apache.myfaces.trinidad.webapp.UploadedFileProcessor;
 
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgentImpl;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgentImpl;
 import org.apache.myfaces.trinidadinternal.agent.AgentFactory;
 import org.apache.myfaces.trinidadinternal.agent.AgentFactoryImpl;
 
@@ -530,7 +530,7 @@
       Agent agent = _agentFactory.createAgent(__getFacesContext());
       // =-=AEW Does this need to be an AdfFacesAgent?  That should
       // only be necessary once we get to rendering...
-      AdfFacesAgentImpl fAgent = new AdfFacesAgentImpl(__getFacesContext(),agent);
+      TrinidadAgentImpl fAgent = new TrinidadAgentImpl(__getFacesContext(),agent);
       _agent = fAgent;
     }
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageContext.java?rev=426189&r1=426188&r2=426189&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageContext.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/ImageContext.java Thu Jul 27 11:31:36 2006
@@ -16,7 +16,7 @@
 
 package org.apache.myfaces.trinidadinternal.image;
 
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.share.config.Configuration;
 import org.apache.myfaces.trinidadinternal.share.nls.LocaleContext;
 
@@ -39,7 +39,7 @@
   /**
    * Returns the end user's Agent.
    */
-  public AdfFacesAgent getAgent();
+  public TrinidadAgent getAgent();
 
   /**
    * Returns a Configuration object that will be used to

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/Cache.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/Cache.java?rev=426189&r1=426188&r2=426189&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/Cache.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/Cache.java Thu Jul 27 11:31:36 2006
@@ -22,7 +22,7 @@
 
 import org.apache.myfaces.trinidadinternal.util.OptimisticHashMap;
 
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 
 import org.apache.myfaces.trinidadinternal.image.ImageContext;
 import org.apache.myfaces.trinidadinternal.image.encode.ImageEncoderManager;
@@ -45,16 +45,16 @@
     if (entry == null)
       return null;
 
-    AdfFacesAgent agent = context.getAgent();
+    TrinidadAgent agent = context.getAgent();
     //int encodings = ((Integer)agent.getCapability(
     //                                  AdfFacesAgent.CAP_IMAGE_ENCODINGS)).intValue();
     boolean capGif = false;
-    Object capability =  agent.getCapability(AdfFacesAgent.CAP_GIF_TYPE_IMAGE);
+    Object capability =  agent.getCapability(TrinidadAgent.CAP_GIF_TYPE_IMAGE);
     if (capability == Boolean.TRUE)
        capGif = true;
 
     boolean capPng = false;
-    capability = agent.getCapability(AdfFacesAgent.CAP_PNG_TYPE_IMAGE);
+    capability = agent.getCapability(TrinidadAgent.CAP_PNG_TYPE_IMAGE);
     if (capability == Boolean.TRUE)
       capPng = true;
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/FileSystemImageCache.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/FileSystemImageCache.java?rev=426189&r1=426188&r2=426189&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/FileSystemImageCache.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/FileSystemImageCache.java Thu Jul 27 11:31:36 2006
@@ -44,7 +44,7 @@
 
 import org.apache.myfaces.trinidad.util.ArrayMap;
 
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.image.ImageConstants;
 import org.apache.myfaces.trinidadinternal.image.ImageContext;
 import org.apache.myfaces.trinidadinternal.image.ImageProvider;
@@ -1388,7 +1388,7 @@
 
     // Pick an encoding based on the Configuration/Agent
     Configuration config = context.getConfiguration();
-    AdfFacesAgent agent = context.getAgent();
+    TrinidadAgent agent = context.getAgent();
     //encodings was part of old Agent capabilities, not in new Agent Caps. So replaced
     //Object encodingsObj = agent.getCapability(AdfFacesAgent.CAP_IMAGE_ENCODINGS);
     //int encodings = ((encodingsObj == null)
@@ -1402,7 +1402,7 @@
     //{
     //  return ImageEncoderManager.GIF_TYPE;
     //}
-    if ((agent.getCapability(AdfFacesAgent.CAP_GIF_TYPE_IMAGE) == Boolean.TRUE) &&
+    if ((agent.getCapability(TrinidadAgent.CAP_GIF_TYPE_IMAGE) == Boolean.TRUE) &&
             !Boolean.FALSE.equals(config.getProperty(_GIF_ENABLED)))
     {
       return ImageEncoderManager.GIF_TYPE;
@@ -1413,7 +1413,7 @@
     //{
     //  return ImageEncoderManager.PNG_TYPE;
     //}
-    if (agent.getCapability(AdfFacesAgent.CAP_PNG_TYPE_IMAGE) == Boolean.TRUE)
+    if (agent.getCapability(TrinidadAgent.CAP_PNG_TYPE_IMAGE) == Boolean.TRUE)
     {
       return ImageEncoderManager.PNG_TYPE;
     }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderingContext.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/RenderingContext.java?rev=426189&r1=426188&r2=426189&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderingContext.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderingContext.java Thu Jul 27 11:31:36 2006
@@ -20,7 +20,7 @@
 
 import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.renderkit.core.ppr.PartialPageContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.FormData;
 import org.apache.myfaces.trinidadinternal.share.config.AccessibilityMode;
@@ -57,7 +57,7 @@
    */
   abstract public Map           getProperties();
 
-  abstract public AdfFacesAgent getAgent();
+  abstract public TrinidadAgent getAgent();
   /**
    * @todo REMOVE LocaleContext
    */

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.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/CoreRenderKit.java?rev=426189&r1=426188&r2=426189&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java Thu Jul 27 11:31:36 2006
@@ -77,7 +77,7 @@
 import org.apache.myfaces.trinidadinternal.renderkit.htmlBasic.HtmlCommandLinkRenderer;
 import org.apache.myfaces.trinidadinternal.renderkit.htmlBasic.HtmlFormRenderer;
 
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.agent.AgentUtil;
 import org.apache.myfaces.trinidadinternal.share.util.CaboHttpUtils;
 import org.apache.myfaces.trinidadinternal.webapp.DispatchServletResponse;
@@ -588,7 +588,7 @@
 
   private boolean _supportsSeparateWindow(FacesContext context)
   {
-    AdfFacesAgent agent = AgentUtil.getAgent(context);
+    TrinidadAgent agent = AgentUtil.getAgent(context);
     return XhtmlUtils.supportsSeparateWindow(agent);
   }
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRendererUtils.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/CoreRendererUtils.java?rev=426189&r1=426188&r2=426189&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRendererUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRendererUtils.java Thu Jul 27 11:31:36 2006
@@ -19,7 +19,7 @@
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.agent.CapabilityKey;
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 
@@ -59,7 +59,7 @@
     )
   {
     return supportsBooleanCapability(context,
-                                     AdfFacesAgent.CAP_PARTIAL_RENDERING);
+                                     TrinidadAgent.CAP_PARTIAL_RENDERING);
   }
 
   public static boolean supportsNameIdentification(
@@ -67,7 +67,7 @@
     )
   {
     return supportsBooleanCapability(context,
-                                     AdfFacesAgent.CAP_NAME_IDENTIFICATION);
+                                     TrinidadAgent.CAP_NAME_IDENTIFICATION);
   }
 
   public static boolean supportsBooleanCapability(
@@ -75,7 +75,7 @@
     CapabilityKey cap
     )
   {
-    AdfFacesAgent agent = context.getAgent();
+    TrinidadAgent agent = context.getAgent();
     Object capPartial = agent.getCapability(cap);
     if (!Boolean.TRUE.equals(capPartial))
       return false;

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.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/CoreRenderingContext.java?rev=426189&r1=426188&r2=426189&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java Thu Jul 27 11:31:36 2006
@@ -31,8 +31,8 @@
 import org.apache.myfaces.trinidad.context.Agent;
 import org.apache.myfaces.trinidad.context.RequestContext;
 
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgentImpl;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgentImpl;
 import org.apache.myfaces.trinidadinternal.agent.AgentUtil;
 
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
@@ -127,7 +127,7 @@
     return _properties;
   }
 
-  public AdfFacesAgent getAgent()
+  public TrinidadAgent getAgent()
   {
     return _agent;
   }
@@ -334,7 +334,7 @@
 
     // =-=jmw @todo when we have proper renderKitId switching, I can
     // get rid of this bit of code.
-    if (AdfFacesAgent.TYPE_PDA == _agent.getAgentType())
+    if (TrinidadAgent.TYPE_PDA == _agent.getAgentType())
     {
       renderKitId = "org.apache.myfaces.trinidad.pda";
     }
@@ -363,7 +363,7 @@
     _skin = skin;
   }
 
-  private AdfFacesAgent _initializeAgent(
+  private TrinidadAgent _initializeAgent(
     FacesContext context,
     Agent        base,
     String       outputMode)
@@ -372,11 +372,11 @@
     // =-=AEW In theory, we should only be getting a plain Agent
     // out of the RequestContext:  for some reason, we're going
     // straight to an AdfFacesAgent in RequestContext
-    AdfFacesAgent agent;
-    if (base instanceof AdfFacesAgent)
-      agent = (AdfFacesAgent) base;
+    TrinidadAgent agent;
+    if (base instanceof TrinidadAgent)
+      agent = (TrinidadAgent) base;
     else
-      agent = new AdfFacesAgentImpl(context, base);
+      agent = new TrinidadAgentImpl(context, base);
 
     // Now, merge in any capabilities that we need
     if (CoreRenderKit.OUTPUT_MODE_PRINTABLE.equals(outputMode))
@@ -484,7 +484,7 @@
 
   private Skin               _skin;
   private FormData           _formData;
-  private AdfFacesAgent      _agent;
+  private TrinidadAgent      _agent;
   private Map                _styleMap;
   private Map                _skinResourceKeyMap;
   private String             _outputMode;
@@ -501,29 +501,29 @@
   static private final Map _EMAIL_CAPABILITIES = new HashMap();
   static
   {
-    _PRINTABLE_CAPABILITIES.put(AdfFacesAgent.CAP_INTRINSIC_EVENTS,
+    _PRINTABLE_CAPABILITIES.put(TrinidadAgent.CAP_INTRINSIC_EVENTS,
                                 Boolean.FALSE);
-    _PRINTABLE_CAPABILITIES.put(AdfFacesAgent.CAP_SCRIPTING_SPEED,
-                                AdfFacesAgent.SCRIPTING_SPEED_CAP_NONE);
-    _PRINTABLE_CAPABILITIES.put(AdfFacesAgent.CAP_SCRIPTING_SPEED,
-                                AdfFacesAgent.SCRIPTING_SPEED_CAP_NONE);
-    _PRINTABLE_CAPABILITIES.put(AdfFacesAgent.CAP_NAVIGATION,
+    _PRINTABLE_CAPABILITIES.put(TrinidadAgent.CAP_SCRIPTING_SPEED,
+                                TrinidadAgent.SCRIPTING_SPEED_CAP_NONE);
+    _PRINTABLE_CAPABILITIES.put(TrinidadAgent.CAP_SCRIPTING_SPEED,
+                                TrinidadAgent.SCRIPTING_SPEED_CAP_NONE);
+    _PRINTABLE_CAPABILITIES.put(TrinidadAgent.CAP_NAVIGATION,
                                 Boolean.FALSE);
-    _PRINTABLE_CAPABILITIES.put(AdfFacesAgent.CAP_EDITING,
+    _PRINTABLE_CAPABILITIES.put(TrinidadAgent.CAP_EDITING,
                                 Boolean.FALSE);
-    _PRINTABLE_CAPABILITIES.put(AdfFacesAgent.CAP_PARTIAL_RENDERING,
+    _PRINTABLE_CAPABILITIES.put(TrinidadAgent.CAP_PARTIAL_RENDERING,
                                 Boolean.FALSE);
 
 
-    _EMAIL_CAPABILITIES.put(AdfFacesAgent.CAP_INTRINSIC_EVENTS,
+    _EMAIL_CAPABILITIES.put(TrinidadAgent.CAP_INTRINSIC_EVENTS,
                             Boolean.FALSE);
-    _EMAIL_CAPABILITIES.put(AdfFacesAgent.CAP_SCRIPTING_SPEED,
-                            AdfFacesAgent.SCRIPTING_SPEED_CAP_NONE);
-    _EMAIL_CAPABILITIES.put(AdfFacesAgent.CAP_EDITING,
+    _EMAIL_CAPABILITIES.put(TrinidadAgent.CAP_SCRIPTING_SPEED,
+                            TrinidadAgent.SCRIPTING_SPEED_CAP_NONE);
+    _EMAIL_CAPABILITIES.put(TrinidadAgent.CAP_EDITING,
                             Boolean.FALSE);
-    _EMAIL_CAPABILITIES.put(AdfFacesAgent.CAP_STYLE_ATTRIBUTES,
-                            AdfFacesAgent.STYLES_INTERNAL);
-    _EMAIL_CAPABILITIES.put(AdfFacesAgent.CAP_PARTIAL_RENDERING,
+    _EMAIL_CAPABILITIES.put(TrinidadAgent.CAP_STYLE_ATTRIBUTES,
+                            TrinidadAgent.STYLES_INTERNAL);
+    _EMAIL_CAPABILITIES.put(TrinidadAgent.CAP_PARTIAL_RENDERING,
                             Boolean.FALSE);
   }
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.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/StyleContextImpl.java?rev=426189&r1=426188&r2=426189&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.java Thu Jul 27 11:31:36 2006
@@ -19,7 +19,7 @@
 
 import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.HtmlRenderer;
 import org.apache.myfaces.trinidadinternal.share.nls.LocaleContext;
@@ -71,7 +71,7 @@
   /**
    * Returns the end user's Agent.
    */
-  public AdfFacesAgent getAgent()
+  public TrinidadAgent getAgent()
   {
     return _arc.getAgent();
   }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarDialogJSP.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/pages/CalendarDialogJSP.java?rev=426189&r1=426188&r2=426189&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarDialogJSP.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarDialogJSP.java Thu Jul 27 11:31:36 2006
@@ -33,7 +33,7 @@
 import org.apache.myfaces.trinidad.component.html.HtmlTableLayout;
 import org.apache.myfaces.trinidad.context.RequestContext;
 
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.share.url.EncoderUtils;
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
@@ -71,7 +71,7 @@
     form.setId("a");
 
     boolean isDesktop = (arc.getAgent().getAgentType()==
-                         AdfFacesAgent.TYPE_DESKTOP );
+                         TrinidadAgent.TYPE_DESKTOP );
 
     //
     // Create the calendar row
@@ -106,7 +106,7 @@
     buttonRow.getChildren().add(cancelButton);
 
     Object cap = arc.getAgent().getCapability(
-                     AdfFacesAgent.CAP_MULTIPLE_WINDOWS);
+                     TrinidadAgent.CAP_MULTIPLE_WINDOWS);
     boolean multWindowsSupported = Boolean.TRUE.equals( cap );
     if (multWindowsSupported )
     {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MacOSSwitcherIcon.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/skin/MacOSSwitcherIcon.java?rev=426189&r1=426188&r2=426189&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MacOSSwitcherIcon.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MacOSSwitcherIcon.java Thu Jul 27 11:31:36 2006
@@ -22,7 +22,7 @@
 import java.util.Map;
 
 import javax.faces.context.FacesContext;
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
@@ -98,7 +98,7 @@
   // Returns the Icon to use
   private Icon _getIcon(RenderingContext arc)
   {
-    return (arc.getAgent().getAgentOS() == AdfFacesAgent.OS_MACOS) ?
+    return (arc.getAgent().getAgentOS() == TrinidadAgent.OS_MACOS) ?
              _macOSIcon :
              _icon;
   }

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=426189&r1=426188&r2=426189&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 11:31:36 2006
@@ -38,7 +38,7 @@
 
 import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
 
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.pages.GenericEntry;
 import org.apache.myfaces.trinidadinternal.share.nls.LocaleContext;
@@ -112,7 +112,7 @@
       return;
 
     boolean isDesktop = (arc.getAgent().getAgentType() ==
-                         AdfFacesAgent.TYPE_DESKTOP);
+                         TrinidadAgent.TYPE_DESKTOP);
     ResponseWriter writer = context.getResponseWriter();
     writer.startElement("table", component);
     renderId(context, component);
@@ -1462,7 +1462,7 @@
     // Inline mode is only supported if partial page rendering is
     // supported and we are not running in screen reader mode.
     return (PartialPageUtils.supportsPartialRendering(arc) &&
-            (arc.getAgent().getAgentType() == AdfFacesAgent.TYPE_DESKTOP) &&
+            (arc.getAgent().getAgentType() == TrinidadAgent.TYPE_DESKTOP) &&
             !isScreenReaderMode(arc));
   }
 

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=426189&r1=426188&r2=426189&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 11:31:36 2006
@@ -30,7 +30,7 @@
 import org.apache.myfaces.trinidad.component.core.data.CoreColumn;
 import org.apache.myfaces.trinidad.model.SortCriterion;
 
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.CellUtils;
@@ -421,7 +421,7 @@
     //  that the only reason desktop renders it in both places
     //  was for Netscape.  If I'm right, then really this decision should
     //  be driven off an "event bubbling" agent property.
-    if (arc.getAgent().getAgentType() != AdfFacesAgent.TYPE_PDA)
+    if (arc.getAgent().getAgentType() != TrinidadAgent.TYPE_PDA)
       rw.writeAttribute("onclick", sortOnclick, null);
 
     // TODO: we should pass in null for "event bubbling" systems
@@ -556,7 +556,7 @@
     boolean renderAnchor = supportsNavigation(arc);
     if (renderAnchor)
     {
-      if (arc.getAgent().getAgentType() == AdfFacesAgent.TYPE_PDA)
+      if (arc.getAgent().getAgentType() == TrinidadAgent.TYPE_PDA)
         writer.writeText(XhtmlConstants.NBSP_STRING, null);
 
       writer.startElement("a", null);

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=426189&r1=426188&r2=426189&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 11:31:36 2006
@@ -25,7 +25,7 @@
 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.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderingContext;
 
@@ -83,7 +83,7 @@
       renderEncodedActionURI(context, "href", destination);
 
       if (!Boolean.FALSE.equals(
-              arc.getAgent().getCapability(AdfFacesAgent.CAP_TARGET)))
+              arc.getAgent().getCapability(TrinidadAgent.CAP_TARGET)))
       {
         rw.writeAttribute("target", getTargetFrame(bean), null);
       }

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=426189&r1=426188&r2=426189&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 11:31:36 2006
@@ -21,7 +21,7 @@
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 
 public class HiddenLabelUtils
@@ -35,18 +35,18 @@
     if (XhtmlRenderer.isInaccessibleMode(arc))
       return false;
 
-    AdfFacesAgent agent = arc.getAgent();
+    TrinidadAgent agent = arc.getAgent();
     switch (agent.getAgentApplication())
     {
-      case AdfFacesAgent.APPLICATION_IEXPLORER:
-        if (agent.getAgentOS() == AdfFacesAgent.OS_WINDOWS)
+      case TrinidadAgent.APPLICATION_IEXPLORER:
+        if (agent.getAgentOS() == TrinidadAgent.OS_WINDOWS)
         {
           // IE 4 doesn't support the label hack.
           if (agent.getAgentMajorVersion() == 4)
             return false;
 
           // JDev VE masquerades as IE Windows, but doesn't support this
-          if (agent.getCapability(AdfFacesAgent.CAP_IS_JDEV_VE) != null)
+          if (agent.getCapability(TrinidadAgent.CAP_IS_JDEV_VE) != null)
             return false;
 
           // IE 5 and 6 do.
@@ -57,11 +57,11 @@
         return false;
 
       // Mozilla does support the label hack
-      case AdfFacesAgent.APPLICATION_GECKO:
+      case TrinidadAgent.APPLICATION_GECKO:
         return true;
 
       // Assume everyone else doesn't.
-      case AdfFacesAgent.APPLICATION_NETSCAPE:
+      case TrinidadAgent.APPLICATION_NETSCAPE:
       default:
         return false;
     }

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=426189&r1=426188&r2=426189&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 11:31:36 2006
@@ -23,7 +23,7 @@
 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.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 
 public class InputFileRenderer extends InputLabelAndMessageRenderer
@@ -42,7 +42,7 @@
   {
     // =-=AEW inputFile is currently disabled for PDAs.  But this should
     // run off of an agent property.
-    if (arc.getAgent().getAgentType() != AdfFacesAgent.TYPE_PDA)
+    if (arc.getAgent().getAgentType() != TrinidadAgent.TYPE_PDA)
     {
       super.encodeAll(context, arc, component, bean);
     }

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=426189&r1=426188&r2=426189&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 11:31:36 2006
@@ -31,7 +31,7 @@
 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.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.TableRenderingContext;
 
@@ -301,7 +301,7 @@
     String valign = getDefaultLabelValign(bean);
 
     rw.writeAttribute("valign", valign, null);
-    if (arc.getAgent().getAgentType() == AdfFacesAgent.TYPE_DESKTOP)
+    if (arc.getAgent().getAgentType() == TrinidadAgent.TYPE_DESKTOP)
       rw.writeAttribute("nowrap", Boolean.TRUE, null);
 
     if (labelExists)
@@ -358,9 +358,9 @@
     // bug 2484841: PDA: TOO MUCH WHITESPACE BETWEEN
     //                   INPUT ELEMENTS IN LABELEDFIELD
     // This is a browser bug workaround, hopefully we can remove it eventually
-    if ((arc.getAgent().getAgentType() == AdfFacesAgent.TYPE_PDA) &&
+    if ((arc.getAgent().getAgentType() == TrinidadAgent.TYPE_PDA) &&
         (arc.getAgent().getAgentApplication() ==
-           AdfFacesAgent.APPLICATION_IEXPLORER))
+           TrinidadAgent.APPLICATION_IEXPLORER))
     {
       rw.startElement("div", null);
       renderSpacer(context, arc, "1", "0");

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=426189&r1=426188&r2=426189&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 11:31:36 2006
@@ -37,7 +37,7 @@
 import org.apache.myfaces.trinidad.context.Agent;
 import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 
 public class NavigationLevelRenderer extends XhtmlRenderer
@@ -547,7 +547,7 @@
       renderEncodedActionURI(context, "href", destination);
       String targetFrame = _getPossiblyNullString(itemData.get("targetFrame"));
       if ( (targetFrame != null) && !Boolean.FALSE.equals(
-        arc.getAgent().getCapability(AdfFacesAgent.CAP_TARGET)) )
+        arc.getAgent().getCapability(TrinidadAgent.CAP_TARGET)) )
       {
         rw.writeAttribute("target", targetFrame, null);
       }
@@ -911,7 +911,7 @@
           String targetFrame = _getPossiblyNullString(itemData.get("targetFrame"));
           StringBuilder sb = new StringBuilder();
           if ( (targetFrame != null) && !Boolean.FALSE.equals(
-            arc.getAgent().getCapability(AdfFacesAgent.CAP_TARGET)) )
+            arc.getAgent().getCapability(TrinidadAgent.CAP_TARGET)) )
           {
             sb.append("window.open('");
             sb.append(encodedDestination);

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=426189&r1=426188&r2=426189&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 11:31:36 2006
@@ -27,7 +27,7 @@
 
 import org.apache.myfaces.trinidad.util.ArrayMap;
 
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
 
@@ -165,7 +165,7 @@
     )
   {
     return Boolean.TRUE.equals(afc.getAgent().getCapability(
-                        AdfFacesAgent.CAP_ALT_RENDERS_TOOLTIP_ON_IMAGE));
+                        TrinidadAgent.CAP_ALT_RENDERS_TOOLTIP_ON_IMAGE));
   }
 
   /**
@@ -184,7 +184,7 @@
 
     int agentApplication = arc.getAgent().getAgentApplication();
 
-    if (agentApplication == AdfFacesAgent.APPLICATION_NETSCAPE)
+    if (agentApplication == TrinidadAgent.APPLICATION_NETSCAPE)
     {
       return XhtmlConstants.V_ALIGN_TOP;
     }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormRenderer.java?rev=426189&r1=426188&r2=426189&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormRenderer.java Thu Jul 27 11:31:36 2006
@@ -38,7 +38,7 @@
 import org.apache.myfaces.trinidad.component.UIXGroup;
 import org.apache.myfaces.trinidad.component.UIXPanel;
 
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 
 public class PanelFormRenderer extends XhtmlRenderer
@@ -153,7 +153,7 @@
     }
 
     int rows = 0;
-    if (arc.getAgent().getAgentType() == AdfFacesAgent.TYPE_PDA)
+    if (arc.getAgent().getAgentType() == TrinidadAgent.TYPE_PDA)
     {
       maxColumns = 1;
     }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PartialPageUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PartialPageUtils.java?rev=426189&r1=426188&r2=426189&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PartialPageUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PartialPageUtils.java Thu Jul 27 11:31:36 2006
@@ -21,7 +21,7 @@
 
 import org.apache.myfaces.trinidad.context.RequestContext;
 
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.context.RequestContextBean;
 
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
@@ -98,8 +98,8 @@
   {
 
     // First, make sure the agent supports partial rendering
-    AdfFacesAgent agent = arc.getAgent();
-    Object capPartial = agent.getCapability(AdfFacesAgent.CAP_PARTIAL_RENDERING);
+    TrinidadAgent agent = arc.getAgent();
+    Object capPartial = agent.getCapability(TrinidadAgent.CAP_PARTIAL_RENDERING);
     if (!Boolean.TRUE.equals(capPartial))
       return false;
 
@@ -115,8 +115,8 @@
     {
       int application = arc.getAgent().getAgentApplication();
 
-      return ((application == AdfFacesAgent.APPLICATION_IEXPLORER)
-              || (application == AdfFacesAgent.APPLICATION_GECKO));
+      return ((application == TrinidadAgent.APPLICATION_IEXPLORER)
+              || (application == TrinidadAgent.APPLICATION_GECKO));
     }
     return false;
   }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.java?rev=426189&r1=426188&r2=426189&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.java Thu Jul 27 11:31:36 2006
@@ -38,7 +38,7 @@
 import org.apache.myfaces.trinidad.context.RequestContext;
 import org.apache.myfaces.trinidad.event.RangeChangeEvent;
 
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
 import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
@@ -440,10 +440,10 @@
       // to be replaced as part of the partial page update, and fixes
       // our layout problems.
       String iconID = null;
-      AdfFacesAgent agent = arc.getAgent();
+      TrinidadAgent agent = arc.getAgent();
 
       if (PartialPageUtils.isPPRActive(context) &&
-          (agent.getAgentApplication() == AdfFacesAgent.APPLICATION_IEXPLORER))
+          (agent.getAgentApplication() == TrinidadAgent.APPLICATION_IEXPLORER))
       {
         iconID = id + "-i";
       }
@@ -1251,7 +1251,7 @@
    FacesContext context,
    RenderingContext arc) throws IOException
   {
-    if (arc.getAgent().getAgentType() == AdfFacesAgent.TYPE_PDA)
+    if (arc.getAgent().getAgentType() == TrinidadAgent.TYPE_PDA)
     {
       context.getResponseWriter().writeText(XhtmlConstants.NBSP_STRING, null);
     }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java?rev=426189&r1=426188&r2=426189&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java Thu Jul 27 11:31:36 2006
@@ -28,7 +28,7 @@
 
 import org.apache.myfaces.trinidad.component.core.input.CoreInputText;
 
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
 
@@ -265,7 +265,7 @@
    */
   protected Integer getDefaultColumns(RenderingContext arc, FacesBean bean)
   {
-    if (arc.getAgent().getAgentType() == AdfFacesAgent.TYPE_PDA)
+    if (arc.getAgent().getAgentType() == TrinidadAgent.TYPE_PDA)
       return _DEFAULT_PDA_COLUMNS;
 
     return _DEFAULT_COLUMNS;

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputColorRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputColorRenderer.java?rev=426189&r1=426188&r2=426189&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputColorRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputColorRenderer.java Thu Jul 27 11:31:36 2006
@@ -36,7 +36,7 @@
 import org.apache.myfaces.trinidad.context.RequestContext;
 import org.apache.myfaces.trinidad.event.ReturnEvent;
 
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.convert.ColorConverter;
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRendererUtils;
@@ -290,7 +290,7 @@
     // use the default behavior.
     if ((getAction(bean) != null) ||
         !Boolean.TRUE.equals(
-            arc.getAgent().getCapability(AdfFacesAgent.CAP_MULTIPLE_WINDOWS)))
+            arc.getAgent().getCapability(TrinidadAgent.CAP_MULTIPLE_WINDOWS)))
       return super.getLaunchOnclick(context, arc, component, bean);
 
     String id = arc.getCurrentClientId();
@@ -422,7 +422,7 @@
   // On PDAs, we only support a simple text field
   private boolean _supportsSwatchAndChooser(RenderingContext arc)
   {
-    return (arc.getAgent().getAgentType() != AdfFacesAgent.TYPE_PDA);
+    return (arc.getAgent().getAgentType() != TrinidadAgent.TYPE_PDA);
   }
 
   protected String getSearchDesc(FacesBean bean)

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputDateRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputDateRenderer.java?rev=426189&r1=426188&r2=426189&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputDateRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputDateRenderer.java Thu Jul 27 11:31:36 2006
@@ -40,7 +40,7 @@
 import org.apache.myfaces.trinidad.event.ReturnEvent;
 import org.apache.myfaces.trinidad.validator.DateTimeRangeValidator;
 
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.convert.GenericConverterFactory;
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRendererUtils;
@@ -329,7 +329,7 @@
     // use the default behavior.
     if ((getAction(bean) != null) ||
         !Boolean.TRUE.equals(
-            arc.getAgent().getCapability(AdfFacesAgent.CAP_MULTIPLE_WINDOWS)))
+            arc.getAgent().getCapability(TrinidadAgent.CAP_MULTIPLE_WINDOWS)))
       return super.getLaunchOnclick(context, arc, component, bean);
 
     String id = arc.getCurrentClientId();

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputTextRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputTextRenderer.java?rev=426189&r1=426188&r2=426189&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputTextRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputTextRenderer.java Thu Jul 27 11:31:36 2006
@@ -33,7 +33,7 @@
 
 import org.apache.myfaces.trinidad.event.ReturnEvent;
 
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.agent.AgentUtil;
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
@@ -92,7 +92,7 @@
           // Force partial rendering (if we're launching a window)
           // =-=AEW I don't believe this is necessary;  I believe
           // we've already got "partial" turned on
-          AdfFacesAgent agent = AgentUtil.getAgent(context);
+          TrinidadAgent agent = AgentUtil.getAgent(context);
           if (XhtmlUtils.supportsSeparateWindow(agent))
             PartialPageUtils.forcePartialRendering(context);
 



Mime
View raw message