From 71dab89dc8f571aaf74445a32b5ded9a45ec0497 Mon Sep 17 00:00:00 2001 From: lieght <49651652+BAFGdeJong@users.noreply.github.com> Date: Wed, 1 Oct 2025 16:17:02 +0200 Subject: [PATCH] Removed need for manual typecast --- app/src/main/java/org/toop/app/menu/MainMenu.java | 2 +- app/src/main/java/org/toop/app/menu/QuitMenu.java | 2 +- .../main/java/org/toop/framework/asset/AssetManager.java | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/toop/app/menu/MainMenu.java b/app/src/main/java/org/toop/app/menu/MainMenu.java index 3ac4955..7874ba3 100644 --- a/app/src/main/java/org/toop/app/menu/MainMenu.java +++ b/app/src/main/java/org/toop/app/menu/MainMenu.java @@ -43,7 +43,7 @@ public final class MainMenu extends Menu { background.fitHeightProperty().bind(grid.heightProperty()); pane = new StackPane(background, grid); - CssAsset css = (CssAsset) AssetManager.getByName("main.css").getResource(); + CssAsset css = AssetManager.get("main.css"); pane.getStylesheets().add(css.getUrl()); } } \ No newline at end of file diff --git a/app/src/main/java/org/toop/app/menu/QuitMenu.java b/app/src/main/java/org/toop/app/menu/QuitMenu.java index 150c687..83cbf46 100644 --- a/app/src/main/java/org/toop/app/menu/QuitMenu.java +++ b/app/src/main/java/org/toop/app/menu/QuitMenu.java @@ -51,7 +51,7 @@ public final class QuitMenu extends Menu { StackPane.setAlignment(box, Pos.CENTER); pane = modalContainer; - CssAsset css = (CssAsset) AssetManager.getByName("quit.css").getResource(); + CssAsset css = AssetManager.get("quit.css"); pane.getStylesheets().add(css.getUrl()); } } \ No newline at end of file diff --git a/framework/src/main/java/org/toop/framework/asset/AssetManager.java b/framework/src/main/java/org/toop/framework/asset/AssetManager.java index e53aac0..fbb7584 100644 --- a/framework/src/main/java/org/toop/framework/asset/AssetManager.java +++ b/framework/src/main/java/org/toop/framework/asset/AssetManager.java @@ -21,6 +21,13 @@ public class AssetManager { } } + @SuppressWarnings("unchecked") + public static T get(String name) { + Asset asset = (Asset) assets.get(name); + if (asset == null) return null; + return asset.getResource(); + } + public static ArrayList> getAllOfType(Class type) { ArrayList> list = new ArrayList<>(); for (Asset asset : assets.values()) { // <-- use .values()