diff --git a/app/src/main/java/org/toop/app/widget/view/OptionsView.java b/app/src/main/java/org/toop/app/widget/view/OptionsView.java index 198f75b..0284632 100644 --- a/app/src/main/java/org/toop/app/widget/view/OptionsView.java +++ b/app/src/main/java/org/toop/app/widget/view/OptionsView.java @@ -74,7 +74,7 @@ public class OptionsView extends ViewWidget { AppSettings.getSettings().setVolume(val); new EventFlow() .addPostEvent(new AudioEvents.ChangeVolume(val, VolumeControl.MASTERVOLUME)) - .asyncPostEvent(); + .postEvent(); } ); @@ -86,7 +86,7 @@ public class OptionsView extends ViewWidget { AppSettings.getSettings().setFxVolume(val); new EventFlow() .addPostEvent(new AudioEvents.ChangeVolume(val, VolumeControl.FX)) - .asyncPostEvent(); + .postEvent(); } ); @@ -98,7 +98,7 @@ public class OptionsView extends ViewWidget { AppSettings.getSettings().setMusicVolume(val); new EventFlow() .addPostEvent(new AudioEvents.ChangeVolume(val, VolumeControl.MUSIC)) - .asyncPostEvent(); + .postEvent(); } ); diff --git a/app/src/main/java/org/toop/local/AppSettings.java b/app/src/main/java/org/toop/local/AppSettings.java index 7f5493b..2967f6d 100644 --- a/app/src/main/java/org/toop/local/AppSettings.java +++ b/app/src/main/java/org/toop/local/AppSettings.java @@ -36,13 +36,13 @@ public class AppSettings { new EventFlow() .addPostEvent(new AudioEvents.ChangeVolume(settingsData.volume, VolumeControl.MASTERVOLUME)) - .asyncPostEvent(); + .postEvent(); new EventFlow() .addPostEvent(new AudioEvents.ChangeVolume(settingsData.fxVolume, VolumeControl.FX)) - .asyncPostEvent(); + .postEvent(); new EventFlow() .addPostEvent(new AudioEvents.ChangeVolume(settingsData.musicVolume, VolumeControl.MUSIC)) - .asyncPostEvent(); + .postEvent(); } public static SettingsAsset getPath() { diff --git a/framework/src/main/java/org/toop/framework/resource/ResourceManager.java b/framework/src/main/java/org/toop/framework/resource/ResourceManager.java index 0a9668a..5bb5396 100644 --- a/framework/src/main/java/org/toop/framework/resource/ResourceManager.java +++ b/framework/src/main/java/org/toop/framework/resource/ResourceManager.java @@ -92,11 +92,6 @@ public class ResourceManager { return asset.getResource(); } - // @SuppressWarnings("unchecked") - // public static ArrayList> getAllOfType() { - // return (ArrayList>) (ArrayList) new ArrayList<>(assets.values()); - // } - /** * Retrieve all assets of a specific resource type. * diff --git a/framework/src/main/java/org/toop/framework/resource/resources/LocalizationAsset.java b/framework/src/main/java/org/toop/framework/resource/resources/LocalizationAsset.java index 7b5ec84..b1c56d5 100644 --- a/framework/src/main/java/org/toop/framework/resource/resources/LocalizationAsset.java +++ b/framework/src/main/java/org/toop/framework/resource/resources/LocalizationAsset.java @@ -147,24 +147,6 @@ public class LocalizationAsset extends BaseResource implements LoadableResource, return this.baseName; } - // /** - // * Extracts the base name from a file name. - // * - // * @param fileName the file name - // * @return base name without locale or extension - // */ - // private String getBaseName(String fileName) { - // int dotIndex = fileName.lastIndexOf('.'); - // String nameWithoutExtension = (dotIndex > 0) ? fileName.substring(0, dotIndex) : - // fileName; - // - // int underscoreIndex = nameWithoutExtension.indexOf('_'); - // if (underscoreIndex > 0) { - // return nameWithoutExtension.substring(0, underscoreIndex); - // } - // return nameWithoutExtension; - // } - /** * Extracts a locale from a file name based on the pattern "base_LOCALE.properties". * diff --git a/framework/src/main/java/org/toop/framework/resource/types/BundledResource.java b/framework/src/main/java/org/toop/framework/resource/types/BundledResource.java index ca63407..0187d9a 100644 --- a/framework/src/main/java/org/toop/framework/resource/types/BundledResource.java +++ b/framework/src/main/java/org/toop/framework/resource/types/BundledResource.java @@ -69,9 +69,4 @@ public interface BundledResource { * @return the base name used to identify this bundled resource */ String getBaseName(); - - // /** - // Returns the name - // */ - // String getDefaultName(); } diff --git a/framework/src/test/java/org/toop/framework/eventbus/EventFlowStressTest.java b/framework/src/test/java/org/toop/framework/eventbus/EventFlowStressTest.java index cd7d090..6a2edff 100644 --- a/framework/src/test/java/org/toop/framework/eventbus/EventFlowStressTest.java +++ b/framework/src/test/java/org/toop/framework/eventbus/EventFlowStressTest.java @@ -79,7 +79,7 @@ executor.submit(() -> { for (int i = 0; i < EVENTS_PER_THREAD; i++) { var _ = new EventFlow().addPostEvent(HeavyEvent.class, "payload-" + i) - .asyncPostEvent(); + .postEvent(); } }); }