aboutsummaryrefslogtreecommitdiffstats
path: root/assetstudio/tests
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2011-12-20 20:20:24 -0800
committerTor Norbye <tnorbye@google.com>2011-12-21 13:36:23 -0800
commitab36f4e7488358dea4ab6b54ee2b7bef3da0232b (patch)
treee6846336e35cd0fb29addf962c9031c68492ed30 /assetstudio/tests
parent4ae7075d188a35298d834bfcd0500b77b08a12ab (diff)
downloadsdk-ab36f4e7488358dea4ab6b54ee2b7bef3da0232b.zip
sdk-ab36f4e7488358dea4ab6b54ee2b7bef3da0232b.tar.gz
sdk-ab36f4e7488358dea4ab6b54ee2b7bef3da0232b.tar.bz2
Update SDK codebase to JDK 6
This changeset makes the SDK codebase compile with source=1.6 (which means it also requires JDK 6). This means that methods implementing an interface requires @Override's. It also means we can start using APIs like the ArrayDeque class and methods like String#isEmpty(). This changeset looks big but the change is trivial: it's basically adding @Override in all the places that need it, along with some other automatic Eclipse cleanup in certain files (such as reordering imports where they were incorrectly ordered (because older versions of Eclipse didn't always handle inner classes right)), as well as cleaning up trailing whitespace and removing some $NON-NLS-1$ markers on lines where there aren't any string literals anymore. This changeset also sets the source and target JDK level to 6 in the Eclipse compiler .settings file, and synchronizes this file to all the other Eclipse SDK projects. Change-Id: I6a9585aa44c3dee9a5c00739ab22fbdbcb9f8275
Diffstat (limited to 'assetstudio/tests')
-rw-r--r--assetstudio/tests/src/com/android/assetstudiolib/GeneratorTest.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/assetstudio/tests/src/com/android/assetstudiolib/GeneratorTest.java b/assetstudio/tests/src/com/android/assetstudiolib/GeneratorTest.java
index 59812bf..4a96f30 100644
--- a/assetstudio/tests/src/com/android/assetstudiolib/GeneratorTest.java
+++ b/assetstudio/tests/src/com/android/assetstudiolib/GeneratorTest.java
@@ -195,6 +195,7 @@ public abstract class GeneratorTest extends TestCase implements GraphicGenerator
return new File(System.getProperty("java.io.tmpdir")); //$NON-NLS-1$
}
+ @Override
public BufferedImage loadImageResource(String path) {
try {
return GraphicGenerator.getStencilImage(path);