From ce14d799b69b44e600ddf87213a58ac68de586e4 Mon Sep 17 00:00:00 2001 From: "jose.pereda" <jose.pereda@gluonhq.com> Date: Fri, 27 Sep 2024 23:52:23 +0200 Subject: [PATCH] Remove deprecated API from JavaFX 23 --- .../scenebuilder/kit/util/CssInternal.java | 23 ++++--------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/util/CssInternal.java b/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/util/CssInternal.java index 07ea4eea7..a00b0361c 100644 --- a/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/util/CssInternal.java +++ b/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/util/CssInternal.java @@ -59,18 +59,16 @@ import com.oracle.javafx.scenebuilder.kit.editor.EditorPlatform.Theme; import com.oracle.javafx.scenebuilder.kit.fxom.FXOMInstance; import com.oracle.javafx.scenebuilder.kit.metadata.property.ValuePropertyMetadata; -import javafx.css.CompoundSelector; import javafx.css.Rule; import javafx.css.Selector; -import javafx.css.SimpleSelector; import javafx.css.Style; import javafx.css.Stylesheet; import javafx.css.CssParser; /** * - * Utility classes using css internal classes (from com.sun package). Note that - * the CSS Analyzer is also using extensively com.sun classes. + * Utility classes to extract CSS information. + * Note: Requires JavaFX 23+ * */ public class CssInternal { @@ -247,25 +245,12 @@ private static Set<String> getStyleClasses(final URL url) { return styleClasses; } if (s == null) { - // The parsed CSS file was empty. No parsing occured. + // The parsed CSS file was empty. No parsing occurred. return styleClasses; } for (Rule r : s.getRules()) { for (Selector ss : r.getSelectors()) { - if (ss instanceof SimpleSelector) { - SimpleSelector simple = (SimpleSelector) ss; - styleClasses.addAll(simple.getStyleClasses()); - } else { - if (ss instanceof CompoundSelector) { - CompoundSelector cs = (CompoundSelector) ss; - for (Selector selector : cs.getSelectors()) { - if (selector instanceof SimpleSelector) { - SimpleSelector simple = (SimpleSelector) selector; - styleClasses.addAll(simple.getStyleClasses()); - } - } - } - } + styleClasses.addAll(ss.getStyleClassNames()); } } return styleClasses;