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 [2/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
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyCheckboxRenderer.java?rev=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/SimpleSelectManyCheckboxRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyCheckboxRenderer.java Thu Jul 27 11:31:36 2006
@@ -31,7 +31,7 @@
 
 import org.apache.myfaces.trinidad.component.core.input.CoreSelectManyCheckbox;
 
-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;
 
@@ -353,7 +353,7 @@
       return true;
 
     return Boolean.TRUE.equals(
-       arc.getAgent().getCapability(AdfFacesAgent.CAP_FIELDSET));
+       arc.getAgent().getCapability(TrinidadAgent.CAP_FIELDSET));
   }
 
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRadioRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRadioRenderer.java?rev=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/SimpleSelectOneRadioRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRadioRenderer.java Thu Jul 27 11:31:36 2006
@@ -31,7 +31,7 @@
 
 import org.apache.myfaces.trinidad.component.core.input.CoreSelectOneRadio;
 
-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;
 
@@ -350,7 +350,7 @@
       return true;
 
     return Boolean.TRUE.equals(
-       arc.getAgent().getCapability(AdfFacesAgent.CAP_FIELDSET));
+       arc.getAgent().getCapability(TrinidadAgent.CAP_FIELDSET));
   }
 
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRenderer.java?rev=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/SimpleSelectOneRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRenderer.java Thu Jul 27 11:31:36 2006
@@ -34,7 +34,7 @@
 
 import org.apache.myfaces.trinidad.component.UIXSelectOne;
 
-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.uix.SelectItemSupport;
 import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
@@ -117,7 +117,7 @@
     if (item.isDisabled())
     {
       if (!Boolean.TRUE.equals(arc.getAgent().getCapability(
-                          AdfFacesAgent.CAP_SUPPORTS_DISABLED_OPTIONS)))
+                          TrinidadAgent.CAP_SUPPORTS_DISABLED_OPTIONS)))
         return false;
     }
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TableRenderer.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/TableRenderer.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/TableRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TableRenderer.java Thu Jul 27 11:31:36 2006
@@ -44,7 +44,7 @@
 import org.apache.myfaces.trinidad.model.RowKeySet;
 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.CoreRenderer;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.CellUtils;
@@ -598,9 +598,9 @@
       // We only generate the navigation bar ID if the agent is IE
       // and partial rendering is enabled.
       Object id = tContext.getTableId();
-      AdfFacesAgent agent = arc.getAgent();
+      TrinidadAgent agent = arc.getAgent();
 
-      if ((agent.getAgentApplication() == AdfFacesAgent.APPLICATION_IEXPLORER) &&
+      if ((agent.getAgentApplication() == TrinidadAgent.APPLICATION_IEXPLORER) &&
           PartialPageUtils.isPPRActive(context))
       {
         String navBarID = id.toString() + "-nb";

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlRenderer.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/XhtmlRenderer.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/XhtmlRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlRenderer.java Thu Jul 27 11:31:36 2006
@@ -30,7 +30,7 @@
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.render.TypedRenderer;
 
-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.CoreRenderer;
 import org.apache.myfaces.trinidadinternal.renderkit.core.ppr.PartialPageContext;
@@ -92,19 +92,19 @@
 
   static public boolean isDesktop(RenderingContext arc)
   {
-    return (arc.getAgent().getAgentType() == AdfFacesAgent.TYPE_DESKTOP);
+    return (arc.getAgent().getAgentType() == TrinidadAgent.TYPE_DESKTOP);
   }
 
   static public boolean isIE(RenderingContext arc)
   {
     return (arc.getAgent().getAgentApplication() ==
-              AdfFacesAgent.APPLICATION_IEXPLORER);
+              TrinidadAgent.APPLICATION_IEXPLORER);
   }
 
   static public boolean isGecko(RenderingContext arc)
   {
     return (arc.getAgent().getAgentApplication() ==
-              AdfFacesAgent.APPLICATION_GECKO);
+              TrinidadAgent.APPLICATION_GECKO);
   }
 
   static public boolean isInaccessibleMode(RenderingContext arc)
@@ -122,16 +122,16 @@
   static public boolean supportsScripting(RenderingContext arc)
   {
     Object scriptingSpeed = arc.getAgent().getCapability(
-            AdfFacesAgent.CAP_SCRIPTING_SPEED);
+            TrinidadAgent.CAP_SCRIPTING_SPEED);
 
     return ((scriptingSpeed != null) &&
-            (AdfFacesAgent.SCRIPTING_SPEED_CAP_NONE != scriptingSpeed));
+            (TrinidadAgent.SCRIPTING_SPEED_CAP_NONE != scriptingSpeed));
   }
 
   static public boolean supportsEditing(RenderingContext arc)
   {
     Object cap = arc.getAgent().getCapability(
-                    AdfFacesAgent.CAP_EDITING);
+                    TrinidadAgent.CAP_EDITING);
     return !Boolean.FALSE.equals(cap);
   }
 
@@ -147,14 +147,14 @@
           RenderingContext arc
           )
   {
-    return (arc.getAgent().getCapability(AdfFacesAgent.CAP_STYLE_ATTRIBUTES) !=
-            AdfFacesAgent.STYLES_NONE);
+    return (arc.getAgent().getCapability(TrinidadAgent.CAP_STYLE_ATTRIBUTES) !=
+            TrinidadAgent.STYLES_NONE);
   }
 
   static public boolean supportsNavigation(RenderingContext arc)
   {
     Object cap = arc.getAgent().getCapability(
-                    AdfFacesAgent.CAP_NAVIGATION);
+                    TrinidadAgent.CAP_NAVIGATION);
     return !Boolean.FALSE.equals(cap);
   }
 
@@ -168,7 +168,7 @@
           )
   {
     Object cap = arc.getAgent().getCapability(
-                    AdfFacesAgent.CAP_TEXT_PRESENTATION);
+                    TrinidadAgent.CAP_TEXT_PRESENTATION);
     return !Boolean.FALSE.equals(cap);
   }
   static public boolean supportsAccessKeys(RenderingContext arc)
@@ -180,14 +180,14 @@
       return false;
 
     Object cap = arc.getAgent().getCapability(
-                    AdfFacesAgent.CAP_ACCESS_KEYS);
+                    TrinidadAgent.CAP_ACCESS_KEYS);
     return !Boolean.FALSE.equals(cap);
   }
 
   static public final boolean supportsDisabledFormElements(RenderingContext arc)
   {
     Object cap = arc.getAgent().getCapability(
-                    AdfFacesAgent.CAP_DISABLED_FORM_ELEMENTS);
+                    TrinidadAgent.CAP_DISABLED_FORM_ELEMENTS);
     return !Boolean.FALSE.equals(cap);
 
   }
@@ -195,7 +195,7 @@
   static public final boolean supportsReadonlyFormElements(RenderingContext arc)
   {
     Object cap = arc.getAgent().getCapability(
-                    AdfFacesAgent.CAP_READONLY_FORM_ELEMENTS);
+                    TrinidadAgent.CAP_READONLY_FORM_ELEMENTS);
     return !Boolean.FALSE.equals(cap);
 
   }
@@ -204,7 +204,7 @@
      RenderingContext arc)
   {
     Object cap = arc.getAgent().getCapability(
-                    AdfFacesAgent.CAP_AUTO_COMPLETE_FORM_ELEMENTS);
+                    TrinidadAgent.CAP_AUTO_COMPLETE_FORM_ELEMENTS);
     return !Boolean.FALSE.equals(cap);
   }
 
