You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sl...@apache.org on 2007/09/24 16:23:48 UTC

svn commit: r578823 - in /myfaces/trinidad/trunk/trinidad: src/site/xdoc/ trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/ trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/ trini...

Author: slessard
Date: Mon Sep 24 07:23:46 2007
New Revision: 578823

URL: http://svn.apache.org/viewvc?rev=578823&view=rev
Log:
TRINIDAD-717 Changed the behavior to icon or facet mode. If any facet is specified, on facets are rendered. If nothing is specified, then the default icon mode is activated. Also added new icon aliases to give access to status indicator icons through <tr:icon/>

Modified:
    myfaces/trinidad/trunk/trinidad/src/site/xdoc/skin-selectors.xml
    myfaces/trinidad/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreStatusIndicator.xml
    myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/XhtmlSkin.java
    myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java
    myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StatusIndicatorRenderer.java
    myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimal-golden.xml
    myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimalIE-golden.xml
    myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimalIERtl-golden.xml
    myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimalInacc-golden.xml
    myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimalPPC-golden.xml
    myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimalSaf-golden.xml
    myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimalScrRdr-golden.xml

Modified: myfaces/trinidad/trunk/trinidad/src/site/xdoc/skin-selectors.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/src/site/xdoc/skin-selectors.xml?rev=578823&r1=578822&r2=578823&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/src/site/xdoc/skin-selectors.xml (original)
+++ myfaces/trinidad/trunk/trinidad/src/site/xdoc/skin-selectors.xml Mon Sep 24 07:23:46 2007
@@ -4018,11 +4018,29 @@
           </tr>
           <tr>
             <td>af|statusIndicator::busy-icon</td>
-            <td>The icon that is displayed when the page is busy.</td>
+            <td>The icon that is displayed when the page is busy. The icon 
+                will only be rendered if no facet was specified. Simple skin 
+                references the ".AFBusyIcon:alias" icon.</td>
           </tr>
           <tr>
             <td>af|statusIndicator::ready-icon</td>
-            <td>The icon that is displayed when the page is not busy.</td>
+            <td>The icon that is displayed when the page is not busy. The icon 
+                will only be rendered if no facet was specified. Simple skin 
+                references the ".AFReadyIcon:alias" icon.</td>
+          </tr>
+          <tr>
+            <td>.AFBusyIcon:alias</td>
+            <td>A named icon that's used by af|statusIndicator::busy-icon and 
+                is also usable in with &lt;tr:icon&gt;. That ability is important 
+                to include the icon even when a facet is specified on the 
+                statusIndicator.</td>
+          </tr>
+          <tr>
+            <td>.AFReadyIcon:alias</td>
+            <td>A named icon that's used by af|statusIndicator::ready-icon and 
+                is also usable in with &lt;tr:icon&gt;. That ability is important 
+                to include the icon even when a facet is specified on the 
+                statusIndicator.</td>
           </tr>
         </table>
       </subsection>

Modified: myfaces/trinidad/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreStatusIndicator.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreStatusIndicator.xml?rev=578823&r1=578822&r2=578823&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreStatusIndicator.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreStatusIndicator.xml Mon Sep 24 07:23:46 2007
@@ -24,7 +24,14 @@
               xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
               xmlns:xhtml="http://www.w3.org/1999/xhtml">
   <component>
-    <description><![CDATA[The statusIndicator component shows whether the page is busy processing or is ready.]]></description>
+    <description>
+      <![CDATA[The statusIndicator component shows whether the page 
+               is busy processing or is ready. By default, the component 
+               shows predefined icons for both readyand busy state. However, 
+               if a facet is specified, be it rendered or not, none of the 
+               default icon is going to be rendered. That behavior enable an 
+               easy emulation of GMail behavior specifying only a busy 
+               facet.]]></description>
     <icon>
       <small-icon>/org/apache/myfaces/trinidad/metadata/icons/statusIndicator.png</small-icon>
     </icon>
@@ -32,32 +39,42 @@
     <component-class>org.apache.myfaces.trinidad.component.core.output.CoreStatusIndicator</component-class>
 
     <facet>
-      <description><![CDATA[Content to be rendered when the page is ready.]]></description>
+      <description>
+        <![CDATA[Content to be rendered when the page is ready. If this facet is
+                 specified, no default icon is going to be rendered.]]></description>
       <facet-name>ready</facet-name>
     </facet>
     <facet>
