Author: awiner
Date: Tue Aug 1 15:19:20 2006
New Revision: 427772
URL: http://svn.apache.org/viewvc?rev=427772&view=rev
Log:
Apply patch for ADFFACES-93: TextIcon ignores styleClass and inlineStyle if set in attrs arg to renderIcon
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/Icon.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/TextIcon.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimal-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalIE-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalIERtl-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalInacc-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalSaf-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalScrRdr-golden.xml
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/Icon.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/Icon.java?rev=427772&r1=427771&r2=427772&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/Icon.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/Icon.java Tue Aug 1 15:19:20 2006
@@ -51,6 +51,7 @@
public static final String EMBEDDED_KEY = "embedded";
public static final String ID_KEY = "id";
public static final String STYLE_CLASS_KEY = "styleClass";
+ public static final String INLINE_STYLE_KEY = "inlineStyle";
/**
* Renders the Icon.
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/TextIcon.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/TextIcon.java?rev=427772&r1=427771&r2=427772&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/TextIcon.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/TextIcon.java Tue Aug 1 15:19:20 2006
@@ -92,12 +92,15 @@
Object id = null;
Object styleClass = _styleClass;
Object title = null;
+ Object attrInlineStyle = null;
+ Object attrStyles = null;
boolean embedded = false;
if (attrs != null)
{
+ attrInlineStyle = _getInlineStyle(attrs);
+ attrStyles = _getStyles(attrs);
id = attrs.get(Icon.ID_KEY);
-
title = _getTitle(attrs);
embedded = _isEmbedded(attrs);
}
@@ -116,7 +119,7 @@
writer.writeAttribute("id", id, null);
// If we have a title that isn't "", render it on the span
- if ((title != null) && (title != ""))
+ if ((title != null) && !"".equals(title))
writer.writeAttribute("title", title, null);
// Handle style attributes (or elements)
@@ -126,22 +129,43 @@
// 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)
{
String convertedStyleClass =
StyleUtils.convertToValidSelector(arc.getStyleClass(_styleClass));
- writer.writeAttribute("class", convertedStyleClass, null);
+ styleClasses.append(convertedStyleClass);
+ }
+
+ if (attrStyles != null)
+ {
+ if (styleClasses.length() > 0)
+ styleClasses.append(" ");
+
+ styleClasses.append(attrStyles.toString());
}
+
+ if (styleClasses.length() > 0)
+ writer.writeAttribute("class", styleClasses.toString(), null);
+ StringBuilder inline = new StringBuilder(100);
if (_inlineStyle != null)
- writer.writeAttribute("style", _inlineStyle.toInlineString(), null);
+ {
+ inline.append(_inlineStyle.toInlineString());
+ }
-
+ if ((attrInlineStyle != null) && !"".equals(attrInlineStyle))
+ {
+ inline.append(attrInlineStyle.toString());
+ }
+
+ if (inline.length() > 0)
+ writer.writeAttribute("style", inline.toString(), null);
String text = getText(arc);
- // don't know how to map this back to the source, so using null...
+ // don't know how to map this back to the source, so using null...
writer.writeText(text, null);
@@ -151,6 +175,30 @@
}
/**
+ * Returns the inlineStyle to render.
+ */
+ protected Style getInlineStyle()
+ {
+ return _inlineStyle;
+ }
+
+ /**
+ * Returns the text to render when in RTL mode.
+ */
+ protected String getRtlText()
+ {
+ return _rtlText;
+ }
+
+ /**
+ * Returns the styleClass to render.
+ */
+ protected String getStyleClass()
+ {
+ return _styleClass;
+ }
+
+ /**
* Returns the text to render.
*/
protected String getText(RenderingContext arc)
@@ -161,6 +209,60 @@
return _text;
}
+ /**
+ * Sets the inlineStyle of the icon
+ */
+ public void setInlineStyle(Style inlineStyle)
+ {
+ _inlineStyle = inlineStyle;
+ }
+
+ /**
+ * Sets the text to render if in RTL mode
+ */
+ public void setRtlText(String rtlText)
+ {
+ _rtlText = rtlText;
+ }
+
+ /**
+ * Sets the styleClass of the icon
+ */
+ public void setStyleClass(String styleClass)
+ {
+ _styleClass = styleClass;
+ }
+
+
+ /**
+ * Sets the text to render.
+ */
+ public void setText(String text)
+ {
+ _text = text;
+ }
+
+
+ // Returns the inlineStyle for the icon
+ private Object _getInlineStyle(
+ Map attrs
+ )
+ {
+ assert (attrs != null);
+
+ return attrs.get(Icon.INLINE_STYLE_KEY);
+ }
+
+ // Returns the styleClasses for the icon
+ private Object _getStyles(
+ Map attrs
+ )
+ {
+ assert (attrs != null);
+
+ return attrs.get(Icon.STYLE_CLASS_KEY);
+ }
+
// Returns the title text for the icon
private Object _getTitle(
Map attrs
@@ -191,7 +293,7 @@
{
return (!embedded &&
((styleClass != null) ||
- (title != null && title != "") ||
+ (title != null && !"".equals(title)) ||
(inlineStyle != null) ||
(title != null)));
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimal-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimal-golden.xml?rev=427772&r1=427771&r2=427772&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimal-golden.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimal-golden.xml Tue Aug 1 15:19:20 2006
@@ -357,6 +357,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -380,6 +381,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -403,6 +405,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -426,6 +429,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -869,6 +873,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -892,6 +897,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -915,6 +921,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -938,6 +945,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -1372,6 +1380,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -1394,6 +1403,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -1416,6 +1426,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -1438,6 +1449,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -1881,6 +1893,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -1904,6 +1917,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -1927,6 +1941,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -1950,6 +1965,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -2471,6 +2487,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -2494,6 +2511,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -2517,6 +2535,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -2540,6 +2559,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -3042,6 +3062,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -3065,6 +3086,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -3088,6 +3110,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -3111,6 +3134,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -3554,6 +3578,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -3577,6 +3602,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -3600,6 +3626,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -3623,6 +3650,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -4057,6 +4085,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -4079,6 +4108,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -4101,6 +4131,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -4123,6 +4154,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -4566,6 +4598,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -4589,6 +4622,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -4612,6 +4646,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -4635,6 +4670,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -5092,6 +5128,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -5115,6 +5152,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -5138,6 +5176,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -5161,6 +5200,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -5604,6 +5644,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -5627,6 +5668,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -5650,6 +5692,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -5673,6 +5716,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -6116,6 +6160,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -6139,6 +6184,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -6162,6 +6208,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -6185,6 +6232,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -6680,6 +6728,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -6703,6 +6752,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -6726,6 +6776,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -6749,6 +6800,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -7277,6 +7329,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -7300,6 +7353,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -7323,6 +7377,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -7346,6 +7401,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -7789,6 +7845,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -7812,6 +7869,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -7835,6 +7893,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -7858,6 +7917,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -8302,6 +8362,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -8325,6 +8386,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -8348,6 +8410,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -8371,6 +8434,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalIE-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalIE-golden.xml?rev=427772&r1=427771&r2=427772&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalIE-golden.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalIE-golden.xml Tue Aug 1 15:19:20 2006
@@ -341,6 +341,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -360,6 +361,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -379,6 +381,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -398,6 +401,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -817,6 +821,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -836,6 +841,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -855,6 +861,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -874,6 +881,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -1284,6 +1292,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -1302,6 +1311,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -1320,6 +1330,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -1338,6 +1349,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -1757,6 +1769,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -1776,6 +1789,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -1795,6 +1809,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -1814,6 +1829,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -2303,6 +2319,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -2322,6 +2339,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -2341,6 +2359,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -2360,6 +2379,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -2830,6 +2850,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -2849,6 +2870,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -2868,6 +2890,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -2887,6 +2910,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -3306,6 +3330,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -3325,6 +3350,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -3344,6 +3370,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -3363,6 +3390,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -3773,6 +3801,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -3791,6 +3820,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -3809,6 +3839,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -3827,6 +3858,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -4246,6 +4278,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -4265,6 +4298,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -4284,6 +4318,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -4303,6 +4338,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -4732,6 +4768,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -4751,6 +4788,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -4770,6 +4808,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -4789,6 +4828,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -5208,6 +5248,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -5227,6 +5268,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -5246,6 +5288,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -5265,6 +5308,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -5684,6 +5728,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -5703,6 +5748,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -5722,6 +5768,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -5741,6 +5788,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -6204,6 +6252,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -6223,6 +6272,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -6242,6 +6292,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -6261,6 +6312,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -6757,6 +6809,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -6776,6 +6829,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -6795,6 +6849,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -6814,6 +6869,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -7233,6 +7289,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -7252,6 +7309,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -7271,6 +7329,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -7290,6 +7349,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -7710,6 +7770,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -7729,6 +7790,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -7748,6 +7810,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -7767,6 +7830,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalIERtl-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalIERtl-golden.xml?rev=427772&r1=427771&r2=427772&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalIERtl-golden.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalIERtl-golden.xml Tue Aug 1 15:19:20 2006
@@ -341,6 +341,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -360,6 +361,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -379,6 +381,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -398,6 +401,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -817,6 +821,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -836,6 +841,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -855,6 +861,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -874,6 +881,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -1284,6 +1292,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -1302,6 +1311,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -1320,6 +1330,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -1338,6 +1349,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -1757,6 +1769,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -1776,6 +1789,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -1795,6 +1809,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -1814,6 +1829,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -2303,6 +2319,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -2322,6 +2339,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -2341,6 +2359,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -2360,6 +2379,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -2830,6 +2850,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -2849,6 +2870,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -2868,6 +2890,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -2887,6 +2910,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -3306,6 +3330,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -3325,6 +3350,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -3344,6 +3370,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -3363,6 +3390,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -3773,6 +3801,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -3791,6 +3820,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -3809,6 +3839,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -3827,6 +3858,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -4246,6 +4278,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -4265,6 +4298,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -4284,6 +4318,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -4303,6 +4338,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -4732,6 +4768,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -4751,6 +4788,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -4770,6 +4808,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -4789,6 +4828,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -5208,6 +5248,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -5227,6 +5268,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -5246,6 +5288,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -5265,6 +5308,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -5684,6 +5728,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -5703,6 +5748,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -5722,6 +5768,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -5741,6 +5788,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -6204,6 +6252,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -6223,6 +6272,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -6242,6 +6292,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -6261,6 +6312,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -6757,6 +6809,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -6776,6 +6829,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -6795,6 +6849,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -6814,6 +6869,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -7233,6 +7289,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -7252,6 +7309,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -7271,6 +7329,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -7290,6 +7349,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom
@@ -7710,6 +7770,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to top of list"
>
Top
@@ -7729,6 +7790,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items up one in list"
>
Up
@@ -7748,6 +7810,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items down one in list"
>
Down
@@ -7767,6 +7830,7 @@
>
<span
+ class="p_OraDisplayBlock"
title="Move selected items to bottom of list"
>
Bottom