@@ -225,7 +225,7 @@
 
   {
     Object cap = arc.getAgent().getCapability(
-                    AdfFacesAgent.CAP_TARGET);
+                    TrinidadAgent.CAP_TARGET);
     return !Boolean.FALSE.equals(cap);
   }
 
@@ -238,7 +238,7 @@
     RenderingContext arc)
   {
     Object cap = arc.getAgent().getCapability(
-                    AdfFacesAgent.CAP_XMLDOM);
+                    TrinidadAgent.CAP_XMLDOM);
     return Boolean.TRUE.equals(cap);
   }
 
@@ -704,8 +704,8 @@
     // number of spacers. bug 3786394:
     boolean useScript =
       ((count < 800)
-       && (AdfFacesAgent.SCRIPTING_SPEED_CAP_FAST ==
-           arc.getAgent().getCapability(AdfFacesAgent.CAP_SCRIPTING_SPEED)));
+       && (TrinidadAgent.SCRIPTING_SPEED_CAP_FAST ==
+           arc.getAgent().getCapability(TrinidadAgent.CAP_SCRIPTING_SPEED)));
     _renderTransparent(context, arc, width, height, needsQuoting, id, useScript);
   }
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.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/XhtmlUtils.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/XhtmlUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java Thu Jul 27 11:31:36 2006
@@ -34,7 +34,7 @@
 import org.apache.myfaces.trinidad.component.UIXSubform;
 import org.apache.myfaces.trinidad.component.UIXSwitcher;
 
-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.jsLibs.Scriptlet;
@@ -75,12 +75,12 @@
    * support and PPR support.
    */
   static public final boolean supportsSeparateWindow(
-    AdfFacesAgent agent)
+    TrinidadAgent agent)
   {
     return (Boolean.TRUE.equals(
-             agent.getCapability(AdfFacesAgent.CAP_MULTIPLE_WINDOWS)) &&
+             agent.getCapability(TrinidadAgent.CAP_MULTIPLE_WINDOWS)) &&
             Boolean.TRUE.equals(
-             agent.getCapability(AdfFacesAgent.CAP_PARTIAL_RENDERING)));
+             agent.getCapability(TrinidadAgent.CAP_PARTIAL_RENDERING)));
   }
 
   /** Library key for the locale lib */
@@ -159,7 +159,7 @@
     // that's the platform that would benefit the most from this trick),
     // as this same trick once caused really problems when resizing windows!
     if (XhtmlConstants.FACET_PORTLET.equals(arc.getOutputMode()) &&
-        !(AdfFacesAgent.APPLICATION_NETSCAPE ==
+        !(TrinidadAgent.APPLICATION_NETSCAPE ==
           arc.getAgent().getAgentApplication()))
     {
       if (arc.getProperties().get(_PORTLET_LIB_TABLE_KEY) == null)

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/CellUtils.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/table/CellUtils.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/table/CellUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/CellUtils.java Thu Jul 27 11:31:36 2006
@@ -22,7 +22,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.xhtml.XhtmlConstants;
 
@@ -185,7 +185,7 @@
     
     if ((tContext.getTableHeight() != null) &&
         (arc.getAgent().getAgentApplication() ==
-           AdfFacesAgent.APPLICATION_GECKO))
+           TrinidadAgent.APPLICATION_GECKO))
     {
       return getBorderClass(false, false, false, false);
     }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectManyShuttleRenderer.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/uix/SelectManyShuttleRenderer.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/uix/SelectManyShuttleRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectManyShuttleRenderer.java Thu Jul 27 11:31:36 2006
@@ -34,7 +34,7 @@
 import org.apache.myfaces.trinidad.component.core.input.CoreSelectItem;
 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.agent.AgentUtil;
 import org.apache.myfaces.trinidadinternal.ui.AttributeKey;
 import org.apache.myfaces.trinidadinternal.uinode.UINodeFacesBean;
@@ -155,7 +155,7 @@
         // options
         boolean agentSupportsDisabledOptions = Boolean.TRUE.equals(AgentUtil
             .getAgent(context).getCapability(
-                AdfFacesAgent.CAP_SUPPORTS_DISABLED_OPTIONS));
+                TrinidadAgent.CAP_SUPPORTS_DISABLED_OPTIONS));
         boolean isItemDisabled = uiSelectItem.isDisabled();
         if (!isItemDisabled || agentSupportsDisabledOptions)
         {

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinCSSDocumentHandler.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinCSSDocumentHandler.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/skin/SkinCSSDocumentHandler.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinCSSDocumentHandler.java Thu Jul 27 11:31:36 2006
@@ -22,7 +22,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.style.util.NameUtils;
 import org.apache.myfaces.trinidadinternal.style.util.StyleUtils;
 import org.apache.myfaces.trinidadinternal.style.xml.parse.PropertyNode;
@@ -330,7 +330,7 @@
         {
           int agentInt = NameUtils.getBrowser(typeArray[i].trim());
           
-          if (agentInt != AdfFacesAgent.APPLICATION_UNKNOWN)
+          if (agentInt != TrinidadAgent.APPLICATION_UNKNOWN)
             list.add(IntegerUtils.getInteger(agentInt));
         }
       }
@@ -340,7 +340,7 @@
         {
           int platformInt = NameUtils.getPlatform(typeArray[i].trim());           
 
-          if (platformInt != AdfFacesAgent.OS_UNKNOWN)
+          if (platformInt != TrinidadAgent.OS_UNKNOWN)
             list.add(IntegerUtils.getInteger(platformInt));
         }          
       }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/StyleContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/StyleContext.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/style/StyleContext.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/StyleContext.java Thu Jul 27 11:31:36 2006
@@ -16,7 +16,7 @@
 
 package org.apache.myfaces.trinidadinternal.style;
 
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.share.nls.LocaleContext;
 
 /**
@@ -37,7 +37,7 @@
   /**
    * Returns the end user's Agent.
    */
-  public AdfFacesAgent getAgent();
+  public TrinidadAgent getAgent();
 
   public String getGeneratedFilesPath();
   public boolean checkStylesModified();

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.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/style/cache/FileSystemStyleCache.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java Thu Jul 27 11:31:36 2006
@@ -40,7 +40,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.share.io.DefaultNameResolver;
 import org.apache.myfaces.trinidadinternal.share.io.NameResolver;
 import org.apache.myfaces.trinidadinternal.share.io.CachingNameResolver;
