From fd057318f0f637947c58f3a57c42f5596cc9696f Mon Sep 17 00:00:00 2001
From: gered <gered@blarg.ca>
Date: Tue, 15 Apr 2014 10:02:34 -0400
Subject: [PATCH] all custom asset loading to be under a common sub-package

---
 src/main/java/ca/blarg/gdx/GameApp.java                         | 2 +-
 .../json => json/textureatlas}/JsonTextureAtlasAnimation.java   | 2 +-
 .../json => json/textureatlas}/JsonTextureAtlasDefinition.java  | 2 +-
 .../atlas/json => json/textureatlas}/JsonTextureAtlasTile.java  | 2 +-
 .../json => json/textureatlas}/TextureAtlasJsonLoader.java      | 2 +-
 .../atlas/json => json/textureatlas}/TextureAtlasLoader.java    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename src/main/java/ca/blarg/gdx/{graphics/atlas/json => json/textureatlas}/JsonTextureAtlasAnimation.java (80%)
 rename src/main/java/ca/blarg/gdx/{graphics/atlas/json => json/textureatlas}/JsonTextureAtlasDefinition.java (82%)
 rename src/main/java/ca/blarg/gdx/{graphics/atlas/json => json/textureatlas}/JsonTextureAtlasTile.java (85%)
 rename src/main/java/ca/blarg/gdx/{graphics/atlas/json => json/textureatlas}/TextureAtlasJsonLoader.java (98%)
 rename src/main/java/ca/blarg/gdx/{graphics/atlas/json => json/textureatlas}/TextureAtlasLoader.java (97%)

diff --git a/src/main/java/ca/blarg/gdx/GameApp.java b/src/main/java/ca/blarg/gdx/GameApp.java
index f811e96..f886779 100644
--- a/src/main/java/ca/blarg/gdx/GameApp.java
+++ b/src/main/java/ca/blarg/gdx/GameApp.java
@@ -3,7 +3,7 @@ package ca.blarg.gdx;
 import ca.blarg.gdx.events.EventManager;
 import ca.blarg.gdx.graphics.*;
 import ca.blarg.gdx.graphics.atlas.TextureAtlas;
-import ca.blarg.gdx.graphics.atlas.json.TextureAtlasLoader;
+import ca.blarg.gdx.json.textureatlas.TextureAtlasLoader;
 import ca.blarg.gdx.states.StateManager;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.assets.AssetManager;
diff --git a/src/main/java/ca/blarg/gdx/graphics/atlas/json/JsonTextureAtlasAnimation.java b/src/main/java/ca/blarg/gdx/json/textureatlas/JsonTextureAtlasAnimation.java
similarity index 80%
rename from src/main/java/ca/blarg/gdx/graphics/atlas/json/JsonTextureAtlasAnimation.java
rename to src/main/java/ca/blarg/gdx/json/textureatlas/JsonTextureAtlasAnimation.java
index bdbee62..3c08bf4 100644
--- a/src/main/java/ca/blarg/gdx/graphics/atlas/json/JsonTextureAtlasAnimation.java
+++ b/src/main/java/ca/blarg/gdx/json/textureatlas/JsonTextureAtlasAnimation.java
@@ -1,4 +1,4 @@
-package ca.blarg.gdx.graphics.atlas.json;
+package ca.blarg.gdx.json.textureatlas;
 
 public class JsonTextureAtlasAnimation {
 	public String name;
diff --git a/src/main/java/ca/blarg/gdx/graphics/atlas/json/JsonTextureAtlasDefinition.java b/src/main/java/ca/blarg/gdx/json/textureatlas/JsonTextureAtlasDefinition.java
similarity index 82%
rename from src/main/java/ca/blarg/gdx/graphics/atlas/json/JsonTextureAtlasDefinition.java
rename to src/main/java/ca/blarg/gdx/json/textureatlas/JsonTextureAtlasDefinition.java
index b42d51a..98cd15b 100644
--- a/src/main/java/ca/blarg/gdx/graphics/atlas/json/JsonTextureAtlasDefinition.java
+++ b/src/main/java/ca/blarg/gdx/json/textureatlas/JsonTextureAtlasDefinition.java
@@ -1,4 +1,4 @@
-package ca.blarg.gdx.graphics.atlas.json;
+package ca.blarg.gdx.json.textureatlas;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/ca/blarg/gdx/graphics/atlas/json/JsonTextureAtlasTile.java b/src/main/java/ca/blarg/gdx/json/textureatlas/JsonTextureAtlasTile.java
similarity index 85%
rename from src/main/java/ca/blarg/gdx/graphics/atlas/json/JsonTextureAtlasTile.java
rename to src/main/java/ca/blarg/gdx/json/textureatlas/JsonTextureAtlasTile.java
index 971ff41..29df98f 100644
--- a/src/main/java/ca/blarg/gdx/graphics/atlas/json/JsonTextureAtlasTile.java
+++ b/src/main/java/ca/blarg/gdx/json/textureatlas/JsonTextureAtlasTile.java
@@ -1,4 +1,4 @@
-package ca.blarg.gdx.graphics.atlas.json;
+package ca.blarg.gdx.json.textureatlas;
 
 public class JsonTextureAtlasTile {
 	public boolean autogrid;
diff --git a/src/main/java/ca/blarg/gdx/graphics/atlas/json/TextureAtlasJsonLoader.java b/src/main/java/ca/blarg/gdx/json/textureatlas/TextureAtlasJsonLoader.java
similarity index 98%
rename from src/main/java/ca/blarg/gdx/graphics/atlas/json/TextureAtlasJsonLoader.java
rename to src/main/java/ca/blarg/gdx/json/textureatlas/TextureAtlasJsonLoader.java
index c46aab9..4340aa1 100644
--- a/src/main/java/ca/blarg/gdx/graphics/atlas/json/TextureAtlasJsonLoader.java
+++ b/src/main/java/ca/blarg/gdx/json/textureatlas/TextureAtlasJsonLoader.java
@@ -1,4 +1,4 @@
-package ca.blarg.gdx.graphics.atlas.json;
+package ca.blarg.gdx.json.textureatlas;
 
 import ca.blarg.gdx.graphics.atlas.CustomGridTextureAtlas;
 import ca.blarg.gdx.graphics.atlas.TextureAtlas;
diff --git a/src/main/java/ca/blarg/gdx/graphics/atlas/json/TextureAtlasLoader.java b/src/main/java/ca/blarg/gdx/json/textureatlas/TextureAtlasLoader.java
similarity index 97%
rename from src/main/java/ca/blarg/gdx/graphics/atlas/json/TextureAtlasLoader.java
rename to src/main/java/ca/blarg/gdx/json/textureatlas/TextureAtlasLoader.java
index 02ff22b..261a028 100644
--- a/src/main/java/ca/blarg/gdx/graphics/atlas/json/TextureAtlasLoader.java
+++ b/src/main/java/ca/blarg/gdx/json/textureatlas/TextureAtlasLoader.java
@@ -1,4 +1,4 @@
-package ca.blarg.gdx.graphics.atlas.json;
+package ca.blarg.gdx.json.textureatlas;
 
 import ca.blarg.gdx.graphics.atlas.TextureAtlas;
 import ca.blarg.gdx.graphics.atlas.TextureAtlasAnimator;