From ec3f7dcbc432dad64621947792fe684348c3ca1c Mon Sep 17 00:00:00 2001 From: Almas Baimagambetov Date: Wed, 22 Mar 2023 23:00:19 +0000 Subject: [PATCH] refactor: removed deprecated loadCursorImage() --- .../fxgl/app/services/FXGLAssetLoaderService.kt | 16 ---------------- .../almasb/fxgl/app/AssetLoaderServiceTest.kt | 13 ------------- .../fxglassets/ui/cursors/test_cursor.png | Bin 3599 -> 0 bytes 3 files changed, 29 deletions(-) delete mode 100644 fxgl/src/test/resources/fxglassets/ui/cursors/test_cursor.png diff --git a/fxgl/src/main/kotlin/com/almasb/fxgl/app/services/FXGLAssetLoaderService.kt b/fxgl/src/main/kotlin/com/almasb/fxgl/app/services/FXGLAssetLoaderService.kt index 1e3d2b4e26..e70c0eeafa 100644 --- a/fxgl/src/main/kotlin/com/almasb/fxgl/app/services/FXGLAssetLoaderService.kt +++ b/fxgl/src/main/kotlin/com/almasb/fxgl/app/services/FXGLAssetLoaderService.kt @@ -238,22 +238,6 @@ class FXGLAssetLoaderService : AssetLoaderService() { return load(MUSIC, url) } - // TODO: remove in future version - /** - * Loads cursor image with given name from /assets/ui/cursors/. - * Either returns a valid image or throws exception in case of errors. - * - * @param name image name without the /assets/ui/cursors/, e.g. "attack_cursor.png" - * @return cursor image - * @throws IllegalArgumentException if asset not found or loading error - */ - @Deprecated("Place cursor under textures/ and use loadImage() instead") - fun loadCursorImage(name: String): Image { - val url = getURL(CURSORS_DIR + name) - - return load(IMAGE, url) - } - /** * Loads resource bundle with given [name] from "/assets/properties/". * diff --git a/fxgl/src/test/kotlin/com/almasb/fxgl/app/AssetLoaderServiceTest.kt b/fxgl/src/test/kotlin/com/almasb/fxgl/app/AssetLoaderServiceTest.kt index 5b6eaad68f..e8309de4ae 100644 --- a/fxgl/src/test/kotlin/com/almasb/fxgl/app/AssetLoaderServiceTest.kt +++ b/fxgl/src/test/kotlin/com/almasb/fxgl/app/AssetLoaderServiceTest.kt @@ -274,19 +274,6 @@ class AssetLoaderServiceTest { assertThat(map.getString("testKey"), `is`("testValue")) } - @Test - fun loadCursorImage() { - var cursorImage = assetLoader.loadCursorImage("test_cursor.png") - - assertThat(cursorImage, `is`(notNullValue())) - assertThat(cursorImage.width, `is`(64.0)) - assertThat(cursorImage.height, `is`(64.0)) - - cursorImage = assetLoader.loadCursorImage("bla-bla") - - assertThat(cursorImage, `is`(notNullValue())) - } - @Test fun loadUI() { var count = 0 diff --git a/fxgl/src/test/resources/fxglassets/ui/cursors/test_cursor.png b/fxgl/src/test/resources/fxglassets/ui/cursors/test_cursor.png deleted file mode 100644 index c1e0d1ab276505cfcdd2dce0b96568cfccdc2d2b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3599 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 VumH|Bld1p!002ovPDHLkV1lC2r1by*