@@ -968,7 +968,7 @@
   {
     public Key(StyleContext context)
     {
-      AdfFacesAgent agent = context.getAgent();
+      TrinidadAgent agent = context.getAgent();
 
       LocaleContext localeContext = context.getLocaleContext();
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/NameUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/NameUtils.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/style/util/NameUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/NameUtils.java Thu Jul 27 11:31:36 2006
@@ -23,7 +23,7 @@
 import org.apache.myfaces.trinidadinternal.util.nls.LocaleUtils;
 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.style.StyleContext;
 import org.apache.myfaces.trinidadinternal.style.UserStyleSheet;
@@ -47,21 +47,21 @@
   public static int getBrowser(String browserName)
   {
     if (browserName == null)
-      return AdfFacesAgent.APPLICATION_UNKNOWN;
+      return TrinidadAgent.APPLICATION_UNKNOWN;
 
-    int browser = AdfFacesAgent.APPLICATION_UNKNOWN;
+    int browser = TrinidadAgent.APPLICATION_UNKNOWN;
 
     if (_BROWSER_NETSCAPE.equals(browserName))
-      browser = AdfFacesAgent.APPLICATION_NETSCAPE;
+      browser = TrinidadAgent.APPLICATION_NETSCAPE;
     else if (_BROWSER_IE.equals(browserName))
-      browser = AdfFacesAgent.APPLICATION_IEXPLORER;
+      browser = TrinidadAgent.APPLICATION_IEXPLORER;
     else if (_BROWSER_GECKO.equals(browserName) ||
              _BROWSER_MOZILLA.equals(browserName))
-      browser = AdfFacesAgent.APPLICATION_GECKO;
+      browser = TrinidadAgent.APPLICATION_GECKO;
     else if (_BROWSER_ICE.equals(browserName))
-      browser = AdfFacesAgent.APPLICATION_ICE;
+      browser = TrinidadAgent.APPLICATION_ICE;
     else if (_BROWSER_WEBKIT.equals(browserName))
-      browser = AdfFacesAgent.APPLICATION_SAFARI;
+      browser = TrinidadAgent.APPLICATION_SAFARI;
     else
     {
       // Either a new or an invalid browser
@@ -80,22 +80,22 @@
 
     switch (browser)
     {
-    case AdfFacesAgent.APPLICATION_NETSCAPE:
+    case TrinidadAgent.APPLICATION_NETSCAPE:
       name = _BROWSER_NETSCAPE;
       break;
-    case AdfFacesAgent.APPLICATION_IEXPLORER:
+    case TrinidadAgent.APPLICATION_IEXPLORER:
       name = _BROWSER_IE;
       break;
-    case AdfFacesAgent.APPLICATION_GECKO:
+    case TrinidadAgent.APPLICATION_GECKO:
       name = _BROWSER_GECKO;
       break;
-    case AdfFacesAgent.APPLICATION_ICE:
+    case TrinidadAgent.APPLICATION_ICE:
       name = _BROWSER_ICE;
       break;
-    case AdfFacesAgent.APPLICATION_SAFARI:
+    case TrinidadAgent.APPLICATION_SAFARI:
       name = _BROWSER_WEBKIT;
       break;
-    case AdfFacesAgent.APPLICATION_UNKNOWN:
+    case TrinidadAgent.APPLICATION_UNKNOWN:
       // This case is only here to avoid the default assertion
       break;
     default:
@@ -176,20 +176,20 @@
   public static int getPlatform(String platformName)
   {
     if (platformName == null)
-      return AdfFacesAgent.OS_UNKNOWN;
+      return TrinidadAgent.OS_UNKNOWN;
 
-    int platform = AdfFacesAgent.OS_UNKNOWN;
+    int platform = TrinidadAgent.OS_UNKNOWN;
 
     if (_PLATFORM_WINDOWS.equals(platformName))
-      platform = AdfFacesAgent.OS_WINDOWS;
+      platform = TrinidadAgent.OS_WINDOWS;
     else if (_PLATFORM_MACOS.equals(platformName))
-      platform = AdfFacesAgent.OS_MACOS;
+      platform = TrinidadAgent.OS_MACOS;
     else if (_PLATFORM_LINUX.equals(platformName))
-      platform = AdfFacesAgent.OS_LINUX;
+      platform = TrinidadAgent.OS_LINUX;
     else if (_PLATFORM_SOLARIS.equals(platformName))
-      platform = AdfFacesAgent.OS_SOLARIS;
+      platform = TrinidadAgent.OS_SOLARIS;
     else if (_PLATFORM_PPC.equals(platformName))
-      platform = AdfFacesAgent.OS_PPC;
+      platform = TrinidadAgent.OS_PPC;
     else if (!_PLATFORM_UNIX.equals(platformName))
     {
       // Either a new or an invalid platform
@@ -208,22 +208,22 @@
 
     switch (platform)
     {
-    case AdfFacesAgent.OS_WINDOWS:
+    case TrinidadAgent.OS_WINDOWS:
       name = _PLATFORM_WINDOWS;
       break;
-    case AdfFacesAgent.OS_MACOS:
+    case TrinidadAgent.OS_MACOS:
       name = _PLATFORM_MACOS;
       break;
-    case AdfFacesAgent.OS_LINUX:
+    case TrinidadAgent.OS_LINUX:
       name = _PLATFORM_LINUX;
       break;
-    case AdfFacesAgent.OS_SOLARIS:
+    case TrinidadAgent.OS_SOLARIS:
       name = _PLATFORM_SOLARIS;
       break;
-    case AdfFacesAgent.OS_PPC:
+    case TrinidadAgent.OS_PPC:
       name = _PLATFORM_PPC;
       break;
-    case AdfFacesAgent.OS_UNKNOWN:
+    case TrinidadAgent.OS_UNKNOWN:
       // This case is only here to avoid the default assertion
       break;
     default:
@@ -458,7 +458,7 @@
   // Get the version as a String
   private static String _getVersionString(StyleContext context)
   {
-    AdfFacesAgent agent = context.getAgent();
+    TrinidadAgent agent = context.getAgent();
     int version = agent.getAgentMajorVersion();
 
     // Zero indicates that the version is not known
@@ -576,7 +576,7 @@
       StyleSheetNode[] styleSheets)
   {
     int browser = context.getAgent().getAgentApplication();
-    if (browser == AdfFacesAgent.APPLICATION_UNKNOWN)
+    if (browser == TrinidadAgent.APPLICATION_UNKNOWN)
       return false;
 
     // If any style sheet has a non-null browser variant, we must
@@ -616,7 +616,7 @@
       StyleSheetNode[] styleSheets)
   {
     int platform = context.getAgent().getAgentOS();
-    if (platform == AdfFacesAgent.OS_UNKNOWN)
+    if (platform == TrinidadAgent.OS_UNKNOWN)
       return false;
 
     // If any style sheet has a non-null platform variant, we must

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.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/style/xml/parse/StyleSheetDocument.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java Thu Jul 27 11:31:36 2006
@@ -35,7 +35,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.share.nls.LocaleContext;
 
 import org.apache.myfaces.trinidadinternal.style.PropertyParseException;
@@ -295,7 +295,7 @@
     Locale locale = localeContext.getTranslationLocale();
     int direction = localeContext.getReadingDirection();
     int mode = NameUtils.getMode(ModeUtils.getCurrentMode(context));
-    AdfFacesAgent agent = context.getAgent();
+    TrinidadAgent agent = context.getAgent();
 
     Vector v = new Vector();           // Vector of matching style sheets
     Iterator e = getStyleSheets();  // Enum of all style sheets
@@ -895,7 +895,7 @@
     public StyleSheetComparator(
       Locale locale,
       int direction,
-      AdfFacesAgent agent,
+      TrinidadAgent agent,
       int mode,
       StyleSheetNode[] styleSheets
       )
@@ -954,7 +954,7 @@
 
     private Locale _locale;
     private int    _direction;
-    private AdfFacesAgent  _agent;
+    private TrinidadAgent  _agent;
     private int _mode;
     // We use the style sheet node array to determine the
     // precedence of two stylesheets with the same attributes.

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNode.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNode.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/style/xml/parse/StyleSheetNode.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNode.java Thu Jul 27 11:31:36 2006
@@ -24,7 +24,7 @@
 
 import org.apache.myfaces.trinidadinternal.util.nls.LocaleUtils;
 
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 
 import org.apache.myfaces.trinidadinternal.style.util.ModeUtils;
 import org.apache.myfaces.trinidadinternal.style.util.NameUtils;
@@ -158,7 +158,7 @@
   public int compareVariants(
     Locale locale, 
     int direction, 
-    AdfFacesAgent agent, 
+    TrinidadAgent agent, 
     int mode)
   {
     int localeMatch = _compareLocale(locale);
@@ -182,7 +182,7 @@
     // clients to generate a "default" style sheet - for cases where
     // the browser/version isn't known.  Since there is no Agent
     // VERSION_UNKNOWN constant, we cue off of APPLICATION_UNKNOWN.
-    if (browser != AdfFacesAgent.APPLICATION_UNKNOWN)
+    if (browser != TrinidadAgent.APPLICATION_UNKNOWN)
     {
       versionMatch = _compareVersion(agent.getAgentMajorVersion());
       if (versionMatch == 0)
@@ -277,7 +277,7 @@
 
     // On the other hand, if we do have a browser specified, but
     // the client browser is not known, we don't have a match
-    if (browser == AdfFacesAgent.APPLICATION_UNKNOWN)
+    if (browser == TrinidadAgent.APPLICATION_UNKNOWN)
       return 0;
 
     if (_containsInt(browser, _browsers))
@@ -307,7 +307,7 @@
 
     // On the other hand, if we do have a platform specified, but
     // the client platform is unknown, we don't have a match.
-    if (os == AdfFacesAgent.OS_UNKNOWN)
+    if (os == TrinidadAgent.OS_UNKNOWN)
       return 0;
 
     if (_containsInt(os, _platforms))
@@ -493,8 +493,8 @@
   // time a new Unix OS constant is added Agent.
   private static final int[] _UNIX_PLATFORMS =
   {
-    AdfFacesAgent.OS_LINUX,
-    AdfFacesAgent.OS_SOLARIS
+    TrinidadAgent.OS_LINUX,
+    TrinidadAgent.OS_SOLARIS
   };
 
   // This special platform constant is used to indicate that the style sheet

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNodeParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNodeParser.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/style/xml/parse/StyleSheetNodeParser.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNodeParser.java Thu Jul 27 11:31:36 2006
@@ -27,7 +27,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.share.xml.BaseNodeParser;
 import org.apache.myfaces.trinidadinternal.share.xml.NodeParser;
 import org.apache.myfaces.trinidadinternal.share.xml.ParseContext;
@@ -178,7 +178,7 @@
     {
       int browser = NameUtils.getBrowser((String)browsers.next());
 
-      if (browser != AdfFacesAgent.APPLICATION_UNKNOWN)
+      if (browser != TrinidadAgent.APPLICATION_UNKNOWN)
         v.addElement(IntegerUtils.getInteger(browser));
     }
 
@@ -227,10 +227,10 @@
       int platform = NameUtils.getPlatform(platformName);
 
       // If we didn't find the platform, check for special "unix" platform
-      if ((platform == AdfFacesAgent.OS_UNKNOWN) && "unix".equals(platformName))
+      if ((platform == TrinidadAgent.OS_UNKNOWN) && "unix".equals(platformName))
         platform = StyleSheetNode.__OS_UNIX;
 
-      if (platform != AdfFacesAgent.OS_UNKNOWN)
+      if (platform != TrinidadAgent.OS_UNKNOWN)
         v.addElement(IntegerUtils.getInteger(platform));
     }
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIXRenderingContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIXRenderingContext.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/ui/UIXRenderingContext.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIXRenderingContext.java Thu Jul 27 11:31:36 2006
@@ -19,7 +19,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.share.config.Configuration;
 import org.apache.myfaces.trinidadinternal.share.nls.LocaleContext;
 import org.apache.myfaces.trinidadinternal.share.url.FormEncoder;
@@ -142,7 +142,7 @@
    * Returns an Agent object that can be used to identify
    * what device will display the rendering.
    */
-  public AdfFacesAgent getAgent();
+  public TrinidadAgent getAgent();
 
   /**
    * Returns the LocaleContext that should be used for rendering.

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/CompositeRenderingContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/CompositeRenderingContext.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/ui/composite/CompositeRenderingContext.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/CompositeRenderingContext.java Thu Jul 27 11:31:36 2006
@@ -24,7 +24,7 @@
 import org.apache.myfaces.trinidadinternal.skin.Skin;
 
 
-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;
 import org.apache.myfaces.trinidadinternal.share.url.FormEncoder;
@@ -201,7 +201,7 @@
    * Returns an Agent object that can be used to identify
    * what device will display the rendering.
    */
-  public AdfFacesAgent getAgent()
+  public TrinidadAgent getAgent()
   {
     return _nonCompositeContext.getAgent();
   }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/expl/UIFunctions.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/expl/UIFunctions.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/ui/expl/UIFunctions.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/expl/UIFunctions.java Thu Jul 27 11:31:36 2006
@@ -20,7 +20,7 @@
 import java.util.Set;
 
 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.ui.UIXRenderingContext;
@@ -109,9 +109,9 @@
 
 
     final char breakHint;
-    if ((agentApp == AdfFacesAgent.APPLICATION_IEXPLORER) ||
-        (agentApp == AdfFacesAgent.APPLICATION_GECKO) ||
-        (agentApp == AdfFacesAgent.APPLICATION_NETSCAPE))
+    if ((agentApp == TrinidadAgent.APPLICATION_IEXPLORER) ||
+        (agentApp == TrinidadAgent.APPLICATION_GECKO) ||
+        (agentApp == TrinidadAgent.APPLICATION_NETSCAPE))
     {
       // insert the special unicode character that tells the output method to
       // use the <wbr> tag. This character is recognized by HTMLEscapes:

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/NameAndAgentScorer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/NameAndAgentScorer.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/ui/laf/NameAndAgentScorer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/NameAndAgentScorer.java Thu Jul 27 11:31:36 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.trinidadinternal.ui.laf;
 
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 
 import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 
@@ -70,7 +70,7 @@
 
     int nameScore = _scoreName(lafName);
 
-    AdfFacesAgent agent = context. getAgent();
+    TrinidadAgent agent = context. getAgent();
     int typeScore = _score(_agentType, agent.getAgentType());
     int appScore = _score(_agentApplication, agent.getAgentApplication());
     int versScore = _score(_agentMajorVersion, agent.getAgentMajorVersion());

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafRenderer.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/ui/laf/base/BaseLafRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafRenderer.java Thu Jul 27 11:31:36 2006
@@ -19,7 +19,7 @@
 
 import javax.faces.component.UIComponent;
 
-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.share.config.AccessibilityMode;
 import org.apache.myfaces.trinidadinternal.share.config.Configuration;
@@ -776,8 +776,8 @@
           UIXRenderingContext context
           )
   {
-    return (AdfFacesAgent.DOM_CAP_LEVEL_2 ==
-            context.getAgent().getCapability(AdfFacesAgent.CAP_DOM));
+    return (TrinidadAgent.DOM_CAP_LEVEL_2 ==
+            context.getAgent().getCapability(TrinidadAgent.CAP_DOM));
   }
 
   /**
@@ -787,7 +787,7 @@
           UIXRenderingContext context
           )
   {
-    return getBooleanAgentCapability(context, AdfFacesAgent.CAP_ID);
+    return getBooleanAgentCapability(context, TrinidadAgent.CAP_ID);
   }
 
   /**
@@ -797,7 +797,7 @@
           UIXRenderingContext context
           )
   {
-    return getBooleanAgentCapability(context, AdfFacesAgent.CAP_XMLDOM);
+    return getBooleanAgentCapability(context, TrinidadAgent.CAP_XMLDOM);
   }
 
 
@@ -810,7 +810,7 @@
   {
     if (isScreenReaderMode(context))
       return false;
-    return getBooleanAgentCapability(context, AdfFacesAgent.CAP_ACCESS_KEYS);
+    return getBooleanAgentCapability(context, TrinidadAgent.CAP_ACCESS_KEYS);
   }
 
 
@@ -823,7 +823,7 @@
           UIXRenderingContext context
           )
   {
-    return getBooleanAgentCapability(context, AdfFacesAgent.CAP_TEXT_PRESENTATION);
+    return getBooleanAgentCapability(context, TrinidadAgent.CAP_TEXT_PRESENTATION);
   }
 
   /**
@@ -835,7 +835,7 @@
           UIXRenderingContext context
           )
   {
-    return getBooleanAgentCapability(context, AdfFacesAgent.CAP_ADVANCED_FORMS);
+    return getBooleanAgentCapability(context, TrinidadAgent.CAP_ADVANCED_FORMS);
   }
 
 
@@ -848,8 +848,8 @@
           UIXRenderingContext context
           )
   {
-    return (AdfFacesAgent.TABLES_CAP_ADVANCED ==
-            getAgentCapability(context, AdfFacesAgent.CAP_TABLES));
+    return (TrinidadAgent.TABLES_CAP_ADVANCED ==
+            getAgentCapability(context, TrinidadAgent.CAP_TABLES));
   }
 
 
@@ -862,7 +862,7 @@
           UIXRenderingContext context
           )
   {
-    return getBooleanAgentCapability(context, AdfFacesAgent.CAP_FRAMES);
+    return getBooleanAgentCapability(context, TrinidadAgent.CAP_FRAMES);
   }
 
 
@@ -876,7 +876,7 @@
           UIXRenderingContext context
           )
   {
-    return getBooleanAgentCapability(context, AdfFacesAgent.CAP_TARGET);
+    return getBooleanAgentCapability(context, TrinidadAgent.CAP_TARGET);
   }
 
 
@@ -889,7 +889,7 @@
           UIXRenderingContext context
           )
   {
-    return getBooleanAgentCapability(context, AdfFacesAgent.CAP_IFRAMES);
+    return getBooleanAgentCapability(context, TrinidadAgent.CAP_IFRAMES);
   }
 
 
@@ -905,7 +905,7 @@
           UIXRenderingContext context
           )
   {
-    return getBooleanAgentCapability(context, AdfFacesAgent.CAP_INTRINSIC_EVENTS);
+    return getBooleanAgentCapability(context, TrinidadAgent.CAP_INTRINSIC_EVENTS);
   }
 
 
@@ -920,10 +920,10 @@
   {
 
     Object scriptingSpeed = getAgentCapability(context,
-            AdfFacesAgent.CAP_SCRIPTING_SPEED);
+            TrinidadAgent.CAP_SCRIPTING_SPEED);
 
     return ((scriptingSpeed != null) &&
-            (AdfFacesAgent.SCRIPTING_SPEED_CAP_NONE != scriptingSpeed));
+            (TrinidadAgent.SCRIPTING_SPEED_CAP_NONE != scriptingSpeed));
 
   }
 
@@ -934,7 +934,7 @@
           UIXRenderingContext context
           )
   {
-    return getBooleanAgentCapability(context, AdfFacesAgent.CAP_MULTIPLE_WINDOWS);
+    return getBooleanAgentCapability(context, TrinidadAgent.CAP_MULTIPLE_WINDOWS);
   }
 
 
@@ -950,8 +950,8 @@
           UIXRenderingContext context
           )
   {
-    return (getAgentCapability(context, AdfFacesAgent.CAP_STYLE_ATTRIBUTES) !=
-            AdfFacesAgent.STYLES_NONE);
+    return (getAgentCapability(context, TrinidadAgent.CAP_STYLE_ATTRIBUTES) !=
+            TrinidadAgent.STYLES_NONE);
   }
 
 
@@ -962,8 +962,8 @@
           UIXRenderingContext context
           )
   {
-    return (getAgentCapability(context, AdfFacesAgent.CAP_STYLE_ATTRIBUTES) ==
-            AdfFacesAgent.STYLES_EXTERNAL );
+    return (getAgentCapability(context, TrinidadAgent.CAP_STYLE_ATTRIBUTES) ==
+            TrinidadAgent.STYLES_EXTERNAL );
   }
 
 
@@ -975,8 +975,8 @@
           UIXRenderingContext context
           )
   {
-    return (getAgentCapability(context, AdfFacesAgent.CAP_CSS_SELECTORS) ==
-            AdfFacesAgent.SELECTORS_MULTIPLE);
+    return (getAgentCapability(context, TrinidadAgent.CAP_CSS_SELECTORS) ==
+            TrinidadAgent.SELECTORS_MULTIPLE);
   }
 
 
@@ -987,7 +987,7 @@
           UIXRenderingContext context
           )
   {
-    return getBooleanAgentCapability(context, AdfFacesAgent.CAP_NAVIGATION);
+    return getBooleanAgentCapability(context, TrinidadAgent.CAP_NAVIGATION);
   }
 
 
@@ -998,7 +998,7 @@
           UIXRenderingContext context
           )
   {
-    return getBooleanAgentCapability(context, AdfFacesAgent.CAP_EDITING);
+    return getBooleanAgentCapability(context, TrinidadAgent.CAP_EDITING);
   }
 
   /**
@@ -1010,7 +1010,7 @@
           UIXRenderingContext context
           )
   {
-    return getBooleanAgentCapability(context, AdfFacesAgent.CAP_NAME_IDENTIFICATION);
+    return getBooleanAgentCapability(context, TrinidadAgent.CAP_NAME_IDENTIFICATION);
   }
 
   /**
@@ -1021,7 +1021,7 @@
           )
   {
     return getBooleanAgentCapability(context,
-            AdfFacesAgent.CAP_DISABLED_FORM_ELEMENTS);
+            TrinidadAgent.CAP_DISABLED_FORM_ELEMENTS);
   }
 
   /*
@@ -1032,7 +1032,7 @@
     )
   {
     return getBooleanAgentCapability(context,
-            AdfFacesAgent.CAP_AUTO_COMPLETE_FORM_ELEMENTS);
+            TrinidadAgent.CAP_AUTO_COMPLETE_FORM_ELEMENTS);
   }
 
   /**
@@ -1043,7 +1043,7 @@
           )
   {
     return getBooleanAgentCapability(context,
-            AdfFacesAgent.CAP_READONLY_FORM_ELEMENTS);
+            TrinidadAgent.CAP_READONLY_FORM_ELEMENTS);
   }
 
   /**
@@ -1053,7 +1053,7 @@
           UIXRenderingContext context
           )
   {
-    return getBooleanAgentCapability(context, AdfFacesAgent.CAP_FIELDSET);
+    return getBooleanAgentCapability(context, TrinidadAgent.CAP_FIELDSET);
   }
 
   /**

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ApplicationSwitcherRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ApplicationSwitcherRenderer.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/ui/laf/base/desktop/ApplicationSwitcherRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ApplicationSwitcherRenderer.java Thu Jul 27 11:31:36 2006
@@ -28,7 +28,7 @@
 import org.apache.myfaces.trinidad.component.UIXNavigationLevel;
 import org.apache.myfaces.trinidad.component.core.nav.CoreMenuChoice;
 
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.share.url.FormEncoder;
 import org.apache.myfaces.trinidadinternal.share.url.URLEncoder;
 import org.apache.myfaces.trinidadinternal.ui.NodeUtils;
@@ -220,7 +220,7 @@
     writer.startElement(TABLE_DATA_ELEMENT, null);
 
     if (  context.getAgent().getAgentApplication()
-          != AdfFacesAgent.APPLICATION_NETSCAPE)
+          != TrinidadAgent.APPLICATION_NETSCAPE)
       writer.writeAttribute("valign", "bottom", null);
   }
 
@@ -277,7 +277,7 @@
 
     writer.startElement(TABLE_DATA_ELEMENT, null);
     if (  context.getAgent().getAgentApplication()
-          != AdfFacesAgent.APPLICATION_NETSCAPE)
+          != TrinidadAgent.APPLICATION_NETSCAPE)
       writer.writeAttribute("valign", "bottom", null);
 
     // render goto button

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopUtils.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/ui/laf/base/desktop/BaseDesktopUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopUtils.java Thu Jul 27 11:31:36 2006
@@ -17,7 +17,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.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.laf.LookAndFeelManager;
 import org.apache.myfaces.trinidadinternal.ui.laf.NameAndAgentScorer;
@@ -75,7 +75,7 @@
     {
       // Initialize the NameAndAgentScorer for base/desktop
       super(lafName,
-            IntegerUtils.getInteger(AdfFacesAgent.TYPE_DESKTOP),
+            IntegerUtils.getInteger(TrinidadAgent.TYPE_DESKTOP),
             null,
             null,
             null);
@@ -89,7 +89,7 @@
       Score score = super.scoreLookAndFeel(context, lafName);
 
       // We don't support Netscape 4.x
-      if (AdfFacesAgent.APPLICATION_NETSCAPE ==
+      if (TrinidadAgent.APPLICATION_NETSCAPE ==
           context.getAgent().getAgentApplication())
       {
         score = new ScoreProxy(score)

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ButtonRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ButtonRenderer.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/ui/laf/base/desktop/ButtonRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ButtonRenderer.java Thu Jul 27 11:31:36 2006
@@ -25,7 +25,7 @@
 import javax.faces.component.UIComponent;
 import javax.faces.context.ResponseWriter;
 
-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.ImageProvider;
 import org.apache.myfaces.trinidadinternal.image.ImageProviderRequest;
@@ -325,8 +325,8 @@
     int application = context.getAgent().getAgentApplication();
     Object align;
 
-    if ((application == AdfFacesAgent.APPLICATION_NETSCAPE)
-        || (application == AdfFacesAgent.APPLICATION_GECKO)
+    if ((application == TrinidadAgent.APPLICATION_NETSCAPE)
+        || (application == TrinidadAgent.APPLICATION_GECKO)
         || (isScreenReaderMode(context)))
     {
       align = UIConstants.V_ALIGN_MIDDLE;
@@ -358,7 +358,7 @@
       // so that in renderImageContent we know that we rendered this special
       // attribute and then we will register the onkeydown event handler.
       if ((isIE(context)) &&
-          !(context.getAgent().getAgentOS() == AdfFacesAgent.OS_MACOS ))
+          !(context.getAgent().getAgentOS() == TrinidadAgent.OS_MACOS ))
       {
         context.getResponseWriter().writeAttribute("adfbtn", "t", null);
         setRenderingProperty(context, _ADF_BTN_ATTR, Boolean.TRUE);

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HeaderRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HeaderRenderer.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/ui/laf/base/desktop/HeaderRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HeaderRenderer.java Thu Jul 27 11:31:36 2006
@@ -22,7 +22,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.ui.NodeUtils;
 import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
@@ -150,9 +150,9 @@
       // really, this is a more generic problem that would need to be
       // explored in LinkRenderer as well, but to minimize the scope
       // of the changes, I'll only tweak it here.
-      if ((context.getAgent().getAgentOS() == AdfFacesAgent.OS_MACOS) &&
+      if ((context.getAgent().getAgentOS() == TrinidadAgent.OS_MACOS) &&
           (context.getAgent().getAgentApplication() == 
-          AdfFacesAgent.APPLICATION_IEXPLORER))
+          TrinidadAgent.APPLICATION_IEXPLORER))
 
         renderAttribute(context, NAME_ATTRIBUTE, label);
       else

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HtmlLafRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HtmlLafRenderer.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/ui/laf/base/desktop/HtmlLafRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HtmlLafRenderer.java Thu Jul 27 11:31:36 2006
@@ -20,7 +20,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;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils;
@@ -50,7 +50,7 @@
     )
   {
     return (context.getAgent().getAgentApplication() ==
-            AdfFacesAgent.APPLICATION_NETSCAPE);
+            TrinidadAgent.APPLICATION_NETSCAPE);
   }
 
   /**
@@ -61,7 +61,7 @@
     )
   {
     return (context.getAgent().getAgentApplication() ==
-            AdfFacesAgent.APPLICATION_SAFARI);
+            TrinidadAgent.APPLICATION_SAFARI);
   }
 
 
@@ -73,7 +73,7 @@
     )
   {
     return (context.getAgent().getAgentApplication() ==
-            AdfFacesAgent.APPLICATION_GECKO);
+            TrinidadAgent.APPLICATION_GECKO);
   }
 
   /**
@@ -84,7 +84,7 @@
     )
   {
     return (context.getAgent().getAgentApplication() ==
-            AdfFacesAgent.APPLICATION_IEXPLORER);
+            TrinidadAgent.APPLICATION_IEXPLORER);
   }
 
   /**

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageLayoutRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageLayoutRenderer.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/ui/laf/base/desktop/PageLayoutRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageLayoutRenderer.java Thu Jul 27 11:31:36 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.trinidadinternal.ui.laf.base.desktop;
 
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.ui.MutableUINode;
 import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
@@ -615,7 +615,7 @@
     public Object getValue(UIXRenderingContext context)
     {
       if (context.getAgent().getAgentApplication() ==
-          AdfFacesAgent.APPLICATION_NETSCAPE)
+          TrinidadAgent.APPLICATION_NETSCAPE)
         return _netscapeObj;
       else return _elseObj;
     }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/SelectManyShuttleRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/SelectManyShuttleRenderer.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/ui/laf/base/desktop/SelectManyShuttleRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/SelectManyShuttleRenderer.java Thu Jul 27 11:31:36 2006
@@ -38,7 +38,7 @@
 import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.XhtmlLafUtils;
 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.ui.MutableUINode;
 import org.apache.myfaces.trinidadinternal.ui.NodeUtils;
 import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
@@ -584,7 +584,7 @@
     space.setAttributeValue(WIDTH_ATTR, "1");
     space.setAttributeValue(HEIGHT_ATTR, "1");
     space.setAttributeValue(RENDERED_ATTR,
-                 new IsAgentApplicationBoundValue(AdfFacesAgent.APPLICATION_NETSCAPE));
+                 new IsAgentApplicationBoundValue(TrinidadAgent.APPLICATION_NETSCAPE));
 
     MarlinBean spaceRequired = new MarlinBean(SPACER_NAME);
     spaceRequired.setAttributeValue(WIDTH_ATTR, "1");
@@ -1240,18 +1240,18 @@
       // the description area should be roughly the same
       // size as the list, but just setting the
       // width to be the width of the list isn't enough
-      AdfFacesAgent agent = context.getAgent();
+      TrinidadAgent agent = context.getAgent();
       int agentApp = agent.getAgentApplication();
       int descWidth = barWidth;
 
       // On IE and mozilla width too narrow so increasing
-      if ( agentApp == AdfFacesAgent.APPLICATION_IEXPLORER ||
-           agentApp == AdfFacesAgent.APPLICATION_GECKO)
+      if ( agentApp == TrinidadAgent.APPLICATION_IEXPLORER ||
+           agentApp == TrinidadAgent.APPLICATION_GECKO)
         descWidth = (descWidth *6)/5;
       // size would be right in netscape, but in
       // TextInputRenderer we are shrinking width of textinputs
       // on netscape, so to counter this multiplying by 4/3rd's
-      else if ( agentApp == AdfFacesAgent.APPLICATION_NETSCAPE )
+      else if ( agentApp == TrinidadAgent.APPLICATION_NETSCAPE )
         descWidth = ( descWidth * 4 )/3;
 
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/SideBarRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/SideBarRenderer.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/ui/laf/base/desktop/SideBarRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/SideBarRenderer.java Thu Jul 27 11:31:36 2006
@@ -22,7 +22,7 @@
 
 import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 
 
 /**
@@ -55,7 +55,7 @@
     renderStyleClassAttribute(context, AF_PANEL_SIDE_BAR_STYLE_CLASS);
     Object width = node.getAttributeValue(context, WIDTH_ATTR);
     
-    boolean isMac = context.getAgent().getAgentOS() == AdfFacesAgent.OS_MACOS;
+    boolean isMac = context.getAgent().getAgentOS() == TrinidadAgent.OS_MACOS;
     if (width != null && !isMac)
     {
       writer.writeAttribute(STYLE_ATTRIBUTE,  

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/TextInputRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/TextInputRenderer.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/ui/laf/base/desktop/TextInputRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/TextInputRenderer.java Thu Jul 27 11:31:36 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.trinidadinternal.ui.laf.base.desktop;
 
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 
@@ -53,7 +53,7 @@
     UIXRenderingContext context
     )
   {
-    AdfFacesAgent agent = context.getAgent();
+    TrinidadAgent agent = context.getAgent();
 
     boolean isNetscape = HtmlLafRenderer.isNetscape(context);
 
@@ -62,7 +62,7 @@
     // and 3/4 for text areas.  Also, the heuristic only
     // appears to work on Windows.  (Mozilla was once on the large
     // size, but as of 1.0 seems good).
-    return (isNetscape && (agent.getAgentOS() == AdfFacesAgent.OS_WINDOWS));
+    return (isNetscape && (agent.getAgentOS() == TrinidadAgent.OS_WINDOWS));
   }
 
   protected boolean renderReadOnlyAsElement(

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/TreeRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/TreeRenderer.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/ui/laf/base/desktop/TreeRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/TreeRenderer.java Thu Jul 27 11:31:36 2006
@@ -30,7 +30,7 @@
 import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 import org.apache.myfaces.trinidad.model.RowKeySet;
 
-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.XhtmlUtils;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.TreeUtils;
@@ -267,7 +267,7 @@
       case EXPAND_CLOSED:
         // "\u21D2"; // Double Arrow right
 
-        if ( context.getAgent().getAgentOS() == AdfFacesAgent.OS_MACOS )
+        if ( context.getAgent().getAgentOS() == TrinidadAgent.OS_MACOS )
           text = isRightToLeft(context)? "\u2190"// single arrow left
                                        : "\u2192";// single arrow right
         else
@@ -277,14 +277,14 @@
         break;
       case EXPAND_OPEN:
         //"\u21D3"; // double arrow down
-        if ( context.getAgent().getAgentOS() == AdfFacesAgent.OS_MACOS )
+        if ( context.getAgent().getAgentOS() == TrinidadAgent.OS_MACOS )
           text = "\u2193"; // single arrow down
         else
           text="\u25BC"; // triangle down
         altText = getTranslatedValue(context, mapKey(_COLLAPSE_TIP_KEY));
         break;
       case EXPAND_ALWAYS:
-        if ( context.getAgent().getAgentOS() == AdfFacesAgent.OS_MACOS )
+        if ( context.getAgent().getAgentOS() == TrinidadAgent.OS_MACOS )
           text = "\u2193"; // single arrow down
         else
           text="\u25BC"; // triangle down

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PdaHtmlLafUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PdaHtmlLafUtils.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/ui/laf/base/pda/PdaHtmlLafUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PdaHtmlLafUtils.java Thu Jul 27 11:31:36 2006
@@ -18,7 +18,7 @@
 import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.XhtmlLafUtils;
 
 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.ui.laf.LookAndFeelManager;
 import org.apache.myfaces.trinidadinternal.ui.laf.NameAndAgentScorer;
@@ -46,7 +46,7 @@
 
   private static final NameAndAgentScorer _SCORER =
     new NameAndAgentScorer(null,
-                           IntegerUtils.getInteger(AdfFacesAgent.TYPE_PDA),
+                           IntegerUtils.getInteger(TrinidadAgent.TYPE_PDA),
                            null,
                            null,
                            null);

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ChoiceRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ChoiceRenderer.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/ui/laf/base/xhtml/ChoiceRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ChoiceRenderer.java Thu Jul 27 11:31:36 2006
@@ -28,7 +28,7 @@
 import org.apache.myfaces.trinidad.component.core.input.CoreSelectOneChoice;
 import org.apache.myfaces.trinidadinternal.renderkit.uix.SelectItemSupport;
 
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 
 import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
@@ -226,7 +226,7 @@
     String actionScript = null;
 
     // IE hands off select element events to the beat of a different drummer.
-    if ((context.getAgent().getAgentOS() == AdfFacesAgent.OS_WINDOWS)
+    if ((context.getAgent().getAgentOS() == TrinidadAgent.OS_WINDOWS)
         && (HtmlLafRenderer.isIE(context)))
     {
       // The CHOICE_CHANGE_TRACKER just sets a flag whenever a choice occurs.

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/CommandItemRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/CommandItemRenderer.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/ui/laf/base/xhtml/CommandItemRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/CommandItemRenderer.java Thu Jul 27 11:31:36 2006
@@ -25,7 +25,7 @@
 import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.BaseLafUtils;
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 
 /**
  * @version $Name:  $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/ui/laf/base/xhtml/CommandItemRenderer.java#0 $) $Date: 10-nov-2005.18:53:46 $
@@ -60,7 +60,7 @@
 
       boolean agentSupportsDisabledOptions = Boolean.TRUE
           .equals(getAgentCapability(context,
-              AdfFacesAgent.CAP_SUPPORTS_DISABLED_OPTIONS));
+              TrinidadAgent.CAP_SUPPORTS_DISABLED_OPTIONS));
       if (!(agentSupportsDisabledOptions))
       {
         

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/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/ui/laf/base/xhtml/FormElementRenderer.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/ui/laf/base/xhtml/FormElementRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FormElementRenderer.java Thu Jul 27 11:31:36 2006
@@ -20,7 +20,7 @@
 import javax.faces.component.UIComponent;
 import javax.faces.context.ResponseWriter;
 
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.ui.MutableUINode;
 import org.apache.myfaces.trinidadinternal.ui.NodeUtils;
 import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
@@ -46,9 +46,9 @@
       // 2981538 PDA: TOO MUCH WHITESPACE UNDER INPUT ELEMENTS IN TABLE
       // This is a browser bug workaround,
       // hopefully we can remove it eventually
-      if ( context.getAgent().getAgentType() == AdfFacesAgent.TYPE_PDA &&
+      if ( context.getAgent().getAgentType() == TrinidadAgent.TYPE_PDA &&
            context.getAgent().getAgentApplication() ==
-                                                AdfFacesAgent.APPLICATION_IEXPLORER )
+                                                TrinidadAgent.APPLICATION_IEXPLORER )
         setRenderingProperty(context,
                              VISIBLE_FORM_ELEMENT_RENDERED,
                              Boolean.TRUE);

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/GlobalButtonBarRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/GlobalButtonBarRenderer.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/ui/laf/base/xhtml/GlobalButtonBarRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/GlobalButtonBarRenderer.java Thu Jul 27 11:31:36 2006
@@ -20,7 +20,7 @@
 import org.apache.myfaces.trinidad.component.UIXHierarchy;
 import org.apache.myfaces.trinidad.component.UIXNavigationLevel;
 
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 import org.apache.myfaces.trinidadinternal.ui.beans.MarlinBean;
@@ -188,9 +188,9 @@
   {
     String valign;
     // See bug 2866954
-    if ( context.getAgent().getAgentOS() == AdfFacesAgent.OS_MACOS &&
+    if ( context.getAgent().getAgentOS() == TrinidadAgent.OS_MACOS &&
          context.getAgent().getAgentApplication() ==
-               AdfFacesAgent.APPLICATION_IEXPLORER)
+               TrinidadAgent.APPLICATION_IEXPLORER)
       valign = "top";
     else
       valign = "bottom";

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/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/ui/laf/base/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/ui/laf/base/xhtml/HiddenLabelUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/HiddenLabelUtils.java Thu Jul 27 11:31:36 2006
@@ -20,7 +20,7 @@
 import javax.faces.component.UIComponent;
 import javax.faces.context.ResponseWriter;
 
-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.config.AccessibilityMode;
 
@@ -47,18 +47,18 @@
     if (!BaseLafRenderer.supportsID(context))
       return false;
 
-    AdfFacesAgent agent = context.getAgent();
+    TrinidadAgent agent = context.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.
@@ -69,13 +69,13 @@
         return false;
 
       // Mozilla does support the label hack
-      case AdfFacesAgent.APPLICATION_GECKO:
+      case TrinidadAgent.APPLICATION_GECKO:
         // Make sure we don't change the VE to Gecko
-        assert(agent.getCapability(AdfFacesAgent.CAP_IS_JDEV_VE) == null);
+        assert(agent.getCapability(TrinidadAgent.CAP_IS_JDEV_VE) == null);
         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/ui/laf/base/xhtml/MediaRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/MediaRenderer.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/ui/laf/base/xhtml/MediaRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/MediaRenderer.java Thu Jul 27 11:31:36 2006
@@ -26,7 +26,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.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
@@ -429,13 +429,13 @@
     UIXRenderingContext context
     )
   {
-    AdfFacesAgent agent = context.getAgent();
+    TrinidadAgent agent = context.getAgent();
 
     // =-= bts only desktop IE seems to support this
     //         Move this to capability
-    return !((agent.getAgentType()       == AdfFacesAgent.TYPE_DESKTOP) &&
-            (agent.getAgentApplication() == AdfFacesAgent.APPLICATION_IEXPLORER) &&
-            (agent.getAgentOS()          == AdfFacesAgent.OS_WINDOWS));
+    return !((agent.getAgentType()       == TrinidadAgent.TYPE_DESKTOP) &&
+            (agent.getAgentApplication() == TrinidadAgent.APPLICATION_IEXPLORER) &&
+            (agent.getAgentOS()          == TrinidadAgent.OS_WINDOWS));
   }
 
   private Number[] _getDefaultSizeArray(
@@ -556,7 +556,7 @@
     if (playerData == null)
     {
       // the default player is the link player
-      AdfFacesAgent agent = context.getAgent();
+      TrinidadAgent agent = context.getAgent();
 
       int agentOSInt = agent.getAgentOS();
 
@@ -2054,13 +2054,13 @@
   // Object constants for OS's
   //
   private static final Integer _WINDOWS_OS =
-                                  IntegerUtils.getInteger(AdfFacesAgent.OS_WINDOWS);
+                                  IntegerUtils.getInteger(TrinidadAgent.OS_WINDOWS);
 
   private static final Integer _MAC_OS =
-                                  IntegerUtils.getInteger(AdfFacesAgent.OS_MACOS);
+                                  IntegerUtils.getInteger(TrinidadAgent.OS_MACOS);
 
   private static final Integer _SOLARIS_OS =
-                                  IntegerUtils.getInteger(AdfFacesAgent.OS_SOLARIS);
+                                  IntegerUtils.getInteger(TrinidadAgent.OS_SOLARIS);
 
   // Preferred Players for Operating Systems
   /* CURRENTLY UNUSED

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.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/ui/laf/base/xhtml/NavigationBarRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java Thu Jul 27 11:31:36 2006
@@ -25,7 +25,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.share.url.FormEncoder;
 import org.apache.myfaces.trinidadinternal.share.url.URLEncoder;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
@@ -1021,11 +1021,11 @@
     // our layout problems.
     String iconID = null;
     Object id = (supportsID(context) ? getID(context, navBar) : null);
-    AdfFacesAgent agent = context.getAgent();
+    TrinidadAgent agent = context.getAgent();
 
     if ((id != null) &&
         (partialTargets != null) &&
-        (agent.getAgentApplication() == AdfFacesAgent.APPLICATION_IEXPLORER))
+        (agent.getAgentApplication() == TrinidadAgent.APPLICATION_IEXPLORER))
     {
       iconID = id.toString() + "-i";
     }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/OptionContainerRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/OptionContainerRenderer.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/ui/laf/base/xhtml/OptionContainerRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/OptionContainerRenderer.java Thu Jul 27 11:31:36 2006
@@ -32,7 +32,7 @@
 import javax.faces.model.SelectItem;
 
 import org.apache.myfaces.trinidad.component.UIXSelectOne;
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.ui.NodeUtils;
 import org.apache.myfaces.trinidadinternal.ui.Renderer;
 import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
@@ -326,7 +326,7 @@
       return false;
     boolean agentSupportsDisabledOptions = Boolean.TRUE
         .equals(getAgentCapability(context,
-            AdfFacesAgent.CAP_SUPPORTS_DISABLED_OPTIONS));
+            TrinidadAgent.CAP_SUPPORTS_DISABLED_OPTIONS));
     boolean isParentDisabled = Boolean.TRUE.equals(component.getAttributes()
         .get(DISABLED_ATTR.getAttributeName()));  
     if (!isParentDisabled && item.isDisabled()



Mime
View raw message