diff --git a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/css/CssUtils.java b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/css/CssUtils.java --- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/css/CssUtils.java +++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/css/CssUtils.java @@ -753,14 +753,14 @@ Styleable styleable = (target instanceof Styleable) ? (Styleable) target : null; Node node = null; if (styleable != null) { - node = Deprecation.getNode(styleable); + node = styleable.getStyleableNode(); if (node == null) { if (target instanceof MenuItem) { final MenuItem mi = (MenuItem) target; PopupControl pc = mi.getParentPopup(); if (pc != null) { // can be null for Menu. - node = Deprecation.getNode(pc); + node = pc.getStyleableNode(); } } else { if (target instanceof Tab) { diff --git a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/util/CssInternal.java b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/util/CssInternal.java --- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/util/CssInternal.java +++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/util/CssInternal.java @@ -301,7 +301,7 @@ } else { Styleable styleable = fxObject instanceof Styleable ? (Styleable) fxObject : null; if (styleable != null) { - node = Deprecation.getNode(styleable); + node = styleable.getStyleableNode(); } } if (node != null) { diff --git a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/util/Deprecation.java b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/util/Deprecation.java --- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/util/Deprecation.java +++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/util/Deprecation.java @@ -129,26 +129,6 @@ } } - // Retrieve the node of the Styleable. - public static Node getNode(Styleable styleable) { - // Nodes are styleable treated differently. - try { - if (styleable instanceof MenuItem) { - return ((MenuItem) styleable).impl_styleableGetNode(); - } else if (styleable instanceof PopupControl) { - return ((PopupControl) styleable).impl_styleableGetNode(); - } else if (styleable instanceof TableColumn) { - return ((TableColumn) styleable).impl_styleableGetNode(); - } else if (styleable instanceof TreeTableColumn) { - return ((TreeTableColumn) styleable).impl_styleableGetNode(); - } - } catch (Exception ex) { - // May happen, e.g if TableColumn as root - return null; - } - return null; - } - @SuppressWarnings("rawtypes") public static List