changeset 6217:beba988d1c25

RT-35014: move two lines of code and reference the parent node's CssStyleHelper
author David Grieve<david.grieve@oracle.com>
date Thu, 30 Jan 2014 16:31:01 -0500
parents 49e49cfa4ae5
children 16dde7ae7840
files modules/graphics/src/main/java/javafx/scene/CssStyleHelper.java
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/modules/graphics/src/main/java/javafx/scene/CssStyleHelper.java	Thu Jan 30 12:58:43 2014 -0800
+++ b/modules/graphics/src/main/java/javafx/scene/CssStyleHelper.java	Thu Jan 30 16:31:01 2014 -0500
@@ -2053,15 +2053,15 @@
                 Styleable parent = node;
                 do {
 
-                    StyleMap styleMap = getStyleMap(parent);
-                    if (styleMap == null || styleMap.isEmpty()) continue;
-
                     final Node _parent = parent instanceof Node ? (Node)parent : null;
                     final CssStyleHelper helper = _parent != null
                             ? _parent.styleHelper
                             : null;
                     if (helper != null) {
 
+                        StyleMap styleMap = helper.getStyleMap(parent);
+                        if (styleMap == null || styleMap.isEmpty()) continue;
+
                         final int start = styleList.size();
 
                         if (matchState) {