-      <description><![CDATA[Content to be rendered when the page is busy processing.]]></description>
+      <description>
+        <![CDATA[Content to be rendered when the page is busy processing. 
+                 If this facet is specified, no default icon is going to 
+                 be rendered.]]></description>
       <facet-name>busy</facet-name>
     </facet>
     
     <xi:include href="includes/CommonAttrs.xml" xpointer="/faces-config/component/*"/>
     <xi:include href="includes/CoreJSEvents.xml" xpointer="/faces-config/component/*"/>
 
-
     <component-extension>
       <mfp:component-supertype>org.apache.myfaces.trinidad.Object</mfp:component-supertype>
       <mfp:renderer-type>org.apache.myfaces.trinidad.StatusIndicator</mfp:renderer-type>
       <mfp:tag-name>tr:statusIndicator</mfp:tag-name>
       <mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.core.output.CoreStatusIndicatorTag</mfp:tag-class>
       <mfp:long-description><![CDATA[<html:p>
-            The The statusIndicator component shows whether the page is
-busy processing or is ready.
-          </html:p>]]>
+            The The statusIndicator component shows whether the page is 
+            busy processing or is ready. By default, the component 
+            shows predefined icons for both readyand busy state. However, 
+            if a facet is specified, be it rendered or not, none of the 
+            default icon is going to be rendered. That behavior enable an 
+            easy emulation of GMail behavior by specifying only a busy 
+            facet.</html:p>]]>
       </mfp:long-description>
       <mfp:example>
         <mfp:source-code>
           &lt;tr:statusIndicator&gt;
-            &lt;tr:outputText value=&quot;Loading, please wait...&quot;&gt;
+          	&lt;f:facet name=&quot;busy&quot;&gt;
+              &lt;tr:outputText value=&quot;Loading, please wait...&quot;/&gt;
+            &lt;/f:facet&gt;
           &lt;/tr:statusIndicator&gt;
         </mfp:source-code>
       </mfp:example>

Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/XhtmlSkin.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/XhtmlSkin.java?rev=578823&r1=578822&r2=578823&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/XhtmlSkin.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/XhtmlSkin.java Mon Sep 24 07:23:46 2007
@@ -103,7 +103,6 @@
                  SkinSelectors.QUICK_SELECT_DISABLED_ICON_STYLE_CLASS,
                  null);
 
-
   private static final CSSStyle spinboxTopStyle = new CSSStyle();
   private static final CSSStyle spinboxBottomStyle = new CSSStyle();
 
@@ -357,15 +356,25 @@
     new TextIcon(">"),
 
     // StatusIndicator Icons
-    SkinSelectors.AF_STATUS_INDICATOR_BUSY_ICON,
-      new ContextImageIcon("adf/images/sibusy.gif",
-                          "adf/images/sibusy.gif",
-                          16,
-                          16),
-    SkinSelectors.AF_STATUS_INDICATOR_READY_ICON,
-      new ContextImageIcon("adf/images/siready.gif",
-                          "adf/images/siready.gif",
-                          16,
-                          16),
+
+    // Icon aliases (for tr:icon access)
+    SkinSelectors.BUSY_ICON_ALIAS_NAME, 
+    new ContextImageIcon("adf/images/sibusy.gif",
+                         "adf/images/sibusy.gif",
+                         16,
+                         16),
+    
+    SkinSelectors.READY_ICON_ALIAS_NAME, 
+    new ContextImageIcon("adf/images/siready.gif",
+                         "adf/images/siready.gif",
+                         16,
+                         16),
+    
+    SkinSelectors.AF_STATUS_INDICATOR_READY_ICON, 
+    new ReferenceIcon(SkinSelectors.READY_ICON_ALIAS_NAME),
+    
+    SkinSelectors.AF_STATUS_INDICATOR_BUSY_ICON, 
+    new ReferenceIcon(SkinSelectors.BUSY_ICON_ALIAS_NAME),
+
   };
 }

Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java?rev=578823&r1=578822&r2=578823&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java Mon Sep 24 07:23:46 2007
@@ -174,6 +174,8 @@
     STATE_DISABLED;
 
   // ================================ Icons ================================ //
+  public static final String BUSY_ICON_ALIAS_NAME = 
+    "AFBusyIcon";
   public static final String DETAIL_DISCLOSED_ICON_ALIAS_NAME =
     "AFDetailDisclosedIcon";
   public static final String DETAIL_UNDISCLOSED_ICON_ALIAS_NAME =
@@ -202,6 +204,8 @@
     "AFQuickSelectDisabledIcon";
   public static final String QUICK_SELECT_ICON_NAME =
     "AFQuickSelectIcon";
