made compatible with Java 5 by removing @OverRide annotations on

implemented interface methods which are only valid in Java 6.
nhnb · Aug 2, 2011 · e0bbb68 · e0bbb68
1 parent 20d13bc
commit e0bbb68
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,15 @@
-#Tue Aug 02 14:21:30 CEST 2011
+#Tue Aug 02 14:27:43 CEST 2011
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+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.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

diff --git a/src/main/zipdiff/output/AbstractBuilder.java b/src/main/zipdiff/output/AbstractBuilder.java
@@ -20,7 +20,6 @@ public abstract class AbstractBuilder implements Builder {
 
 	protected int numberOfOutputPrefixesToSkip;
 
-	@Override
 	public void build(String filename, int numberOfOutputPrefixesToSkip, Differences d) throws IOException {
 		this.numberOfOutputPrefixesToSkip = numberOfOutputPrefixesToSkip;
 		OutputStream os = null;
@@ -33,6 +32,5 @@ public void build(String filename, int numberOfOutputPrefixesToSkip, Differences
 		os.flush();
 	}
 
-	@Override
 	public abstract void build(OutputStream out, Differences d);
 }
diff --git a/src/test/zipdiff/DifferenceCalculatorTest.java b/src/test/zipdiff/DifferenceCalculatorTest.java
@@ -40,7 +40,7 @@ public class DifferenceCalculatorTest extends TestCase {
 	private static String testDirPathName;
 
 	// naming convention The Capital letter denotes the entry so A will be the same as A
-	// OneEntry denotes that the jar has one entry
+	// OneEntry denotes that the jar has one entry 
 	private static String testJarOneEntryA1Filename;
 
 	private static String testJarOneEntryA2Filename;