You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by jw...@apache.org on 2009/04/30 22:07:30 UTC
svn commit: r770427 [1/4] - in
/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src:
main/java/org/apache/myfaces/trinidadinternal/style/
test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/
Author: jwaldman
Date: Thu Apr 30 20:07:29 2009
New Revision: 770427
URL: http://svn.apache.org/viewvc?rev=770427&view=rev
Log:
change BaseStyle's implementation to use ConcurrentHashMap instead of ArrayMap.
Performance tests show ConcurrentHashMap is faster but uses more memory (3.3M for 2600 selectors) than ArrayMap.
It's easier to implement than a thread-safe ArrayMap, so the pros outweigh the con.
Modified:
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/BaseStyle.java
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimal-golden.xml
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimalIE-golden.xml
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimalIERtl-golden.xml
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimalInacc-golden.xml
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimalPPC-golden.xml
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimalSaf-golden.xml
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimalScrRdr-golden.xml
Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/BaseStyle.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/BaseStyle.java?rev=770427&r1=770426&r2=770427&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/BaseStyle.java (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/BaseStyle.java Thu Apr 30 20:07:29 2009
@@ -23,7 +23,7 @@
import java.util.Collections;
import java.util.Map;
-import org.apache.myfaces.trinidad.util.ArrayMap;
+import java.util.concurrent.ConcurrentHashMap;
/**
* Base class for Style implementations
@@ -53,9 +53,9 @@
{
if ((propertiesMap != null) && (!propertiesMap.isEmpty()))
{
- // Initialize the propertiesMap with an ArrayMap implementation.
- // ArrayMap is fast reads.
- _propertiesMap = new ArrayMap<String, String>(propertiesMap.size());
+ // Initialize the propertiesMap with a ConcurrentHashMap.
+ // This uses more memory than ArrayMap, but is faster and safer.
+ _propertiesMap = new ConcurrentHashMap<String, String>(propertiesMap.size());
_propertiesMap.putAll(propertiesMap);
}
@@ -137,7 +137,7 @@
synchronized (this)
{
if (_propertiesMap.isEmpty())
- _propertiesMap = new ArrayMap<String, String>();
+ _propertiesMap = new ConcurrentHashMap<String, String>();
_propertiesMap.put(name, value);
// We need to reset to parsed properties if our properties change
@@ -161,7 +161,7 @@
abstract protected Object parseProperty(Object key)
throws PropertyParseException;
- private Map<String, String> _propertiesMap;
+ volatile private Map<String, String> _propertiesMap;
transient private Object[] _parsedProperties;
// Count of parsed properties defined by Style
Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimal-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimal-golden.xml?rev=770427&r1=770426&r2=770427&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimal-golden.xml (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimal-golden.xml Thu Apr 30 20:07:29 2009
@@ -94,7 +94,7 @@
alt="decrement"
border="0"
height="5"
- style="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
title="decrement"
width="5"
src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimalIE-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimalIE-golden.xml?rev=770427&r1=770426&r2=770427&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimalIE-golden.xml (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputNumberSpinbox-minimalIE-golden.xml Thu Apr 30 20:07:29 2009
@@ -93,7 +93,7 @@
alt="decrement"
border="0"
height="5"
- style="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
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="padding-top:2px;display:block"
+ style="display:block;padding-top:2px"
width="5"
src="uri-attr:encoded-resource-url:/test-context-path/adf/images/spbxdn.png"
>