+  public static final String READY_ICON_ALIAS_NAME = 
+    "AFReadyIcon";
   public static final String REQUIRED_ICON_ALIAS_NAME =
     "AFRequiredIcon";
   public static final String SHUTTLE_MOVE_ALL_ICON_ALIAS_NAME =

Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StatusIndicatorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StatusIndicatorRenderer.java?rev=578823&r1=578822&r2=578823&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StatusIndicatorRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StatusIndicatorRenderer.java Mon Sep 24 07:23:46 2007
@@ -29,6 +29,7 @@
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.component.core.output.CoreStatusIndicator;
 import org.apache.myfaces.trinidad.context.RenderingContext;
+import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 import org.apache.myfaces.trinidad.skin.Icon;
 
 public class StatusIndicatorRenderer extends XhtmlRenderer
@@ -38,29 +39,85 @@
     super(CoreStatusIndicator.TYPE);
   }
 
+  protected StatusIndicatorRenderer(FacesBean.Type type)
+  {
+    super(type);
+  }
+
+  @Override
+  public boolean getRendersChildren()
+  {
+    return true;
+  }
+
   @Override
-  protected void encodeBegin(
+  protected void encodeAll(
     FacesContext     context,
     RenderingContext rc,
     UIComponent      comp,
     FacesBean        bean) throws IOException
   {
+    UIComponent busyFacet = comp.getFacet(CoreStatusIndicator.BUSY_FACET);
+    UIComponent readyFacet = comp.getFacet(CoreStatusIndicator.READY_FACET);
+    
+    boolean iconMode = false;
+    Icon busyIcon = null;
+    Icon readyIcon = null;
+    if (busyFacet == null && readyFacet == null)
+    {
+      // Render icons only if no facet was specified.
+      busyIcon = rc.getIcon(SkinSelectors.AF_STATUS_INDICATOR_BUSY_ICON);
+      readyIcon = rc.getIcon(SkinSelectors.AF_STATUS_INDICATOR_READY_ICON);
+      if (busyIcon == null || readyIcon == null)
+      {
+        // Missing an icon and no faet was specified, log.
+        _LOG.warning("STATUS_INDICATOR_MISSING_ICONS");
+        return;
+      }
+      
+      iconMode = true;
+    }
+    
     ResponseWriter rw = context.getResponseWriter();
 
     String clientId = getClientId(context, comp);
     
+    // Renders root DOM
     rw.startElement(XhtmlConstants.SPAN_ELEMENT, comp);
     renderId(context, comp);
     renderAllAttributes(context, rc, bean);
+    
+    // Renders ready DOM
     rw.startElement(XhtmlConstants.SPAN_ELEMENT, null);
     rw.writeAttribute(XhtmlConstants.ID_ATTRIBUTE, clientId + "::ready", null);
-    renderReadyContent(context, rc, comp, bean);
+    
+    if (iconMode)
+    {
+      _renderIcon(context, rc, readyIcon, "af_statusIndicator.READY");
+    }
+    else
+    {
+      _renderFacet(context, rc, readyFacet, 
+                   SkinSelectors.AF_STATUS_INDICATOR_READY_STYLE);
+    }
+    
     rw.endElement(XhtmlConstants.SPAN_ELEMENT);
     
+    // Renders busy DOM
     rw.startElement(XhtmlConstants.SPAN_ELEMENT, null);
     rw.writeAttribute(XhtmlConstants.ID_ATTRIBUTE, clientId + "::busy", null);
     rw.writeAttribute(XhtmlConstants.STYLE_ATTRIBUTE, "display:none", null);
-    renderBusyContent(context, rc, comp, bean);
+    
+    if (iconMode)
+    {
+      _renderIcon(context, rc, busyIcon, "af_statusIndicator.BUSY");
+    }
+    else
+    {
+      _renderFacet(context, rc, busyFacet, 
+                   SkinSelectors.AF_STATUS_INDICATOR_BUSY_STYLE);
+    }
+    
     rw.endElement(XhtmlConstants.SPAN_ELEMENT);
       
     rw.startElement(XhtmlConstants.SCRIPT_ELEMENT, null);
@@ -76,51 +133,30 @@
   {
     return SkinSelectors.AF_STATUS_INDICATOR_STYLE;
   }
-  
-  protected void renderBusyContent(
-    FacesContext     context,
-    RenderingContext rc,
-    UIComponent      comp,
-    FacesBean        bean) throws IOException
-  {
-    renderDefaultContent(context, 
-                         rc, 
-                         comp,
-                         SkinSelectors.AF_STATUS_INDICATOR_BUSY_ICON,
-                         "af_statusIndicator.BUSY",
-                         "busy",
-                         SkinSelectors.AF_STATUS_INDICATOR_BUSY_STYLE);
-  }
-  
-  protected void renderReadyContent(
-    FacesContext     context,
+
+  private void _renderFacet(
+    FacesContext     context, 
     RenderingContext rc,
-    UIComponent      comp,
-    FacesBean        bean) throws IOException
+    UIComponent      facet,
+    String           styleClass) throws IOException
   {
-    renderDefaultContent(context, 
-                         rc, 
-                         comp,
-                         SkinSelectors.AF_STATUS_INDICATOR_READY_ICON,
-                         "af_statusIndicator.READY",
-                         "ready",
-                         SkinSelectors.AF_STATUS_INDICATOR_READY_STYLE);
+    if (facet != null && facet.isRendered())
+    {
+      ResponseWriter rw = context.getResponseWriter();
+      
+      rw.startElement(XhtmlConstants.SPAN_ELEMENT, null);
+      renderStyleClass(context, rc, styleClass);
+      encodeChild(context, facet);
+      rw.endElement(XhtmlConstants.SPAN_ELEMENT);
+    }
   }
-  
-  private void renderDefaultContent(
-    FacesContext     context,
-    RenderingContext rc,
-    UIComponent      comp,
-    String           iconName,
-    String           iconDesc,
-    String           facetName,
-    String           facetStyleClass) throws IOException
-  {
 
-    ResponseWriter rw = context.getResponseWriter();
-
-    // Render the icon
-    Icon icon = rc.getIcon(iconName);
+  private void _renderIcon(
+    FacesContext     context, 
+    RenderingContext rc, 
+    Icon             icon,
+    String           iconDesc) throws IOException
+  {
     if (icon != null && !icon.isNull())
     {
       Map<String, String> attrs = 
@@ -129,15 +165,8 @@
       
       icon.renderIcon(context, rc, attrs);
     }
-    
-    // Render the facet
-    UIComponent facet = getFacet(comp, facetName);
-    if (facet != null)
-    {
-      rw.startElement(XhtmlConstants.SPAN_ELEMENT, null);
-      renderStyleClass(context, rc, facetStyleClass);
-      encodeChild(context, facet);
-      rw.endElement(XhtmlConstants.SPAN_ELEMENT);
-    }
   }
+
+  private static final TrinidadLogger _LOG = 
+    TrinidadLogger.createTrinidadLogger(StatusIndicatorRenderer.class);
 }

Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimal-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimal-golden.xml?rev=578823&r1=578822&r2=578823&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimal-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimal-golden.xml Mon Sep 24 07:23:46 2007
@@ -8,16 +8,6 @@
              id="mainId::ready"
             >
           
-          <img
-               alt="Page is ready"
-               border="0"
-               height="16"
-               title="Page is ready"
-               width="16"
-               src="uri-attr:encoded-resource-url:/test-context-path/adf/images/siready.gif"
-              >
-            
-          </img>
           <span
                class="af_statusIndicator_ready"
               >
@@ -29,16 +19,6 @@
              style="display:none"
             >
           
-          <img
-               alt="Page is busy processing"
-               border="0"
-               height="16"
-               title="Page is busy processing"
-               width="16"
-               src="uri-attr:encoded-resource-url:/test-context-path/adf/images/sibusy.gif"
-              >
-            
-          </img>
           <span
                class="af_statusIndicator_busy"
               >

Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimalIE-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimalIE-golden.xml?rev=578823&r1=578822&r2=578823&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimalIE-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimalIE-golden.xml Mon Sep 24 07:23:46 2007
@@ -8,15 +8,6 @@
              id="mainId::ready"
             >
           
-          <img
-               alt="Page is ready"
-               border="0"
-               height="16"
-               width="16"
-               src="uri-attr:encoded-resource-url:/test-context-path/adf/images/siready.gif"
-              >
-            
-          </img>
           <span
                class="af_statusIndicator_ready"
               >
@@ -28,15 +19,6 @@
              style="display:none"
             >
           
-          <img
-               alt="Page is busy processing"
-               border="0"
-               height="16"
-               width="16"
-               src="uri-attr:encoded-resource-url:/test-context-path/adf/images/sibusy.gif"
-              >
-            
-          </img>
           <span
                class="af_statusIndicator_busy"
               >

Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimalIERtl-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimalIERtl-golden.xml?rev=578823&r1=578822&r2=578823&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimalIERtl-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimalIERtl-golden.xml Mon Sep 24 07:23:46 2007
@@ -8,15 +8,6 @@
              id="mainId::ready"
             >
           
-          <img
-               alt="Page is ready"
-               border="0"
-               height="16"
-               width="16"
-               src="uri-attr:encoded-resource-url:/test-context-path/adf/images/siready.gif"
-              >
-            
-          </img>
           <span
                class="af_statusIndicator_ready"
               >
@@ -28,15 +19,6 @@
              style="display:none"
             >
           
-          <img
-               alt="Page is busy processing"
-               border="0"
-               height="16"
-               width="16"
-               src="uri-attr:encoded-resource-url:/test-context-path/adf/images/sibusy.gif"
-              >
-            
-          </img>
           <span
                class="af_statusIndicator_busy"
               >

Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimalInacc-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimalInacc-golden.xml?rev=578823&r1=578822&r2=578823&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimalInacc-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimalInacc-golden.xml Mon Sep 24 07:23:46 2007
@@ -8,15 +8,6 @@
              id="mainId::ready"
             >
           
-          <img
-               border="0"
-               height="16"
-               title="Page is ready"
-               width="16"
-               src="uri-attr:encoded-resource-url:/test-context-path/adf/images/siready.gif"
-              >
-            
-          </img>
           <span
                class="af_statusIndicator_ready"
               >
@@ -28,15 +19,6 @@
              style="display:none"
             >
           
-          <img
-               border="0"
-               height="16"
-               title="Page is busy processing"
-               width="16"
-               src="uri-attr:encoded-resource-url:/test-context-path/adf/images/sibusy.gif"
-              >
-            
-          </img>
           <span
                class="af_statusIndicator_busy"
               >

Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimalPPC-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimalPPC-golden.xml?rev=578823&r1=578822&r2=578823&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimalPPC-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimalPPC-golden.xml Mon Sep 24 07:23:46 2007
@@ -8,16 +8,6 @@
              id="mainId::ready"
             >
           
-          <img
-               alt="Page is ready"
-               border="0"
-               height="16"
-               title="Page is ready"
-               width="16"
-               src="uri-attr:encoded-resource-url:/test-context-path/adf/images/siready.gif"
-              >
-            
-          </img>
           <span
                class="af_statusIndicator_ready"
               >
@@ -29,16 +19,6 @@
              style="display:none"
             >
           
-          <img
-               alt="Page is busy processing"
-               border="0"
-               height="16"
-               title="Page is busy processing"
-               width="16"
-               src="uri-attr:encoded-resource-url:/test-context-path/adf/images/sibusy.gif"
-              >
-            
-          </img>
           <span
                class="af_statusIndicator_busy"
               >

Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimalSaf-golden.xml?rev=578823&r1=578822&r2=578823&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimalSaf-golden.xml Mon Sep 24 07:23:46 2007
@@ -8,16 +8,6 @@
              id="mainId::ready"
             >
           
-          <img
-               alt="Page is ready"
-               border="0"
-               height="16"
-               title="Page is ready"
-               width="16"
-               src="uri-attr:encoded-resource-url:/test-context-path/adf/images/siready.gif"
-              >
-            
-          </img>
           <span
                class="af_statusIndicator_ready"
               >
@@ -29,16 +19,6 @@
              style="display:none"
             >
           
-          <img
-               alt="Page is busy processing"
-               border="0"
-               height="16"
-               title="Page is busy processing"
-               width="16"
-               src="uri-attr:encoded-resource-url:/test-context-path/adf/images/sibusy.gif"
-              >
-            
-          </img>
           <span
                class="af_statusIndicator_busy"
               >

Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimalScrRdr-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimalScrRdr-golden.xml?rev=578823&r1=578822&r2=578823&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimalScrRdr-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/statusIndicator-facet-minimalScrRdr-golden.xml Mon Sep 24 07:23:46 2007
@@ -8,16 +8,6 @@
              id="mainId::ready"
             >
           
-          <img
-               alt="Page is ready"
-               border="0"
-               height="16"
-               title="Page is ready"
-               width="16"
-               src="uri-attr:encoded-resource-url:/test-context-path/adf/images/siready.gif"
-              >
-            
-          </img>
           <span
                class="af_statusIndicator_ready"
               >
@@ -29,16 +19,6 @@
              style="display:none"
             >
           
-          <img
-               alt="Page is busy processing"
-               border="0"
-               height="16"
-               title="Page is busy processing"
-               width="16"
-               src="uri-attr:encoded-resource-url:/test-context-path/adf/images/sibusy.gif"
-              >
-            
-          </img>
           <span
                class="af_statusIndicator_busy"
               >