diff options
Diffstat (limited to 'assetstudio')
| -rw-r--r-- | assetstudio/.classpath | 1 | ||||
| -rw-r--r-- | assetstudio/Android.mk | 3 | ||||
| -rw-r--r-- | assetstudio/src/com/android/assetstudiolib/GraphicGenerator.java | 22 |
3 files changed, 22 insertions, 4 deletions
diff --git a/assetstudio/.classpath b/assetstudio/.classpath index 53a77a1..986bffa 100644 --- a/assetstudio/.classpath +++ b/assetstudio/.classpath @@ -5,5 +5,6 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry combineaccessrules="false" kind="src" path="/common"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/> + <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-10.0.1.jar" sourcepath="ANDROID_SRC/prebuilts/tools/common/guava-tools/src.zip"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/assetstudio/Android.mk b/assetstudio/Android.mk index a48c3a0..e55ac55 100644 --- a/assetstudio/Android.mk +++ b/assetstudio/Android.mk @@ -21,7 +21,8 @@ LOCAL_JAVA_RESOURCE_DIRS := src # TODO: Replace common with the batik stuff LOCAL_JAVA_LIBRARIES := \ - common + common \ + guava-tools LOCAL_MODULE := assetstudio diff --git a/assetstudio/src/com/android/assetstudiolib/GraphicGenerator.java b/assetstudio/src/com/android/assetstudiolib/GraphicGenerator.java index a88618c..91b2d2e 100644 --- a/assetstudio/src/com/android/assetstudiolib/GraphicGenerator.java +++ b/assetstudio/src/com/android/assetstudiolib/GraphicGenerator.java @@ -17,6 +17,7 @@ package com.android.assetstudiolib; import com.android.resources.Density; +import com.google.common.io.Closeables; import java.awt.image.BufferedImage; import java.io.File; @@ -199,9 +200,14 @@ public abstract class GraphicGenerator { * @return the image, or null * @throws IOException if an unexpected I/O error occurs */ + @SuppressWarnings("resource") // Eclipse doesn't know about Closeables#closeQuietly yet public static BufferedImage getStencilImage(String relativePath) throws IOException { InputStream is = GraphicGenerator.class.getResourceAsStream(relativePath); - return ImageIO.read(is); + try { + return ImageIO.read(is); + } finally { + Closeables.closeQuietly(is); + } } /** @@ -212,10 +218,15 @@ public abstract class GraphicGenerator { * @return the icon image * @throws IOException if the image cannot be loaded */ + @SuppressWarnings("resource") // Eclipse doesn't know about Closeables#closeQuietly yet public static BufferedImage getClipartIcon(String name) throws IOException { InputStream is = GraphicGenerator.class.getResourceAsStream( "/images/clipart/small/" + name); - return ImageIO.read(is); + try { + return ImageIO.read(is); + } finally { + Closeables.closeQuietly(is); + } } /** @@ -226,10 +237,15 @@ public abstract class GraphicGenerator { * @return the clip art image * @throws IOException if the image cannot be loaded */ + @SuppressWarnings("resource") // Eclipse doesn't know about Closeables#closeQuietly yet public static BufferedImage getClipartImage(String name) throws IOException { InputStream is = GraphicGenerator.class.getResourceAsStream( "/images/clipart/big/" + name); - return ImageIO.read(is); + try { + return ImageIO.read(is); + } finally { + Closeables.closeQuietly(is); + } } /** |