From 02d65f6a7d039da540e0d10f4d33d47a48bafe1b Mon Sep 17 00:00:00 2001 From: gered Date: Tue, 15 Apr 2014 15:38:44 -0400 Subject: [PATCH] use AssetLoadingException for throwing exceptions during asset loading duh --- .../gdx/assets/textureatlas/TextureAtlasJsonLoader.java | 7 ++++--- .../blarg/gdx/assets/textureatlas/TextureAtlasLoader.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/ca/blarg/gdx/assets/textureatlas/TextureAtlasJsonLoader.java b/src/main/java/ca/blarg/gdx/assets/textureatlas/TextureAtlasJsonLoader.java index b021b0f..63b58e4 100644 --- a/src/main/java/ca/blarg/gdx/assets/textureatlas/TextureAtlasJsonLoader.java +++ b/src/main/java/ca/blarg/gdx/assets/textureatlas/TextureAtlasJsonLoader.java @@ -1,5 +1,6 @@ package ca.blarg.gdx.assets.textureatlas; +import ca.blarg.gdx.assets.AssetLoadingException; import ca.blarg.gdx.graphics.atlas.CustomGridTextureAtlas; import ca.blarg.gdx.graphics.atlas.TextureAtlas; import com.badlogic.gdx.assets.AssetManager; @@ -13,11 +14,11 @@ class TextureAtlasJsonLoader { return json.fromJson(JsonTextureAtlasDefinition.class, file); } - public static TextureAtlas create(JsonTextureAtlasDefinition definition, AssetManager assetManager) { + public static TextureAtlas create(FileHandle file, JsonTextureAtlasDefinition definition, AssetManager assetManager) { if (definition.texture == null) - throw new RuntimeException("No texture specified."); + throw new AssetLoadingException(file.path(), "No texture specified."); if (definition.tiles == null || definition.tiles.size() == 0) - throw new RuntimeException("No tiles defined."); + throw new AssetLoadingException(file.path(), "No tiles defined."); Texture texture = assetManager.get(definition.texture, Texture.class); diff --git a/src/main/java/ca/blarg/gdx/assets/textureatlas/TextureAtlasLoader.java b/src/main/java/ca/blarg/gdx/assets/textureatlas/TextureAtlasLoader.java index 495ccde..8975464 100644 --- a/src/main/java/ca/blarg/gdx/assets/textureatlas/TextureAtlasLoader.java +++ b/src/main/java/ca/blarg/gdx/assets/textureatlas/TextureAtlasLoader.java @@ -30,7 +30,7 @@ public class TextureAtlasLoader extends AsynchronousAssetLoader