From 02ee143ce9c3eced261a6daf8ee7d27a55bd299f Mon Sep 17 00:00:00 2001 From: Jason Long Date: Sun, 10 Aug 2014 10:15:22 -0400 Subject: [PATCH] refactor: move LoaderContext to graphics package --- src/micropolisj/graphics/TileImage.java | 6 ++++++ src/micropolisj/gui/TileImages.java | 7 +------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/micropolisj/graphics/TileImage.java b/src/micropolisj/graphics/TileImage.java index 156b0c0..7a3919b 100644 --- a/src/micropolisj/graphics/TileImage.java +++ b/src/micropolisj/graphics/TileImage.java @@ -87,4 +87,10 @@ public abstract class TileImage null); } } + + public interface LoaderContext + { + BufferedImage getDefaultImage(); + BufferedImage getImage(String name); + } } diff --git a/src/micropolisj/gui/TileImages.java b/src/micropolisj/gui/TileImages.java index 5ebd576..add3ec0 100644 --- a/src/micropolisj/gui/TileImages.java +++ b/src/micropolisj/gui/TileImages.java @@ -21,6 +21,7 @@ import micropolisj.engine.*; import micropolisj.graphics.TileImage; import static micropolisj.engine.TileConstants.*; import static micropolisj.XML_Helper.*; +import static micropolisj.graphics.TileImage.LoaderContext; public class TileImages { @@ -70,12 +71,6 @@ public class TileImages return "/" + name + "/tiles.png"; } - interface LoaderContext - { - BufferedImage getDefaultImage(); - BufferedImage getImage(String name); - } - static SimpleTileImage readSimpleImage(XMLStreamReader in, LoaderContext ctx) throws XMLStreamException {