You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by dr...@apache.org on 2007/10/26 16:17:08 UTC
svn commit: r588656 - in /myfaces/trinidad/trunk/trinidad/trinidad-impl/src:
main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/
main/resources/META-INF/adf/styles/
test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/ te...
Author: drobinson
Date: Fri Oct 26 07:17:07 2007
New Revision: 588656
URL: http://svn.apache.org/viewvc?rev=588656&view=rev
Log:
TRINIDAD-144, TRINIDAD-783
Cleaned up message renderer code and consolidated rendering logic for server-side and client-side validation into single block. Removed duplicate spans for client-side validation, so issues with duplicate messages should be resolved. Also cleaned up default style for messages to remove the use of p_OraDisplayBlock from OraInlineInfoText style, so strange layout behavior should be resolve in IE.
Modified:
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimal-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimalIE-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimalIERtl-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimalInacc-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimalSaf-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimalScrRdr-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/message.xml
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageRenderer.java?rev=588656&r1=588655&r2=588656&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageRenderer.java Fri Oct 26 07:17:07 2007
@@ -63,6 +63,37 @@
{
return true;
}
+
+ @Override
+ protected String getInlineStyle(FacesBean bean)
+ {
+ String beanInlineStyle = super.getInlineStyle(bean);
+ String inlineStyle = null;
+
+ if (getIndented(bean))
+ {
+ inlineStyle = (RenderingContext.getCurrentInstance().isRightToLeft()
+ ? _sRTL_INDENTED_STYLE
+ : _sLTR_INDENTED_STYLE);
+ }
+
+ // if neither of these are null, then combine them and render
+ if (inlineStyle != null && beanInlineStyle != null)
+ {
+ StringBuffer buffer = new StringBuffer(inlineStyle.length() +
+ beanInlineStyle.length() +
+ 1);
+ buffer.append(inlineStyle);
+ if (!inlineStyle.endsWith(";"))
+ buffer.append(";");
+ buffer.append(beanInlineStyle);
+ return buffer.toString();
+ }
+ else if (inlineStyle != null)
+ return inlineStyle;
+ else
+ return beanInlineStyle;
+ }
@Override
protected void encodeAll(
@@ -76,9 +107,9 @@
String message = getMessage(bean);
String messageType = getMessageType(bean);
+ String forId = getForId(context, component, bean);
if ((message == null) || (messageType == null))
{
- String forId = getForId(context, component, bean);
FacesMessage facesMessage = MessageUtils.getFacesMessage(context, forId);
if (facesMessage != null)
{
@@ -92,163 +123,75 @@
UIComponent help = getFacet(component, "help");
- boolean isError = CoreMessage.MESSAGE_TYPE_ERROR.equals(messageType);
-
- String styleClass = null;
- String inlineStyle;
- if (getIndented(bean))
- {
- inlineStyle = (arc.isRightToLeft()
- ? _sRTL_INDENTED_STYLE
- : _sLTR_INDENTED_STYLE);
- }
- else
- {
- inlineStyle = null;
- }
+ boolean isError = true;
+ if (messageType != null)
+ isError = CoreMessage.MESSAGE_TYPE_ERROR.equals(messageType);
boolean hasHelp = (help != null);
boolean hasMessage = (message != null);
-
- // When there's both a help facet and a message, and we need to indent,
- // then we want to use a div around the whole thing - so that both
- // the help facet and message will be indented. Otherwise, we'll
- // get away with a span.
- boolean useDiv = (hasHelp && hasMessage && (inlineStyle != null));
- if (useDiv)
- {
- writer.startElement("div", component);
- }
- else
- {
- writer.startElement("span", component);
- }
-
- renderId(context, component);
- // render all the attributes BUT the style classes, since we'll do
- // that separately.
- renderAllAttributes(context, arc, bean, false);
+ RequestContext rc = RequestContext.getCurrentInstance();
+ boolean isInline = (rc.getClientValidation() ==
+ RequestContext.ClientValidation.INLINE);
- String beanInlineStyle = getInlineStyle(bean);
- _renderInlineStyles(writer, inlineStyle, beanInlineStyle);
-
- // get the bean's styleClass attribute. we'll render it along with
- // our default styles if necessary.
- String beanStyleClass = getStyleClass(bean);
-
-
- // both help facet and message exist and messageType is error
- // so need 2 divs inside span with id
- if ( hasHelp && hasMessage && isError )
+ // Handle rendering the help text
+ if (hasHelp)
{
- if (beanStyleClass != null)
- renderStyleClass(context, arc, beanStyleClass);
-
- writer.startElement("div", null);
- renderStyleClass(context, arc, SkinSelectors.INLINE_INFO_TEXT_STYLE_CLASS);
- encodeChild(context, help);
- writer.endElement("div");
+ // Write the root level element for the help
+ writer.startElement(XhtmlConstants.SPAN_ELEMENT, component);
+ if (shouldRenderId(context, component))
+ writer.writeAttribute(XhtmlConstants.ID_ATTRIBUTE,
+ forId + "::help", null);
+ renderId(context, component);
+
+ renderAllAttributes(context, arc, bean, false);
+ renderStyleAttributes(context, arc, bean, SkinSelectors.INLINE_INFO_TEXT_STYLE_CLASS);
- // Use a div for the error message to force it onto a new line
- writer.startElement("div", null);
- renderStyleClass(context, arc,
- SkinSelectors.INLINE_ERROR_TEXT_STYLE_CLASS);
- renderPossiblyFormattedText(context, message);
- writer.endElement("div");
- }
- // Either
- // 1. Only help facet exists
- // 2. Only message exists
- // 3. Both exist and messageType not error
- else if (hasHelp || hasMessage)
- {
- // if there's a help facet the styleclass should not be error
- if (hasHelp)
- styleClass = SkinSelectors.INLINE_INFO_TEXT_STYLE_CLASS;
- else
- styleClass = isError ? SkinSelectors.INLINE_ERROR_TEXT_STYLE_CLASS :
- SkinSelectors.INLINE_INFO_TEXT_STYLE_CLASS;
- // render default styles along with bean's styleClass if it exists.
- if (beanStyleClass != null)
- {
- StringBuffer styleClassBuffer =
- new StringBuffer(styleClass.length() + beanStyleClass.length() + 1);
- styleClassBuffer.append(styleClass);
- styleClassBuffer.append(' ');
- styleClassBuffer.append(beanStyleClass);
- renderStyleClass(context, arc, styleClassBuffer.toString());
- }
- else
- renderStyleClass(context, arc, styleClass);
-
- if ( hasHelp )
encodeChild(context, help);
- if (hasHelp && hasMessage)
+ if (hasMessage || isInline)
{
+ // We'll need a break between the help and message
+ // Do it here, so it gets inserted if hasHelp
writer.startElement("br", null);
writer.endElement("br");
}
+ writer.endElement(XhtmlConstants.SPAN_ELEMENT);
+
+ }
+
+ // Handle rendering the message text (or the empty placeholder)
+ if (hasMessage || isInline)
+ {
+
+ // Write the root level element for the help
+ writer.startElement(XhtmlConstants.SPAN_ELEMENT, component);
+
+ if (shouldRenderId(context, component) || (isInline && forId != null))
+ writer.writeAttribute(XhtmlConstants.ID_ATTRIBUTE,
+ forId + "::msg", null);
+
+ renderAllAttributes(context, arc, bean, false);
+ renderStyleAttributes(context, arc, bean, isError ?
+ SkinSelectors.INLINE_ERROR_TEXT_STYLE_CLASS :
+ SkinSelectors.INLINE_INFO_TEXT_STYLE_CLASS);
+
if (hasMessage)
{
+ // Output the server-side message
renderPossiblyFormattedText(context, message);
}
-
- }
-
- // Render a hidden container for client-side messages
- RequestContext rc = RequestContext.getCurrentInstance();
- boolean isInline = (rc.getClientValidation() ==
- RequestContext.ClientValidation.INLINE);
- if (isInline)
- {
- String forId = getForId(context, component, bean);
-
- if (forId != null)
+ else
{
- if (hasHelp && hasMessage)
- writer.startElement(XhtmlConstants.DIV_ELEMENT, null);
- else
- {
- if (hasHelp || hasMessage)
- {
- writer.startElement("br", null);
- writer.endElement("br");
- }
- else
- {
- // Add style to outer span
- renderStyleClass(context, arc, SkinSelectors.INLINE_INFO_TEXT_STYLE_CLASS);
- }
-
- writer.startElement(XhtmlConstants.SPAN_ELEMENT, null);
- }
-
- writer.writeAttribute(XhtmlConstants.ID_ATTRIBUTE,
- forId + "::msg", null);
+ // Hide element ready for client-side validation
writer.writeAttribute(XhtmlConstants.STYLE_ATTRIBUTE,
- "display:none;", null);
- renderStyleClass(context, arc,
- SkinSelectors.INLINE_ERROR_TEXT_STYLE_CLASS);
- if (hasHelp && hasMessage)
- writer.endElement(XhtmlConstants.DIV_ELEMENT);
- else
- {
- writer.endElement(XhtmlConstants.SPAN_ELEMENT);
- }
+ "display:none;", null);
}
- }
+
+ writer.endElement(XhtmlConstants.SPAN_ELEMENT);
+ }
- if (useDiv)
- {
- writer.endElement("div");
- }
- else
- {
- writer.endElement("span");
- }
}
//
@@ -298,30 +241,6 @@
return MessageUtils.getClientIdFor(context,
component,
forValue);
- }
-
-
- private void _renderInlineStyles(
- ResponseWriter writer,
- String inlineStyle,
- String beanInlineStyle) throws IOException
- {
- // if neither of these are null, then combine them and render
- if (inlineStyle != null && beanInlineStyle != null)
- {
- StringBuffer buffer = new StringBuffer(inlineStyle.length() +
- beanInlineStyle.length() +
- 1);
- buffer.append(inlineStyle);
- if (!inlineStyle.endsWith(";"))
- buffer.append(";");
- buffer.append(beanInlineStyle);
- writer.writeAttribute("style", buffer.toString(), null);
- }
- else if (inlineStyle != null)
- writer.writeAttribute("style", inlineStyle, null);
- else if (beanInlineStyle != null)
- writer.writeAttribute("style", beanInlineStyle, null);
}
private PropertyKey _forKey;
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java?rev=588656&r1=588655&r2=588656&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java Fri Oct 26 07:17:07 2007
@@ -179,42 +179,40 @@
String forId) throws IOException
{
boolean encodedIcons = false;
+ boolean isInline = (RequestContext.getCurrentInstance().getClientValidation() ==
+ RequestContext.ClientValidation.INLINE);
if ((null != messageType) &&
- !"none".equals(messageType))
+ !"none".equals(messageType) ||
+ ((forId != null) &&
+ isInline))
{
String vAlign = getDefaultValign(bean);
String destination = getMessageDescUrl(bean);
String targetFrame = getMessageTargetFrame(bean);
String anchor = MessageUtils.getAnchor(forId);
- encodedIcons = renderMessageSymbol(context, arc, messageType,
- destination, anchor,
- targetFrame, vAlign);
- }
- else if ((forId != null) &&
- (RequestContext.getCurrentInstance().getClientValidation() ==
- RequestContext.ClientValidation.INLINE))
- {
- // Render a hidden message icon that will be used by inline validation
ResponseWriter rw = context.getResponseWriter();
- rw.startElement(XhtmlConstants.SPAN_ELEMENT, component);
- rw.writeAttribute(XhtmlConstants.ID_ATTRIBUTE,
- forId + "::icon", null);
- rw.writeAttribute(XhtmlConstants.STYLE_ATTRIBUTE,
- "display:none;", null);
-
- String vAlign = getDefaultValign(bean);
- String destination = getMessageDescUrl(bean);
- String targetFrame = getMessageTargetFrame(bean);
- String anchor = MessageUtils.getAnchor(forId);
+ if(isInline)
+ {
+ rw.startElement(XhtmlConstants.SPAN_ELEMENT, component);
+ rw.writeAttribute(XhtmlConstants.ID_ATTRIBUTE,
+ forId + "::icon", null);
+
+ if(null == messageType || "none".equals(messageType))
+ {
+ messageType = XhtmlConstants.MESSAGE_TYPE_ERROR;
+ rw.writeAttribute(XhtmlConstants.STYLE_ATTRIBUTE,
+ "display:none;", null);
+ }
+ }
- encodedIcons = renderMessageSymbol(context, arc,
- XhtmlConstants.MESSAGE_TYPE_ERROR,
+ encodedIcons = renderMessageSymbol(context, arc, messageType,
destination, anchor,
targetFrame, vAlign);
- rw.endElement(XhtmlConstants.SPAN_ELEMENT);
+ if(isInline)
+ rw.endElement(XhtmlConstants.SPAN_ELEMENT);
}
if (getShowRequired(bean))
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss?rev=588656&r1=588655&r2=588656&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss Fri Oct 26 07:17:07 2007
@@ -2808,7 +2808,6 @@
<style selector=".OraInlineInfoText">
<includeStyle name="AFVerySmallFont"/>
<includeStyle name="AFDarkForeground"/>
- <includeStyle selector=".p_OraDisplayBlock"/>
</style>
<!-- Should probably be public -->
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimal-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimal-golden.xml?rev=588656&r1=588655&r2=588656&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimal-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimal-golden.xml Fri Oct 26 07:17:07 2007
@@ -1,7 +1,7 @@
<results>
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -9,7 +9,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -17,7 +17,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
>
message_val
</span>
@@ -25,7 +25,7 @@
<span
class="OraInlineErrorText"
- id="id_val"
+ id="other::msg"
>
message detail
</span>
@@ -33,7 +33,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -41,7 +41,7 @@
<span
class="OraInlineInfoText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -49,7 +49,7 @@
<span
class="OraInlineInfoText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -57,7 +57,7 @@
<span
class="OraInlineInfoText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -65,16 +65,24 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
title="shortDesc_val"
>
message detail
</span>
+<!--AttributeTest[styleClass,someStyle]-->
+
+ <span
+ class="someStyle OraInlineErrorText"
+ id="other::msg"
+ >
+ message detail
+ </span>
<!--AttributeTest[inlineStyle,background-color:red]-->
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
style="background-color:red"
>
message detail
@@ -83,7 +91,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onclick="test-onclick"
>
message detail
@@ -92,7 +100,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
ondblclick="test-ondblclick"
>
message detail
@@ -101,7 +109,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onkeydown="test-onkeydown"
>
message detail
@@ -110,7 +118,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onkeypress="test-onkeypress"
>
message detail
@@ -119,7 +127,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onkeyup="test-onkeyup"
>
message detail
@@ -128,7 +136,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmousedown="test-onmousedown"
>
message detail
@@ -137,7 +145,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmousemove="test-onmousemove"
>
message detail
@@ -146,7 +154,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmouseout="test-onmouseout"
>
message detail
@@ -155,7 +163,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmouseover="test-onmouseover"
>
message detail
@@ -164,7 +172,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmouseup="test-onmouseup"
>
message detail
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimalIE-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimalIE-golden.xml?rev=588656&r1=588655&r2=588656&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimalIE-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimalIE-golden.xml Fri Oct 26 07:17:07 2007
@@ -1,7 +1,7 @@
<results>
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -9,7 +9,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -17,7 +17,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
>
message_val
</span>
@@ -25,7 +25,7 @@
<span
class="OraInlineErrorText"
- id="id_val"
+ id="other::msg"
>
message detail
</span>
@@ -33,7 +33,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -41,7 +41,7 @@
<span
class="OraInlineInfoText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -49,7 +49,7 @@
<span
class="OraInlineInfoText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -57,7 +57,7 @@
<span
class="OraInlineInfoText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -65,16 +65,24 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
title="shortDesc_val"
>
message detail
</span>
+<!--AttributeTest[styleClass,someStyle]-->
+
+ <span
+ class="someStyle OraInlineErrorText"
+ id="other::msg"
+ >
+ message detail
+ </span>
<!--AttributeTest[inlineStyle,background-color:red]-->
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
style="background-color:red"
>
message detail
@@ -83,7 +91,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onclick="test-onclick"
>
message detail
@@ -92,7 +100,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
ondblclick="test-ondblclick"
>
message detail
@@ -101,7 +109,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onkeydown="test-onkeydown"
>
message detail
@@ -110,7 +118,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onkeypress="test-onkeypress"
>
message detail
@@ -119,7 +127,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onkeyup="test-onkeyup"
>
message detail
@@ -128,7 +136,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmousedown="test-onmousedown"
>
message detail
@@ -137,7 +145,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmousemove="test-onmousemove"
>
message detail
@@ -146,7 +154,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmouseout="test-onmouseout"
>
message detail
@@ -155,7 +163,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmouseover="test-onmouseover"
>
message detail
@@ -164,7 +172,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmouseup="test-onmouseup"
>
message detail
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimalIERtl-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimalIERtl-golden.xml?rev=588656&r1=588655&r2=588656&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimalIERtl-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimalIERtl-golden.xml Fri Oct 26 07:17:07 2007
@@ -1,7 +1,7 @@
<results>
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -9,7 +9,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -17,7 +17,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
>
message_val
</span>
@@ -25,7 +25,7 @@
<span
class="OraInlineErrorText"
- id="id_val"
+ id="other::msg"
>
message detail
</span>
@@ -33,7 +33,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -41,7 +41,7 @@
<span
class="OraInlineInfoText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -49,7 +49,7 @@
<span
class="OraInlineInfoText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -57,7 +57,7 @@
<span
class="OraInlineInfoText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -65,16 +65,24 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
title="shortDesc_val"
>
message detail
</span>
+<!--AttributeTest[styleClass,someStyle]-->
+
+ <span
+ class="someStyle OraInlineErrorText"
+ id="other::msg"
+ >
+ message detail
+ </span>
<!--AttributeTest[inlineStyle,background-color:red]-->
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
style="background-color:red"
>
message detail
@@ -83,7 +91,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onclick="test-onclick"
>
message detail
@@ -92,7 +100,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
ondblclick="test-ondblclick"
>
message detail
@@ -101,7 +109,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onkeydown="test-onkeydown"
>
message detail
@@ -110,7 +118,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onkeypress="test-onkeypress"
>
message detail
@@ -119,7 +127,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onkeyup="test-onkeyup"
>
message detail
@@ -128,7 +136,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmousedown="test-onmousedown"
>
message detail
@@ -137,7 +145,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmousemove="test-onmousemove"
>
message detail
@@ -146,7 +154,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmouseout="test-onmouseout"
>
message detail
@@ -155,7 +163,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmouseover="test-onmouseover"
>
message detail
@@ -164,7 +172,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmouseup="test-onmouseup"
>
message detail
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimalInacc-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimalInacc-golden.xml?rev=588656&r1=588655&r2=588656&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimalInacc-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimalInacc-golden.xml Fri Oct 26 07:17:07 2007
@@ -1,7 +1,7 @@
<results>
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -9,7 +9,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -17,7 +17,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
>
message_val
</span>
@@ -25,7 +25,7 @@
<span
class="OraInlineErrorText"
- id="id_val"
+ id="other::msg"
>
message detail
</span>
@@ -33,7 +33,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -41,7 +41,7 @@
<span
class="OraInlineInfoText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -49,7 +49,7 @@
<span
class="OraInlineInfoText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -57,7 +57,7 @@
<span
class="OraInlineInfoText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -65,16 +65,24 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
title="shortDesc_val"
>
message detail
</span>
+<!--AttributeTest[styleClass,someStyle]-->
+
+ <span
+ class="someStyle OraInlineErrorText"
+ id="other::msg"
+ >
+ message detail
+ </span>
<!--AttributeTest[inlineStyle,background-color:red]-->
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
style="background-color:red"
>
message detail
@@ -83,7 +91,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onclick="test-onclick"
>
message detail
@@ -92,7 +100,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
ondblclick="test-ondblclick"
>
message detail
@@ -101,7 +109,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onkeydown="test-onkeydown"
>
message detail
@@ -110,7 +118,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onkeypress="test-onkeypress"
>
message detail
@@ -119,7 +127,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onkeyup="test-onkeyup"
>
message detail
@@ -128,7 +136,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmousedown="test-onmousedown"
>
message detail
@@ -137,7 +145,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmousemove="test-onmousemove"
>
message detail
@@ -146,7 +154,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmouseout="test-onmouseout"
>
message detail
@@ -155,7 +163,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmouseover="test-onmouseover"
>
message detail
@@ -164,7 +172,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmouseup="test-onmouseup"
>
message detail
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimalPPC-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimalPPC-golden.xml?rev=588656&r1=588655&r2=588656&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimalPPC-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimalPPC-golden.xml Fri Oct 26 07:17:07 2007
@@ -1,7 +1,7 @@
<results>
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -9,7 +9,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -17,7 +17,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
>
message_val
</span>
@@ -25,7 +25,7 @@
<span
class="OraInlineErrorText"
- id="id_val"
+ id="other::msg"
>
message detail
</span>
@@ -33,7 +33,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -41,7 +41,7 @@
<span
class="OraInlineInfoText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -49,7 +49,7 @@
<span
class="OraInlineInfoText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -57,7 +57,7 @@
<span
class="OraInlineInfoText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -65,16 +65,24 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
title="shortDesc_val"
>
message detail
</span>
+<!--AttributeTest[styleClass,someStyle]-->
+
+ <span
+ class="someStyle OraInlineErrorText"
+ id="other::msg"
+ >
+ message detail
+ </span>
<!--AttributeTest[inlineStyle,background-color:red]-->
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
style="background-color:red"
>
message detail
@@ -83,7 +91,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onclick="test-onclick"
>
message detail
@@ -92,7 +100,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
ondblclick="test-ondblclick"
>
message detail
@@ -101,7 +109,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onkeydown="test-onkeydown"
>
message detail
@@ -110,7 +118,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onkeypress="test-onkeypress"
>
message detail
@@ -119,7 +127,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onkeyup="test-onkeyup"
>
message detail
@@ -128,7 +136,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmousedown="test-onmousedown"
>
message detail
@@ -137,7 +145,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmousemove="test-onmousemove"
>
message detail
@@ -146,7 +154,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmouseout="test-onmouseout"
>
message detail
@@ -155,7 +163,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmouseover="test-onmouseover"
>
message detail
@@ -164,7 +172,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmouseup="test-onmouseup"
>
message detail
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimalSaf-golden.xml?rev=588656&r1=588655&r2=588656&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimalSaf-golden.xml Fri Oct 26 07:17:07 2007
@@ -1,7 +1,7 @@
<results>
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -9,7 +9,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -17,7 +17,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
>
message_val
</span>
@@ -25,7 +25,7 @@
<span
class="OraInlineErrorText"
- id="id_val"
+ id="other::msg"
>
message detail
</span>
@@ -33,7 +33,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -41,7 +41,7 @@
<span
class="OraInlineInfoText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -49,7 +49,7 @@
<span
class="OraInlineInfoText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -57,7 +57,7 @@
<span
class="OraInlineInfoText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -65,16 +65,24 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
title="shortDesc_val"
>
message detail
</span>
+<!--AttributeTest[styleClass,someStyle]-->
+
+ <span
+ class="someStyle OraInlineErrorText"
+ id="other::msg"
+ >
+ message detail
+ </span>
<!--AttributeTest[inlineStyle,background-color:red]-->
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
style="background-color:red"
>
message detail
@@ -83,7 +91,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onclick="test-onclick"
>
message detail
@@ -92,7 +100,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
ondblclick="test-ondblclick"
>
message detail
@@ -101,7 +109,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onkeydown="test-onkeydown"
>
message detail
@@ -110,7 +118,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onkeypress="test-onkeypress"
>
message detail
@@ -119,7 +127,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onkeyup="test-onkeyup"
>
message detail
@@ -128,7 +136,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmousedown="test-onmousedown"
>
message detail
@@ -137,7 +145,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmousemove="test-onmousemove"
>
message detail
@@ -146,7 +154,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmouseout="test-onmouseout"
>
message detail
@@ -155,7 +163,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmouseover="test-onmouseover"
>
message detail
@@ -164,7 +172,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmouseup="test-onmouseup"
>
message detail
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimalScrRdr-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimalScrRdr-golden.xml?rev=588656&r1=588655&r2=588656&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimalScrRdr-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-minimalScrRdr-golden.xml Fri Oct 26 07:17:07 2007
@@ -1,7 +1,7 @@
<results>
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -9,7 +9,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -17,7 +17,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
>
message_val
</span>
@@ -25,7 +25,7 @@
<span
class="OraInlineErrorText"
- id="id_val"
+ id="other::msg"
>
message detail
</span>
@@ -33,7 +33,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -41,7 +41,7 @@
<span
class="OraInlineInfoText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -49,7 +49,7 @@
<span
class="OraInlineInfoText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -57,7 +57,7 @@
<span
class="OraInlineInfoText"
- id="mainId"
+ id="other::msg"
>
message detail
</span>
@@ -65,16 +65,24 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
title="shortDesc_val"
>
message detail
</span>
+<!--AttributeTest[styleClass,someStyle]-->
+
+ <span
+ class="someStyle OraInlineErrorText"
+ id="other::msg"
+ >
+ message detail
+ </span>
<!--AttributeTest[inlineStyle,background-color:red]-->
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
style="background-color:red"
>
message detail
@@ -83,7 +91,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onclick="test-onclick"
>
message detail
@@ -92,7 +100,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
ondblclick="test-ondblclick"
>
message detail
@@ -101,7 +109,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onkeydown="test-onkeydown"
>
message detail
@@ -110,7 +118,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onkeypress="test-onkeypress"
>
message detail
@@ -119,7 +127,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onkeyup="test-onkeyup"
>
message detail
@@ -128,7 +136,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmousedown="test-onmousedown"
>
message detail
@@ -137,7 +145,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmousemove="test-onmousemove"
>
message detail
@@ -146,7 +154,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmouseout="test-onmouseout"
>
message detail
@@ -155,7 +163,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmouseover="test-onmouseover"
>
message detail
@@ -164,7 +172,7 @@
<span
class="OraInlineErrorText"
- id="mainId"
+ id="other::msg"
onmouseup="test-onmouseup"
>
message detail
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/message.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/message.xml?rev=588656&r1=588655&r2=588656&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/message.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/message.xml Fri Oct 26 07:17:07 2007
@@ -12,9 +12,7 @@
<attribute-test name="messageType" value="info"/>
<attribute-test name="messageType" value="none"/>
<attribute-test name="shortDesc" value="shortDesc_val"/>
-<!-- Currently causes error - style written twice
- <attribute-test name="styleClass"/>
--->
+ <attribute-test name="styleClass" value="someStyle"/>
<attribute-test name="inlineStyle" value="background-color:red"/>
<js-test/>
</test>