svn commit: r432172 - in /incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml: BodyRenderer.java HeadRenderer.java NavigationPaneRenderer.java PanelHeaderRenderer.java

[aw...@apache.org]

Author: awiner
Date: Thu Aug 17 00:21:38 2006
New Revision: 432172

URL: http://svn.apache.org/viewvc?rev=432172&view=rev
Log:
Fix 'choice' style of navigationPane to respect whether an agent can render disabled options.  Fix a few miscellaneous references to Oracle or ADF in our HTML output - e.g. comments and meta generator

Modified:
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HeadRenderer.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHeaderRenderer.java

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java?rev=432172&r1=432171&r2=432172&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java Thu Aug 17 00:21:38 2006
@@ -447,8 +447,8 @@
   {
 
     String versionInfo    = "";
-    String apiSpecTitle   = "ADF Faces API";
-    String implSpecTitle  = "ADF Faces Implementation";
+    String apiSpecTitle   = "Apache Trinidad API";
+    String implSpecTitle  = "Apache Trinidad Implementation";
     String apiVersion     = "??";
     String implVersion    = "??";
 
@@ -503,7 +503,7 @@
   // Onunload handler used for partial page rendering
   private static final String _PARTIAL_ONUNLOAD_HANDLER = "_partialUnload()";
 
-  static private final String _VERSION_COMMENT = "Created by Oracle ADF Faces ";
+  static private final String _VERSION_COMMENT = "Created by Apache Trinidad ";
 
   // Constants for PPR back
   static private final String _PPR_BACK_UNLOAD_SCRIPT = "_savePageStateIE()";

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HeadRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HeadRenderer.java?rev=432172&r1=432171&r2=432172&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HeadRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HeadRenderer.java Thu Aug 17 00:21:38 2006
@@ -126,7 +126,7 @@
     
     writer.startElement("meta", null);
     writer.writeAttribute("name", "generator", null);
-    writer.writeAttribute("content", "Oracle ADF Faces", null);
+    writer.writeAttribute("content", "Apache Trinidad", null);
     writer.endElement("meta");
   }
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java?rev=432172&r1=432171&r2=432172&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java Thu Aug 17 00:21:38 2006
@@ -891,8 +891,11 @@
   {
     // Choice items do not support icons at this time.
     boolean isDisabled = _getBooleanFromProperty(itemData.get("isDisabled"));
-    // IE doesn't support disabled options so we won't add them in that case.
-    if ( !isDisabled || (arc.getAgent().getAgentName() != Agent.AGENT_IE) )
+    // If the agent, doesn't support disabled options, don't render anything
+    // for such options
+    if ( !isDisabled || 
+         Boolean.TRUE.equals(arc.getAgent().getCapability(
+                TrinidadAgent.CAP_SUPPORTS_DISABLED_OPTIONS)))
     {
       boolean isActive = _getBooleanFromProperty(itemData.get("isActive"));
       String rowKey = _getPossiblyNullString(itemData.get("dataIndex"));

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHeaderRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHeaderRenderer.java?rev=432172&r1=432171&r2=432172&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHeaderRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHeaderRenderer.java Thu Aug 17 00:21:38 2006
@@ -350,7 +350,6 @@
   {
     Number sizeNumber = getSize(bean);
     
-    //The >= 0 condition was added in order to maintain compatibility with Rich and unified
     if (sizeNumber != null && sizeNumber.intValue() >= 0)
     {
       setContextHeaderSize(arc, sizeNumber);