From 7835b083b80f94d87f4e60a399c26632be1af96a Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Wed, 21 May 2008 11:19:51 +0000 Subject: [PATCH] Nixed some if true then true (ITTT?) stylings. Ray happiness++. git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@499 ed5b42cb-e716-0410-a449-f6a68f950b19 --- .../com/threerings/media/tile/bundle/TileSetBundle.java | 6 +----- src/java/com/threerings/resource/ResourceManager.java | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/java/com/threerings/media/tile/bundle/TileSetBundle.java b/src/java/com/threerings/media/tile/bundle/TileSetBundle.java index c4ad097c..e8e5382c 100644 --- a/src/java/com/threerings/media/tile/bundle/TileSetBundle.java +++ b/src/java/com/threerings/media/tile/bundle/TileSetBundle.java @@ -94,11 +94,7 @@ public class TileSetBundle extends HashIntMap public BufferedImage loadImage (String path) throws IOException { - if (path.endsWith(FastImageIO.FILE_SUFFIX)) { - return _bundle.getImageResource(path, true); - } else { - return _bundle.getImageResource(path, false); - } + return _bundle.getImageResource(path, path.endsWith(FastImageIO.FILE_SUFFIX)); } // custom serialization process diff --git a/src/java/com/threerings/resource/ResourceManager.java b/src/java/com/threerings/resource/ResourceManager.java index 49164a3e..075c03f8 100644 --- a/src/java/com/threerings/resource/ResourceManager.java +++ b/src/java/com/threerings/resource/ResourceManager.java @@ -505,11 +505,7 @@ public class ResourceManager // fallback next to an unpacked resource file File file = getResourceFile(path); if (file != null && file.exists()) { - if (path.endsWith(FastImageIO.FILE_SUFFIX)) { - return loadImage(file, true); - } else { - return loadImage(file, false); - } + return loadImage(file, path.endsWith(FastImageIO.FILE_SUFFIX)); } // first try a locale-specific file