changeset 1083:efa0fd389c78

merge
author Martin Sladecek <martin.sladecek@oracle.com>
date Thu, 17 May 2012 10:50:59 +0200
parents 2ab615afad9e 5399dddbbae1
children 4c06d4756277 766bed2fa229
files
diffstat 3 files changed, 12 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-ui-common/src/com/sun/javafx/css/StyleManager.java	Thu May 17 10:49:48 2012 +0200
+++ b/javafx-ui-common/src/com/sun/javafx/css/StyleManager.java	Thu May 17 10:50:59 2012 +0200
@@ -548,6 +548,16 @@
         if (defaultUserAgentStylesheet != null) {
             defaultUserAgentStylesheet.setOrigin(Stylesheet.Origin.USER_AGENT);
         }
+        if (defaultContainer != null) {
+            //
+            // RT-21563 if default ua stylesheet is set, then the default 
+            // container must be destroyed so it will be rebuilt. If this is 
+            // the first time the ua stylesheet is set, then the defaultContainer
+            // won't have any rules so it must be destroyed so it will be rebuilt. 
+            // 
+            defaultContainer.destroy();
+            defaultContainer = null;
+        }
         if (containerMap != null) {
             Iterator<StylesheetContainer> iter = containerMap.values().iterator();
             while(iter.hasNext()) {
--- a/javafx-ui-common/test/unit/javafx/scene/effect/ImageInputTest.java	Thu May 17 10:49:48 2012 +0200
+++ b/javafx-ui-common/test/unit/javafx/scene/effect/ImageInputTest.java	Thu May 17 10:50:59 2012 +0200
@@ -85,7 +85,7 @@
     @Test
     public void testSetSource() {
         // try setting non-existing image
-        Image i = new Image("test");
+        Image i = new Image("javafx/scene/image/test.png");
         effect.setSource(i);
         assertEquals(i, effect.getSource());
         pulse();
--- a/javafx-ui-common/test/unit/javafx/scene/image/ImageTest.java	Thu May 17 10:49:48 2012 +0200
+++ b/javafx-ui-common/test/unit/javafx/scene/image/ImageTest.java	Thu May 17 10:50:59 2012 +0200
@@ -51,6 +51,7 @@
 
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
+import org.junit.Ignore;
 
 public final class ImageTest {
     private final StubToolkit toolkit;