From cb84994ce87bdf9723287c70ea9905a84af8c4fd Mon Sep 17 00:00:00 2001 From: Jason Long <jason@long.name> Date: Fri, 20 Jun 2014 11:45:54 -0400 Subject: [PATCH] MakeTiles: refactor: pushing caching down a level --- src/micropolisj/build_tool/MakeTiles.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/micropolisj/build_tool/MakeTiles.java b/src/micropolisj/build_tool/MakeTiles.java index 9ddc483..d6c84f9 100644 --- a/src/micropolisj/build_tool/MakeTiles.java +++ b/src/micropolisj/build_tool/MakeTiles.java @@ -116,12 +116,7 @@ public class MakeTiles drawTo(ref.background, gr, destX, destY); } - if (!loadedImages.containsKey(ref.fileName)) { - loadedImages.put(ref.fileName, - loadImage(ref.fileName)); - } - - SourceImage sourceImg = loadedImages.get(ref.fileName); + SourceImage sourceImg = loadImage(ref.fileName); gr.drawImage( sourceImg.image, @@ -253,6 +248,17 @@ public class MakeTiles static SourceImage loadImage(String fileName) throws IOException + { + if (!loadedImages.containsKey(fileName)) { + loadedImages.put(fileName, + loadImageReal(fileName)); + } + + return loadedImages.get(fileName); + } + + static SourceImage loadImageReal(String fileName) + throws IOException { File svgFile, pngFile = null;