You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by aw...@apache.org on 2007/08/25 23:30:06 UTC
svn commit: r569736 - in /myfaces/trinidad/trunk/trinidad/trinidad-impl/src:
main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/
main/java/org/apache/myfaces/trinidadinternal/skin/icon/
test/resources/org/apache/myfaces/trinidadinternal...
Author: awiner
Date: Sat Aug 25 14:30:05 2007
New Revision: 569736
URL: http://svn.apache.org/viewvc?rev=569736&view=rev
Log:
TRINIDAD-644: tr:icon doesn't render many of its properties
- Also fixed issue where styleClass was rendered twice (instead of merged) on text icons
Modified:
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/IconRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/TextIcon.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimal-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalIE-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalIERtl-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalInacc-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalSaf-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalScrRdr-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/icon.xml
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/IconRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/IconRenderer.java?rev=569736&r1=569735&r2=569736&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/IconRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/IconRenderer.java Sat Aug 25 14:30:05 2007
@@ -59,14 +59,15 @@
return;
String name = getName(bean);
+
+ ResponseWriter rw = context.getResponseWriter();
+
+ // special case for extra skinning of margins in the PanelPage branding
+ // The span is written out here because the writer
+ // needs to see the UIComponent.
if ("logo".equals(name))
{
- // special case for extra skinning of margins in the PanelPage branding
- // The span is written out here because the writer
- // needs to see the UIComponent.
- ResponseWriter rw = context.getResponseWriter();
-
rw.startElement("img", comp);
renderId(context, comp);
renderAllAttributes(context, arc, bean, false);
@@ -98,23 +99,30 @@
// If we've got an Icon, and it has content, render it
if ((icon != null) && !icon.isNull())
{
- // The span is written out here because the writer
- // needs to see the UIComponent.
- ResponseWriter rw = context.getResponseWriter();
-
+ rw.startElement("span", comp);
+
// If this icon renders as an image, don't embed it in a span
boolean embed = icon.getImageURI(context, arc) == null;
if (embed)
{
- rw.startElement("span", comp);
renderId(context, comp);
- renderAllAttributes(context, arc, bean);
+ // Don't render style class, as it's handled by the icon code
+ renderAllAttributes(context, arc, bean, false);
}
+ // ... unless we have inlineStyle or Javascript, which won't
+ // get rendered on the icon itself. If none are present,
+ // our ResponseWriter will trim the unneeded span
+ else
+ {
+ renderEventHandlers(context, bean);
+ }
+
+ // inlineStyle, if set, always goes on the span (today)
+ renderInlineStyle(context, arc, bean);
icon.renderIcon(context, arc,
_getNodeAttributeMap(context, comp, bean, embed));
- if (embed)
- rw.endElement("span");
+ rw.endElement("span");
}
}
}
@@ -143,12 +151,14 @@
attrs = new ArrayMap<String, Object>(1);
attrs.put(Icon.SHORT_DESC_KEY, getShortDesc(bean));
+ attrs.put(Icon.STYLE_CLASS_KEY, getStyleClass(bean));
if (embed)
+ {
attrs.put(Icon.EMBEDDED_KEY, Boolean.TRUE);
+ }
else
{
- attrs.put(Icon.STYLE_CLASS_KEY, getStyleClass(bean));
attrs.put(Icon.ID_KEY, getClientId(context, comp));
}
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/TextIcon.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/TextIcon.java?rev=569736&r1=569735&r2=569736&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/TextIcon.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/TextIcon.java Sat Aug 25 14:30:05 2007
@@ -127,14 +127,12 @@
// Handle style attributes (or elements)
- // =-=jmwIcon @todo: do what XhtmlLafRenderer.renderStyleClassAttribute
- // =-=jmwIcon need to shorten it!
// we map the styleClass in case it is used in a composite
- // Then, since we aren't shortening it, which we need to!, we need
- // to at least make sure it is valid.
StringBuilder styleClasses = new StringBuilder();
if (styleClass != null)
{
+ // FIXME: since we go through the rendering context,
+ // there should be no need to go to StyleUtils
String convertedStyleClass =
StyleUtils.convertToValidSelector(arc.getStyleClass(_styleClass));
@@ -146,7 +144,7 @@
if (styleClasses.length() > 0)
styleClasses.append(" ");
- styleClasses.append(attrStyles.toString());
+ styleClasses.append(arc.getStyleClass(attrStyles.toString()));
}
if (styleClasses.length() > 0)
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimal-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimal-golden.xml?rev=569736&r1=569735&r2=569736&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimal-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimal-golden.xml Sat Aug 25 14:30:05 2007
@@ -1,158 +1,166 @@
-<results>
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- >
- *
- </span>
-<!--AttributeTest[name,info]-->
-
- <span
- class="AFInfoIconStyle"
- id="mainId"
- >
- i
- </span>
-<!--AttributeTest[name,warning]-->
-
- <span
- class="AFWarningIconStyle"
- id="mainId"
- >
- !
- </span>
-<!--AttributeTest[name,error]-->
-
- <span
- class="AFErrorIconStyle"
- id="mainId"
- >
- X
- </span>
-<!--AttributeTest[id,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="test-id"
- >
- *
- </span>
-<!--AttributeTest[inlineStyle,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- style="test-inlineStyle"
- >
- *
- </span>
-<!--AttributeTest[rendered,false]-->
-
-<!--AttributeTest[rendered,true]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- >
- *
- </span>
-<!--AttributeTest[shortDesc,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- title="test-shortDesc"
- >
- *
- </span>
-<!--AttributeTest[onclick,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onclick="test-onclick"
- >
- *
- </span>
-<!--AttributeTest[ondblclick,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- ondblclick="test-ondblclick"
- >
- *
- </span>
-<!--AttributeTest[onkeydown,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onkeydown="test-onkeydown"
- >
- *
- </span>
-<!--AttributeTest[onkeypress,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onkeypress="test-onkeypress"
- >
- *
- </span>
-<!--AttributeTest[onkeyup,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onkeyup="test-onkeyup"
- >
- *
- </span>
-<!--AttributeTest[onmousedown,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onmousedown="test-onmousedown"
- >
- *
- </span>
-<!--AttributeTest[onmousemove,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onmousemove="test-onmousemove"
- >
- *
- </span>
-<!--AttributeTest[onmouseout,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onmouseout="test-onmouseout"
- >
- *
- </span>
-<!--AttributeTest[onmouseover,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onmouseover="test-onmouseover"
- >
- *
- </span>
-<!--AttributeTest[onmouseup,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onmouseup="test-onmouseup"
- >
- *
- </span>
-</results>
+<results>
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ >
+ *
+ </span>
+<!--AttributeTest[name,info]-->
+
+ <span
+ class="AFInfoIconStyle"
+ id="mainId"
+ >
+ i
+ </span>
+<!--AttributeTest[name,warning]-->
+
+ <span
+ class="AFWarningIconStyle"
+ id="mainId"
+ >
+ !
+ </span>
+<!--AttributeTest[name,error]-->
+
+ <span
+ class="AFErrorIconStyle"
+ id="mainId"
+ >
+ X
+ </span>
+<!--AttributeTest[id,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="test-id"
+ >
+ *
+ </span>
+<!--AttributeTest[inlineStyle,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ style="test-inlineStyle"
+ >
+ *
+ </span>
+<!--AttributeTest[rendered,false]-->
+
+<!--AttributeTest[rendered,true]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ >
+ *
+ </span>
+<!--AttributeTest[shortDesc,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ title="test-shortDesc"
+ >
+ *
+ </span>
+<!--AttributeTest[styleClass,null]-->
+
+ <span
+ class="AFRequiredIconStyle test-styleClass"
+ id="mainId"
+ >
+ *
+ </span>
+<!--AttributeTest[onclick,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onclick="test-onclick"
+ >
+ *
+ </span>
+<!--AttributeTest[ondblclick,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ ondblclick="test-ondblclick"
+ >
+ *
+ </span>
+<!--AttributeTest[onkeydown,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onkeydown="test-onkeydown"
+ >
+ *
+ </span>
+<!--AttributeTest[onkeypress,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onkeypress="test-onkeypress"
+ >
+ *
+ </span>
+<!--AttributeTest[onkeyup,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onkeyup="test-onkeyup"
+ >
+ *
+ </span>
+<!--AttributeTest[onmousedown,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onmousedown="test-onmousedown"
+ >
+ *
+ </span>
+<!--AttributeTest[onmousemove,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onmousemove="test-onmousemove"
+ >
+ *
+ </span>
+<!--AttributeTest[onmouseout,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onmouseout="test-onmouseout"
+ >
+ *
+ </span>
+<!--AttributeTest[onmouseover,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onmouseover="test-onmouseover"
+ >
+ *
+ </span>
+<!--AttributeTest[onmouseup,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onmouseup="test-onmouseup"
+ >
+ *
+ </span>
+</results>
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalIE-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalIE-golden.xml?rev=569736&r1=569735&r2=569736&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalIE-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalIE-golden.xml Sat Aug 25 14:30:05 2007
@@ -1,158 +1,166 @@
-<results>
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- >
- *
- </span>
-<!--AttributeTest[name,info]-->
-
- <span
- class="AFInfoIconStyle"
- id="mainId"
- >
- i
- </span>
-<!--AttributeTest[name,warning]-->
-
- <span
- class="AFWarningIconStyle"
- id="mainId"
- >
- !
- </span>
-<!--AttributeTest[name,error]-->
-
- <span
- class="AFErrorIconStyle"
- id="mainId"
- >
- X
- </span>
-<!--AttributeTest[id,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="test-id"
- >
- *
- </span>
-<!--AttributeTest[inlineStyle,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- style="test-inlineStyle"
- >
- *
- </span>
-<!--AttributeTest[rendered,false]-->
-
-<!--AttributeTest[rendered,true]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- >
- *
- </span>
-<!--AttributeTest[shortDesc,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- title="test-shortDesc"
- >
- *
- </span>
-<!--AttributeTest[onclick,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onclick="test-onclick"
- >
- *
- </span>
-<!--AttributeTest[ondblclick,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- ondblclick="test-ondblclick"
- >
- *
- </span>
-<!--AttributeTest[onkeydown,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onkeydown="test-onkeydown"
- >
- *
- </span>
-<!--AttributeTest[onkeypress,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onkeypress="test-onkeypress"
- >
- *
- </span>
-<!--AttributeTest[onkeyup,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onkeyup="test-onkeyup"
- >
- *
- </span>
-<!--AttributeTest[onmousedown,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onmousedown="test-onmousedown"
- >
- *
- </span>
-<!--AttributeTest[onmousemove,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onmousemove="test-onmousemove"
- >
- *
- </span>
-<!--AttributeTest[onmouseout,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onmouseout="test-onmouseout"
- >
- *
- </span>
-<!--AttributeTest[onmouseover,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onmouseover="test-onmouseover"
- >
- *
- </span>
-<!--AttributeTest[onmouseup,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onmouseup="test-onmouseup"
- >
- *
- </span>
-</results>
+<results>
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ >
+ *
+ </span>
+<!--AttributeTest[name,info]-->
+
+ <span
+ class="AFInfoIconStyle"
+ id="mainId"
+ >
+ i
+ </span>
+<!--AttributeTest[name,warning]-->
+
+ <span
+ class="AFWarningIconStyle"
+ id="mainId"
+ >
+ !
+ </span>
+<!--AttributeTest[name,error]-->
+
+ <span
+ class="AFErrorIconStyle"
+ id="mainId"
+ >
+ X
+ </span>
+<!--AttributeTest[id,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="test-id"
+ >
+ *
+ </span>
+<!--AttributeTest[inlineStyle,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ style="test-inlineStyle"
+ >
+ *
+ </span>
+<!--AttributeTest[rendered,false]-->
+
+<!--AttributeTest[rendered,true]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ >
+ *
+ </span>
+<!--AttributeTest[shortDesc,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ title="test-shortDesc"
+ >
+ *
+ </span>
+<!--AttributeTest[styleClass,null]-->
+
+ <span
+ class="AFRequiredIconStyle test-styleClass"
+ id="mainId"
+ >
+ *
+ </span>
+<!--AttributeTest[onclick,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onclick="test-onclick"
+ >
+ *
+ </span>
+<!--AttributeTest[ondblclick,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ ondblclick="test-ondblclick"
+ >
+ *
+ </span>
+<!--AttributeTest[onkeydown,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onkeydown="test-onkeydown"
+ >
+ *
+ </span>
+<!--AttributeTest[onkeypress,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onkeypress="test-onkeypress"
+ >
+ *
+ </span>
+<!--AttributeTest[onkeyup,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onkeyup="test-onkeyup"
+ >
+ *
+ </span>
+<!--AttributeTest[onmousedown,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onmousedown="test-onmousedown"
+ >
+ *
+ </span>
+<!--AttributeTest[onmousemove,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onmousemove="test-onmousemove"
+ >
+ *
+ </span>
+<!--AttributeTest[onmouseout,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onmouseout="test-onmouseout"
+ >
+ *
+ </span>
+<!--AttributeTest[onmouseover,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onmouseover="test-onmouseover"
+ >
+ *
+ </span>
+<!--AttributeTest[onmouseup,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onmouseup="test-onmouseup"
+ >
+ *
+ </span>
+</results>
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalIERtl-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalIERtl-golden.xml?rev=569736&r1=569735&r2=569736&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalIERtl-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalIERtl-golden.xml Sat Aug 25 14:30:05 2007
@@ -1,158 +1,166 @@
-<results>
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- >
- *
- </span>
-<!--AttributeTest[name,info]-->
-
- <span
- class="AFInfoIconStyle"
- id="mainId"
- >
- i
- </span>
-<!--AttributeTest[name,warning]-->
-
- <span
- class="AFWarningIconStyle"
- id="mainId"
- >
- !
- </span>
-<!--AttributeTest[name,error]-->
-
- <span
- class="AFErrorIconStyle"
- id="mainId"
- >
- X
- </span>
-<!--AttributeTest[id,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="test-id"
- >
- *
- </span>
-<!--AttributeTest[inlineStyle,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- style="test-inlineStyle"
- >
- *
- </span>
-<!--AttributeTest[rendered,false]-->
-
-<!--AttributeTest[rendered,true]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- >
- *
- </span>
-<!--AttributeTest[shortDesc,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- title="test-shortDesc"
- >
- *
- </span>
-<!--AttributeTest[onclick,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onclick="test-onclick"
- >
- *
- </span>
-<!--AttributeTest[ondblclick,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- ondblclick="test-ondblclick"
- >
- *
- </span>
-<!--AttributeTest[onkeydown,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onkeydown="test-onkeydown"
- >
- *
- </span>
-<!--AttributeTest[onkeypress,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onkeypress="test-onkeypress"
- >
- *
- </span>
-<!--AttributeTest[onkeyup,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onkeyup="test-onkeyup"
- >
- *
- </span>
-<!--AttributeTest[onmousedown,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onmousedown="test-onmousedown"
- >
- *
- </span>
-<!--AttributeTest[onmousemove,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onmousemove="test-onmousemove"
- >
- *
- </span>
-<!--AttributeTest[onmouseout,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onmouseout="test-onmouseout"
- >
- *
- </span>
-<!--AttributeTest[onmouseover,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onmouseover="test-onmouseover"
- >
- *
- </span>
-<!--AttributeTest[onmouseup,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onmouseup="test-onmouseup"
- >
- *
- </span>
-</results>
+<results>
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ >
+ *
+ </span>
+<!--AttributeTest[name,info]-->
+
+ <span
+ class="AFInfoIconStyle"
+ id="mainId"
+ >
+ i
+ </span>
+<!--AttributeTest[name,warning]-->
+
+ <span
+ class="AFWarningIconStyle"
+ id="mainId"
+ >
+ !
+ </span>
+<!--AttributeTest[name,error]-->
+
+ <span
+ class="AFErrorIconStyle"
+ id="mainId"
+ >
+ X
+ </span>
+<!--AttributeTest[id,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="test-id"
+ >
+ *
+ </span>
+<!--AttributeTest[inlineStyle,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ style="test-inlineStyle"
+ >
+ *
+ </span>
+<!--AttributeTest[rendered,false]-->
+
+<!--AttributeTest[rendered,true]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ >
+ *
+ </span>
+<!--AttributeTest[shortDesc,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ title="test-shortDesc"
+ >
+ *
+ </span>
+<!--AttributeTest[styleClass,null]-->
+
+ <span
+ class="AFRequiredIconStyle test-styleClass"
+ id="mainId"
+ >
+ *
+ </span>
+<!--AttributeTest[onclick,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onclick="test-onclick"
+ >
+ *
+ </span>
+<!--AttributeTest[ondblclick,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ ondblclick="test-ondblclick"
+ >
+ *
+ </span>
+<!--AttributeTest[onkeydown,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onkeydown="test-onkeydown"
+ >
+ *
+ </span>
+<!--AttributeTest[onkeypress,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onkeypress="test-onkeypress"
+ >
+ *
+ </span>
+<!--AttributeTest[onkeyup,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onkeyup="test-onkeyup"
+ >
+ *
+ </span>
+<!--AttributeTest[onmousedown,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onmousedown="test-onmousedown"
+ >
+ *
+ </span>
+<!--AttributeTest[onmousemove,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onmousemove="test-onmousemove"
+ >
+ *
+ </span>
+<!--AttributeTest[onmouseout,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onmouseout="test-onmouseout"
+ >
+ *
+ </span>
+<!--AttributeTest[onmouseover,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onmouseover="test-onmouseover"
+ >
+ *
+ </span>
+<!--AttributeTest[onmouseup,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onmouseup="test-onmouseup"
+ >
+ *
+ </span>
+</results>
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalInacc-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalInacc-golden.xml?rev=569736&r1=569735&r2=569736&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalInacc-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalInacc-golden.xml Sat Aug 25 14:30:05 2007
@@ -1,158 +1,166 @@
-<results>
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- >
- *
- </span>
-<!--AttributeTest[name,info]-->
-
- <span
- class="AFInfoIconStyle"
- id="mainId"
- >
- i
- </span>
-<!--AttributeTest[name,warning]-->
-
- <span
- class="AFWarningIconStyle"
- id="mainId"
- >
- !
- </span>
-<!--AttributeTest[name,error]-->
-
- <span
- class="AFErrorIconStyle"
- id="mainId"
- >
- X
- </span>
-<!--AttributeTest[id,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="test-id"
- >
- *
- </span>
-<!--AttributeTest[inlineStyle,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- style="test-inlineStyle"
- >
- *
- </span>
-<!--AttributeTest[rendered,false]-->
-
-<!--AttributeTest[rendered,true]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- >
- *
- </span>
-<!--AttributeTest[shortDesc,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- title="test-shortDesc"
- >
- *
- </span>
-<!--AttributeTest[onclick,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onclick="test-onclick"
- >
- *
- </span>
-<!--AttributeTest[ondblclick,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- ondblclick="test-ondblclick"
- >
- *
- </span>
-<!--AttributeTest[onkeydown,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onkeydown="test-onkeydown"
- >
- *
- </span>
-<!--AttributeTest[onkeypress,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onkeypress="test-onkeypress"
- >
- *
- </span>
-<!--AttributeTest[onkeyup,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onkeyup="test-onkeyup"
- >
- *
- </span>
-<!--AttributeTest[onmousedown,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onmousedown="test-onmousedown"
- >
- *
- </span>
-<!--AttributeTest[onmousemove,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onmousemove="test-onmousemove"
- >
- *
- </span>
-<!--AttributeTest[onmouseout,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onmouseout="test-onmouseout"
- >
- *
- </span>
-<!--AttributeTest[onmouseover,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onmouseover="test-onmouseover"
- >
- *
- </span>
-<!--AttributeTest[onmouseup,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onmouseup="test-onmouseup"
- >
- *
- </span>
-</results>
+<results>
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ >
+ *
+ </span>
+<!--AttributeTest[name,info]-->
+
+ <span
+ class="AFInfoIconStyle"
+ id="mainId"
+ >
+ i
+ </span>
+<!--AttributeTest[name,warning]-->
+
+ <span
+ class="AFWarningIconStyle"
+ id="mainId"
+ >
+ !
+ </span>
+<!--AttributeTest[name,error]-->
+
+ <span
+ class="AFErrorIconStyle"
+ id="mainId"
+ >
+ X
+ </span>
+<!--AttributeTest[id,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="test-id"
+ >
+ *
+ </span>
+<!--AttributeTest[inlineStyle,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ style="test-inlineStyle"
+ >
+ *
+ </span>
+<!--AttributeTest[rendered,false]-->
+
+<!--AttributeTest[rendered,true]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ >
+ *
+ </span>
+<!--AttributeTest[shortDesc,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ title="test-shortDesc"
+ >
+ *
+ </span>
+<!--AttributeTest[styleClass,null]-->
+
+ <span
+ class="AFRequiredIconStyle test-styleClass"
+ id="mainId"
+ >
+ *
+ </span>
+<!--AttributeTest[onclick,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onclick="test-onclick"
+ >
+ *
+ </span>
+<!--AttributeTest[ondblclick,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ ondblclick="test-ondblclick"
+ >
+ *
+ </span>
+<!--AttributeTest[onkeydown,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onkeydown="test-onkeydown"
+ >
+ *
+ </span>
+<!--AttributeTest[onkeypress,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onkeypress="test-onkeypress"
+ >
+ *
+ </span>
+<!--AttributeTest[onkeyup,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onkeyup="test-onkeyup"
+ >
+ *
+ </span>
+<!--AttributeTest[onmousedown,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onmousedown="test-onmousedown"
+ >
+ *
+ </span>
+<!--AttributeTest[onmousemove,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onmousemove="test-onmousemove"
+ >
+ *
+ </span>
+<!--AttributeTest[onmouseout,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onmouseout="test-onmouseout"
+ >
+ *
+ </span>
+<!--AttributeTest[onmouseover,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onmouseover="test-onmouseover"
+ >
+ *
+ </span>
+<!--AttributeTest[onmouseup,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onmouseup="test-onmouseup"
+ >
+ *
+ </span>
+</results>
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalPPC-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalPPC-golden.xml?rev=569736&r1=569735&r2=569736&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalPPC-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalPPC-golden.xml Sat Aug 25 14:30:05 2007
@@ -65,6 +65,14 @@
>
*
</span>
+<!--AttributeTest[styleClass,null]-->
+
+ <span
+ class="AFRequiredIconStyle test-styleClass"
+ id="mainId"
+ >
+ *
+ </span>
<!--AttributeTest[onclick,null]-->
<span
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalSaf-golden.xml?rev=569736&r1=569735&r2=569736&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalSaf-golden.xml Sat Aug 25 14:30:05 2007
@@ -1,158 +1,166 @@
-<results>
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- >
- *
- </span>
-<!--AttributeTest[name,info]-->
-
- <span
- class="AFInfoIconStyle"
- id="mainId"
- >
- i
- </span>
-<!--AttributeTest[name,warning]-->
-
- <span
- class="AFWarningIconStyle"
- id="mainId"
- >
- !
- </span>
-<!--AttributeTest[name,error]-->
-
- <span
- class="AFErrorIconStyle"
- id="mainId"
- >
- X
- </span>
-<!--AttributeTest[id,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="test-id"
- >
- *
- </span>
-<!--AttributeTest[inlineStyle,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- style="test-inlineStyle"
- >
- *
- </span>
-<!--AttributeTest[rendered,false]-->
-
-<!--AttributeTest[rendered,true]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- >
- *
- </span>
-<!--AttributeTest[shortDesc,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- title="test-shortDesc"
- >
- *
- </span>
-<!--AttributeTest[onclick,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onclick="test-onclick"
- >
- *
- </span>
-<!--AttributeTest[ondblclick,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- ondblclick="test-ondblclick"
- >
- *
- </span>
-<!--AttributeTest[onkeydown,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onkeydown="test-onkeydown"
- >
- *
- </span>
-<!--AttributeTest[onkeypress,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onkeypress="test-onkeypress"
- >
- *
- </span>
-<!--AttributeTest[onkeyup,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onkeyup="test-onkeyup"
- >
- *
- </span>
-<!--AttributeTest[onmousedown,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onmousedown="test-onmousedown"
- >
- *
- </span>
-<!--AttributeTest[onmousemove,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onmousemove="test-onmousemove"
- >
- *
- </span>
-<!--AttributeTest[onmouseout,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onmouseout="test-onmouseout"
- >
- *
- </span>
-<!--AttributeTest[onmouseover,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onmouseover="test-onmouseover"
- >
- *
- </span>
-<!--AttributeTest[onmouseup,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onmouseup="test-onmouseup"
- >
- *
- </span>
-</results>
+<results>
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ >
+ *
+ </span>
+<!--AttributeTest[name,info]-->
+
+ <span
+ class="AFInfoIconStyle"
+ id="mainId"
+ >
+ i
+ </span>
+<!--AttributeTest[name,warning]-->
+
+ <span
+ class="AFWarningIconStyle"
+ id="mainId"
+ >
+ !
+ </span>
+<!--AttributeTest[name,error]-->
+
+ <span
+ class="AFErrorIconStyle"
+ id="mainId"
+ >
+ X
+ </span>
+<!--AttributeTest[id,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="test-id"
+ >
+ *
+ </span>
+<!--AttributeTest[inlineStyle,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ style="test-inlineStyle"
+ >
+ *
+ </span>
+<!--AttributeTest[rendered,false]-->
+
+<!--AttributeTest[rendered,true]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ >
+ *
+ </span>
+<!--AttributeTest[shortDesc,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ title="test-shortDesc"
+ >
+ *
+ </span>
+<!--AttributeTest[styleClass,null]-->
+
+ <span
+ class="AFRequiredIconStyle test-styleClass"
+ id="mainId"
+ >
+ *
+ </span>
+<!--AttributeTest[onclick,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onclick="test-onclick"
+ >
+ *
+ </span>
+<!--AttributeTest[ondblclick,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ ondblclick="test-ondblclick"
+ >
+ *
+ </span>
+<!--AttributeTest[onkeydown,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onkeydown="test-onkeydown"
+ >
+ *
+ </span>
+<!--AttributeTest[onkeypress,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onkeypress="test-onkeypress"
+ >
+ *
+ </span>
+<!--AttributeTest[onkeyup,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onkeyup="test-onkeyup"
+ >
+ *
+ </span>
+<!--AttributeTest[onmousedown,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onmousedown="test-onmousedown"
+ >
+ *
+ </span>
+<!--AttributeTest[onmousemove,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onmousemove="test-onmousemove"
+ >
+ *
+ </span>
+<!--AttributeTest[onmouseout,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onmouseout="test-onmouseout"
+ >
+ *
+ </span>
+<!--AttributeTest[onmouseover,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onmouseover="test-onmouseover"
+ >
+ *
+ </span>
+<!--AttributeTest[onmouseup,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onmouseup="test-onmouseup"
+ >
+ *
+ </span>
+</results>
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalScrRdr-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalScrRdr-golden.xml?rev=569736&r1=569735&r2=569736&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalScrRdr-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/icon-minimalScrRdr-golden.xml Sat Aug 25 14:30:05 2007
@@ -1,158 +1,166 @@
-<results>
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- >
- *
- </span>
-<!--AttributeTest[name,info]-->
-
- <span
- class="AFInfoIconStyle"
- id="mainId"
- >
- i
- </span>
-<!--AttributeTest[name,warning]-->
-
- <span
- class="AFWarningIconStyle"
- id="mainId"
- >
- !
- </span>
-<!--AttributeTest[name,error]-->
-
- <span
- class="AFErrorIconStyle"
- id="mainId"
- >
- X
- </span>
-<!--AttributeTest[id,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="test-id"
- >
- *
- </span>
-<!--AttributeTest[inlineStyle,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- style="test-inlineStyle"
- >
- *
- </span>
-<!--AttributeTest[rendered,false]-->
-
-<!--AttributeTest[rendered,true]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- >
- *
- </span>
-<!--AttributeTest[shortDesc,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- title="test-shortDesc"
- >
- *
- </span>
-<!--AttributeTest[onclick,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onclick="test-onclick"
- >
- *
- </span>
-<!--AttributeTest[ondblclick,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- ondblclick="test-ondblclick"
- >
- *
- </span>
-<!--AttributeTest[onkeydown,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onkeydown="test-onkeydown"
- >
- *
- </span>
-<!--AttributeTest[onkeypress,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onkeypress="test-onkeypress"
- >
- *
- </span>
-<!--AttributeTest[onkeyup,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onkeyup="test-onkeyup"
- >
- *
- </span>
-<!--AttributeTest[onmousedown,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onmousedown="test-onmousedown"
- >
- *
- </span>
-<!--AttributeTest[onmousemove,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onmousemove="test-onmousemove"
- >
- *
- </span>
-<!--AttributeTest[onmouseout,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onmouseout="test-onmouseout"
- >
- *
- </span>
-<!--AttributeTest[onmouseover,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onmouseover="test-onmouseover"
- >
- *
- </span>
-<!--AttributeTest[onmouseup,null]-->
-
- <span
- class="AFRequiredIconStyle"
- id="mainId"
- onmouseup="test-onmouseup"
- >
- *
- </span>
-</results>
+<results>
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ >
+ *
+ </span>
+<!--AttributeTest[name,info]-->
+
+ <span
+ class="AFInfoIconStyle"
+ id="mainId"
+ >
+ i
+ </span>
+<!--AttributeTest[name,warning]-->
+
+ <span
+ class="AFWarningIconStyle"
+ id="mainId"
+ >
+ !
+ </span>
+<!--AttributeTest[name,error]-->
+
+ <span
+ class="AFErrorIconStyle"
+ id="mainId"
+ >
+ X
+ </span>
+<!--AttributeTest[id,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="test-id"
+ >
+ *
+ </span>
+<!--AttributeTest[inlineStyle,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ style="test-inlineStyle"
+ >
+ *
+ </span>
+<!--AttributeTest[rendered,false]-->
+
+<!--AttributeTest[rendered,true]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ >
+ *
+ </span>
+<!--AttributeTest[shortDesc,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ title="test-shortDesc"
+ >
+ *
+ </span>
+<!--AttributeTest[styleClass,null]-->
+
+ <span
+ class="AFRequiredIconStyle test-styleClass"
+ id="mainId"
+ >
+ *
+ </span>
+<!--AttributeTest[onclick,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onclick="test-onclick"
+ >
+ *
+ </span>
+<!--AttributeTest[ondblclick,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ ondblclick="test-ondblclick"
+ >
+ *
+ </span>
+<!--AttributeTest[onkeydown,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onkeydown="test-onkeydown"
+ >
+ *
+ </span>
+<!--AttributeTest[onkeypress,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onkeypress="test-onkeypress"
+ >
+ *
+ </span>
+<!--AttributeTest[onkeyup,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onkeyup="test-onkeyup"
+ >
+ *
+ </span>
+<!--AttributeTest[onmousedown,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onmousedown="test-onmousedown"
+ >
+ *
+ </span>
+<!--AttributeTest[onmousemove,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onmousemove="test-onmousemove"
+ >
+ *
+ </span>
+<!--AttributeTest[onmouseout,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onmouseout="test-onmouseout"
+ >
+ *
+ </span>
+<!--AttributeTest[onmouseover,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onmouseover="test-onmouseover"
+ >
+ *
+ </span>
+<!--AttributeTest[onmouseup,null]-->
+
+ <span
+ class="AFRequiredIconStyle"
+ id="mainId"
+ onmouseup="test-onmouseup"
+ >
+ *
+ </span>
+</results>
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/icon.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/icon.xml?rev=569736&r1=569735&r2=569736&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/icon.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/icon.xml Sat Aug 25 14:30:05 2007
@@ -10,7 +10,6 @@
<attribute-test name="inlineStyle"/>
<boolean-test name="rendered"/>
<attribute-test name="shortDesc"/>
- <!-- Gives error: Attribute class was written twice
<attribute-test name="styleClass"/> -->
<js-test/>