changeset 861:d354d2898b42

Automated merge with ssh://jfxsrc.us.oracle.com//javafx/2.2/scrum/controls/jfx/rt
author David Grieve<david.grieve@oracle.com>
date Mon, 23 Apr 2012 16:18:07 -0400
parents 21e07631c838 f0a95a6e3403
children e037c4143dea
files
diffstat 2 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-ui-common/test/unit/com/sun/javafx/css/Node_cssStyleMap_Test.java	Mon Apr 23 13:02:11 2012 -0700
+++ b/javafx-ui-common/test/unit/com/sun/javafx/css/Node_cssStyleMap_Test.java	Mon Apr 23 16:18:07 2012 -0400
@@ -110,10 +110,12 @@
                 // Otherwise, create a StyleHelper matching the "rect" style class.
                 if (this.getStyleClass().isEmpty()) {
                     shelper = StyleHelper.create(Collections.EMPTY_LIST, 0, 0);
-                    shelper.valueCache = new HashMap<Reference<StyleCacheKey>, List<StyleHelper.CacheEntry>>();
+                    shelper.valueCache = new HashMap<StyleHelper.StyleCacheKey, List<StyleHelper.CacheEntry>>();
+                    shelper.keysInUse = new HashMap<StyleHelper.StyleCacheKey, Reference<StyleHelper.StyleCacheKey>>();
                 } else  {
                     shelper = StyleHelper.create(styles, 0, 0);
-                    shelper.valueCache = new HashMap<Reference<StyleCacheKey>, List<StyleHelper.CacheEntry>>();                    
+                    shelper.valueCache = new HashMap<StyleHelper.StyleCacheKey, List<StyleHelper.CacheEntry>>();
+                    shelper.keysInUse = new HashMap<StyleHelper.StyleCacheKey, Reference<StyleHelper.StyleCacheKey>>();
                 }
                 return shelper;
             }
--- a/javafx-ui-common/test/unit/com/sun/javafx/css/StyleablePropertyTest.java	Mon Apr 23 13:02:11 2012 -0700
+++ b/javafx-ui-common/test/unit/com/sun/javafx/css/StyleablePropertyTest.java	Mon Apr 23 16:18:07 2012 -0400
@@ -295,7 +295,8 @@
             @Override
             public StyleHelper impl_createStyleHelper() {
                 shelper = StyleHelper.create(cascadingStyles, 0, 0);
-                shelper.valueCache = new HashMap<Reference<StyleHelper.StyleCacheKey>, List<StyleHelper.CacheEntry>>();
+                shelper.valueCache = new HashMap<StyleHelper.StyleCacheKey, List<StyleHelper.CacheEntry>>();
+                shelper.keysInUse = new HashMap<StyleHelper.StyleCacheKey, Reference<StyleHelper.StyleCacheKey>>();
                 return shelper;
             }
             
@@ -327,7 +328,8 @@
             @Override
             public StyleHelper impl_createStyleHelper() {
                 shelper = StyleHelper.create(cascadingStyles, 0, 1);
-                shelper.valueCache = new HashMap<Reference<StyleHelper.StyleCacheKey>, List<StyleHelper.CacheEntry>>();
+                shelper.valueCache = new HashMap<StyleHelper.StyleCacheKey, List<StyleHelper.CacheEntry>>();
+                shelper.keysInUse = new HashMap<StyleHelper.StyleCacheKey, Reference<StyleHelper.StyleCacheKey>>();
                 return shelper;
             }
             
@@ -363,7 +365,8 @@
         @Override
         public StyleHelper impl_createStyleHelper() {
             shelper = StyleHelper.create(cascadingStyles, 0, 1);
-            shelper.valueCache = new HashMap<Reference<StyleHelper.StyleCacheKey>, List<StyleHelper.CacheEntry>>();
+            shelper.valueCache = new HashMap<StyleHelper.StyleCacheKey, List<StyleHelper.CacheEntry>>();
+            shelper.keysInUse = new HashMap<StyleHelper.StyleCacheKey, Reference<StyleHelper.StyleCacheKey>>();
             return shelper;
         }