You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by so...@apache.org on 2012/09/12 18:15:18 UTC

svn commit: r1384015 [1/4] - in /myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src: main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/ main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/ main/javascript/META-INF/adf/...

Author: sobryan
Date: Wed Sep 12 16:15:17 2012
New Revision: 1384015

URL: http://svn.apache.org/viewvc?rev=1384015&view=rev
Log:
TRINIDAD-2309 - perf: change the concurrenthashmap to arraymap and fix the golden files
TRINIDAD-2299 - f:convertnumber throws error when the number input by user has leading or trailing grouping separator char

* thanks Anand and Paresh

Modified:
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/XhtmlSkin.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberConverter.js
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimal-golden.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimalIE-golden.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimalIERtl-golden.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimalInacc-golden.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimalPPC-golden.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimalSaf-golden.xml
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimalScrRdr-golden.xml

Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/XhtmlSkin.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/XhtmlSkin.java?rev=1384015&r1=1384014&r2=1384015&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/XhtmlSkin.java (original)
+++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/XhtmlSkin.java Wed Sep 12 16:15:17 2012
@@ -20,9 +20,8 @@ package org.apache.myfaces.trinidadinter
 
 import java.util.Map;
 
-import java.util.concurrent.ConcurrentHashMap;
-
 import org.apache.myfaces.trinidad.style.Style;
+import org.apache.myfaces.trinidad.util.ArrayMap;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.SkinProperties;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.SkinSelectors;
 import org.apache.myfaces.trinidadinternal.skin.icon.ContextImageIcon;
