aboutsummaryrefslogtreecommitdiffstats
path: root/assetstudio
diff options
context:
space:
mode:
Diffstat (limited to 'assetstudio')
-rw-r--r--assetstudio/.settings/org.eclipse.jdt.core.prefs12
-rw-r--r--assetstudio/src/com/android/assetstudiolib/GraphicGenerator.java1
-rw-r--r--assetstudio/tests/src/com/android/assetstudiolib/GeneratorTest.java1
3 files changed, 13 insertions, 1 deletions
diff --git a/assetstudio/.settings/org.eclipse.jdt.core.prefs b/assetstudio/.settings/org.eclipse.jdt.core.prefs
index e755df2..9c7cb00 100644
--- a/assetstudio/.settings/org.eclipse.jdt.core.prefs
+++ b/assetstudio/.settings/org.eclipse.jdt.core.prefs
@@ -1,6 +1,14 @@
-#Thu Jun 09 12:26:44 PDT 2011
+#Tue Dec 20 16:31:10 PST 2011
eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
org.eclipse.jdt.core.compiler.problem.deadCode=warning
@@ -9,6 +17,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
@@ -69,3 +78,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/assetstudio/src/com/android/assetstudiolib/GraphicGenerator.java b/assetstudio/src/com/android/assetstudiolib/GraphicGenerator.java
index 1c9fb29..0269c74 100644
--- a/assetstudio/src/com/android/assetstudiolib/GraphicGenerator.java
+++ b/assetstudio/src/com/android/assetstudiolib/GraphicGenerator.java
@@ -151,6 +151,7 @@ public abstract class GraphicGenerator {
Density[] densityValues = Density.values();
// Sort density values into ascending order
Arrays.sort(densityValues, new Comparator<Density>() {
+ @Override
public int compare(Density d1, Density d2) {
return d1.getDpiValue() - d2.getDpiValue();
}
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);