@@ -112,13 +111,10 @@ public class XhtmlSkin extends BaseSkin
   
   static
   {
-    // todo Use ArrayMap instead of ConcurrentHashMap
-    // We were using CSSStyle instead of UnmodifiableStyle and that class copied the properties 
-    // into a ConcurrentHashMap. Changing this to another map will change the spinbox golden files.
-    _spinboxTopStyleMap = new ConcurrentHashMap<String, String>();
+    _spinboxTopStyleMap = new ArrayMap<String, String>();
     _spinboxTopStyleMap.put("display", "block");
     // this is needed for the image
-    _spinboxBottomStyleMap = new ConcurrentHashMap<String, String>();
+    _spinboxBottomStyleMap = new ArrayMap<String, String>();
     _spinboxBottomStyleMap.put("display", "block");
     _spinboxBottomStyleMap.put("padding-top", "2px");
 

Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java?rev=1384015&r1=1384014&r2=1384015&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java (original)
+++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java Wed Sep 12 16:15:17 2012
@@ -34,7 +34,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.Stack;
 
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Pattern;
 
 import org.apache.myfaces.trinidad.context.AccessibilityProfile;
@@ -42,6 +41,7 @@ import org.apache.myfaces.trinidad.conte
 import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 import org.apache.myfaces.trinidad.skin.Icon;
 import org.apache.myfaces.trinidad.style.Style;
+import org.apache.myfaces.trinidad.util.ArrayMap;
 import org.apache.myfaces.trinidad.util.IntegerUtils;
 
 import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
@@ -307,10 +307,7 @@ public class StyleSheetDocument
     String  text = null;
     boolean isNullIcon = false;
     
-    // TODO Use an ArrayMap to use less memory, and we do not need concurrency since we will never modify this map.
-    // switching from ConcurrentHashMap to ArrayMap may break golden files, so be sure to check those
-    // if you switch.
-    Map<String, String> propertyMap = new ConcurrentHashMap<String, String>();
+    Map<String, String> propertyMap = new ArrayMap<String, String>();
     
     // loop through each property in the StyleNode.
     // If 'content', then get the url and the type of icon: 

Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberConverter.js
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberConverter.js?rev=1384015&r1=1384014&r2=1384015&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberConverter.js (original)
+++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberConverter.js Wed Sep 12 16:15:17 2012
@@ -232,67 +232,66 @@ TrNumberConverter.prototype.getAsObject 
     if (numberString.length == 0)
       return null
 
+    // TRINIDAD-2299 - The leading and trailing grouping separator characters
+    // are removed from the user input number string for all types number, currency and percent.    
     var parsedValue;
-    if(this._type=="percent" || this._type=="currency")
-    {
-      var localeSymbols = getLocaleSymbols(this._locale);
+    var localeSymbols = getLocaleSymbols(this._locale);
       
-      // TODO matzew - see TRINIDAD-682
-      // Remove the thousands separator - which Javascript doesn't want to see
-      var groupingSeparator = localeSymbols.getGroupingSeparator();
+    // TODO matzew - see TRINIDAD-682
+    // Remove the thousands separator - which Javascript doesn't want to see
+    var groupingSeparator = localeSymbols.getGroupingSeparator();
       
-      if (groupingSeparator == "\xa0")
-      {
-        var normalSpace = new RegExp("\\ " , "g");
-        numberString = numberString.replace(normalSpace, "\xa0");
-      }
+    if (groupingSeparator == "\xa0")
+    {
+      var normalSpace = new RegExp("\\ " , "g");
+      numberString = numberString.replace(normalSpace, "\xa0");
+    }
       
-      var grouping = new RegExp("\\" + groupingSeparator, "g");
-      numberString = numberString.replace(grouping, "");
+    var grouping = new RegExp("\\" + groupingSeparator, "g");
+    numberString = numberString.replace(grouping, "");
 
-      // Then change the decimal separator into a period, the only
-      // decimal separator allowed by JS
-      var decimalSeparator = localeSymbols.getDecimalSeparator();
-      var decimal = new RegExp("\\" + decimalSeparator, "g");
-      numberString = numberString.replace(decimal, ".");
+    // Then change the decimal separator into a period, the only
+    // decimal separator allowed by JS
+    var decimalSeparator = localeSymbols.getDecimalSeparator();
+    var decimal = new RegExp("\\" + decimalSeparator, "g");
+    numberString = numberString.replace(decimal, ".");
       
+    try
+    {
+      // parse the numberString
+      numberString = this._numberFormat.parse(numberString)+"";     
+    }
+    catch(e)
+    {
+      // The user could have just left off the percent/currency symbol, so try 
+      // parsing 'numberString' as a Number instead; if it still fails, then 
+      // throw a converter exception.
       try
       {
-        // parse the numberString
-        numberString = this._numberFormat.parse(numberString)+"";     
+        numberString = TrNumberFormat.getNumberInstance().parse(numberString)+"";
       }
-      catch(e)
+      catch (e)
       {
-        // The user could have just left off the percent/currency symbol, so try 
-        // parsing 'numberString' as a Number instead; if it still fails, then 
-        // throw a converter exception.
-        try
+        var facesMessage;
+        var example = this._numberFormat.format(this._example);
+        var key = "org.apache.myfaces.trinidad.convert.NumberConverter.CONVERT_" + this._type.toUpperCase();
+        if (this._messages && this._messages[this._type])
         {
-          numberString = TrNumberFormat.getNumberInstance().parse(numberString)+"";
+          facesMessage = _createCustomFacesMessage(TrMessageFactory.getSummaryString(key), this._messages  [this._type], label, numberString, example);
         }
-        catch (e)
+        else 
         {
-          var facesMessage;
-          var example = this._numberFormat.format(this._example);
-          var key = "org.apache.myfaces.trinidad.convert.NumberConverter.CONVERT_" + this._type.toUpperCase();
-          if (this._messages && this._messages[this._type])
-          {
-            facesMessage = _createCustomFacesMessage(TrMessageFactory.getSummaryString(key), this._messages[this._type], label, numberString, example);
-          }
-          else 
-          {
-            facesMessage = _createFacesMessage(key, label, numberString, example);
-          }
-
-          throw new TrConverterException(facesMessage);
+          facesMessage = _createFacesMessage(key, label, numberString, example);
         }
+
+        throw new TrConverterException(facesMessage);
       }
-      
-      // to be able to pass the _decimalParse, we replace the decimal separator...
-      // Note that _decimalParse uses the page locale.
-      var jsSeparator = new RegExp("\\" + ".",  "g");
-      numberString = numberString.replace(jsSeparator, getLocaleSymbols().getDecimalSeparator());
     }
+      
+    // to be able to pass the _decimalParse, we replace the decimal separator...
+    // Note that _decimalParse uses the page locale.
+    var jsSeparator = new RegExp("\\" + ".",  "g");
+    numberString = numberString.replace(jsSeparator, getLocaleSymbols().getDecimalSeparator());    
     
     parsedValue = _decimalParse(numberString, 
                          this._messages,

Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimal-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimal-golden.xml?rev=1384015&r1=1384014&r2=1384015&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimal-golden.xml (original)
+++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimal-golden.xml Wed Sep 12 16:15:17 2012
@@ -94,7 +94,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -207,7 +207,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -320,7 +320,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -433,7 +433,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -546,7 +546,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -659,7 +659,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -772,7 +772,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -885,7 +885,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -998,7 +998,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -1111,7 +1111,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -1224,7 +1224,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -1337,7 +1337,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -1450,7 +1450,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -1563,7 +1563,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -1676,7 +1676,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -1788,7 +1788,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -1911,7 +1911,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -2023,7 +2023,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -2135,7 +2135,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -2248,7 +2248,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -2365,7 +2365,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -2485,7 +2485,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -2597,7 +2597,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -2710,7 +2710,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -2822,7 +2822,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -2940,7 +2940,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -3052,7 +3052,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -3170,7 +3170,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -3282,7 +3282,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -3400,7 +3400,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -3512,7 +3512,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -3625,7 +3625,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -3738,7 +3738,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -3851,7 +3851,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -3964,7 +3964,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -4077,7 +4077,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -4190,7 +4190,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -4303,7 +4303,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -4416,7 +4416,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -4529,7 +4529,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -4642,7 +4642,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -4755,7 +4755,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -4868,7 +4868,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -4981,7 +4981,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -5094,7 +5094,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -5206,7 +5206,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -5318,7 +5318,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -5430,7 +5430,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -5526,7 +5526,7 @@
                          alt="decrement disabled"
                          border="0"
                          height="5"
-                         style="display:block;padding-top:2px"
+                         style="padding-top:2px;display:block"
                          title="decrement disabled"
                          width="5"
                          src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdnd.png"
@@ -5637,7 +5637,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            title="decrement"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -5764,7 +5764,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        title="decrement"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -5855,7 +5855,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        title="decrement"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -5946,7 +5946,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        title="decrement"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -6037,7 +6037,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        title="decrement"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -6128,7 +6128,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        title="decrement"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -6219,7 +6219,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        title="decrement"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -6310,7 +6310,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        title="decrement"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -6401,7 +6401,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        title="decrement"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -6492,7 +6492,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        title="decrement"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -6583,7 +6583,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        title="decrement"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -6674,7 +6674,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        title="decrement"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -6765,7 +6765,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        title="decrement"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -6856,7 +6856,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        title="decrement"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -6947,7 +6947,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        title="decrement"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -7038,7 +7038,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        title="decrement"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -7128,7 +7128,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        title="decrement"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -7218,7 +7218,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        title="decrement"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -7308,7 +7308,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        title="decrement"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
@@ -7382,7 +7382,7 @@
                      alt="decrement disabled"
                      border="0"
                      height="5"
-                     style="display:block;padding-top:2px"
+                     style="padding-top:2px;display:block"
                      title="decrement disabled"
                      width="5"
                      src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdnd.png"
@@ -7471,7 +7471,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        title="decrement"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"

Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimalIE-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimalIE-golden.xml?rev=1384015&r1=1384014&r2=1384015&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimalIE-golden.xml (original)
+++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimalIE-golden.xml Wed Sep 12 16:15:17 2012
@@ -93,7 +93,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -204,7 +204,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -315,7 +315,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -426,7 +426,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -537,7 +537,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -648,7 +648,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -759,7 +759,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -870,7 +870,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -981,7 +981,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -1092,7 +1092,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -1203,7 +1203,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -1314,7 +1314,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -1425,7 +1425,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -1536,7 +1536,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -1647,7 +1647,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -1757,7 +1757,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -1878,7 +1878,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -1988,7 +1988,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -2098,7 +2098,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -2209,7 +2209,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -2324,7 +2324,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -2442,7 +2442,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -2552,7 +2552,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -2663,7 +2663,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -2773,7 +2773,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -2889,7 +2889,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -2999,7 +2999,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -3115,7 +3115,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -3225,7 +3225,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -3341,7 +3341,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -3451,7 +3451,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -3562,7 +3562,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -3673,7 +3673,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -3784,7 +3784,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -3895,7 +3895,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -4006,7 +4006,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -4117,7 +4117,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -4228,7 +4228,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -4339,7 +4339,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -4450,7 +4450,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -4561,7 +4561,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -4672,7 +4672,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -4783,7 +4783,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -4894,7 +4894,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -5005,7 +5005,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -5115,7 +5115,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -5225,7 +5225,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -5335,7 +5335,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -5429,7 +5429,7 @@
                          alt="decrement disabled"
                          border="0"
                          height="5"
-                         style="display:block;padding-top:2px"
+                         style="padding-top:2px;display:block"
                          width="5"
                          src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdnd.png"
                         >
@@ -5538,7 +5538,7 @@
                            alt="decrement"
                            border="0"
                            height="5"
-                           style="display:block;padding-top:2px"
+                           style="padding-top:2px;display:block"
                            width="5"
                            src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                           >
@@ -5663,7 +5663,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                       >
@@ -5752,7 +5752,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                       >
@@ -5841,7 +5841,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                       >
@@ -5930,7 +5930,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                       >
@@ -6019,7 +6019,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                       >
@@ -6108,7 +6108,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                       >
@@ -6197,7 +6197,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                       >
@@ -6286,7 +6286,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                       >
@@ -6375,7 +6375,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                       >
@@ -6464,7 +6464,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                       >
@@ -6553,7 +6553,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                       >
@@ -6642,7 +6642,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                       >
@@ -6731,7 +6731,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                       >
@@ -6820,7 +6820,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                       >
@@ -6909,7 +6909,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                       >
@@ -6997,7 +6997,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                       >
@@ -7085,7 +7085,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                       >
@@ -7173,7 +7173,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                       >
@@ -7245,7 +7245,7 @@
                      alt="decrement disabled"
                      border="0"
                      height="5"
-                     style="display:block;padding-top:2px"
+                     style="padding-top:2px;display:block"
                      width="5"
                      src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdnd.png"
                     >
@@ -7332,7 +7332,7 @@
                        alt="decrement"
                        border="0"
                        height="5"
-                       style="display:block;padding-top:2px"
+                       style="padding-top:2px;display:block"
                        width="5"
                        src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
                       >