commit 3a3d912deec6a8382422b602031d12fee7d4c73a
author mikesamuel <mikesamuel@ad8eed46-c659-4a31-e19d-951d88f54425> Wed Mar 02 16:32:53 2011 +0000
committer mikesamuel <mikesamuel@ad8eed46-c659-4a31-e19d-951d88f54425> Wed Mar 02 16:32:53 2011 +0000
tree 45bdcd21820b672315a8cb07871a3917fe2e9a32
parent 9b773b31436646e5bd07e53f8d045baa30f2619b

Updated Makefile to build using the version 1.5 class file version and got rid of compiler warnings.

git-svn-id: http://owasp-java-html-sanitizer.googlecode.com/svn/trunk@6 ad8eed46-c659-4a31-e19d-951d88f54425

Makefile

diff --git a/Makefile b/Makefile
index 049c1ee..e818a65 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,21 @@
 CLASSPATH=lib/guava-libraries/guava.jar:lib/htmlparser-1.3/htmlparser-1.3.jar:lib/jsr305/jsr305.jar:lib/junit/junit.jar
+JAVAC_FLAGS=-source 1.5 -target 1.5 -Xlint
+
+
+default: classes
 
 clean:
 	rm -rf out
 
-# Depends on all java files actually.
-out/org/owasp/html/Benchmark.class: tests/org/owasp/html/Benchmark.java
+out:
 	mkdir -p out
-	javac -classpath ${CLASSPATH}  -d out {src,tests}/org/owasp/html/*.java
+
+classes: out src/main/org/owasp/html/*.java
+	javac ${JAVAC_FLAGS} -classpath ${CLASSPATH} -d out src/main/org/owasp/html/*.java
+
+# Depends on all java files under tests.
+out/org/owasp/html/Benchmark.class: out classes src/tests/org/owasp/html/Benchmark.java
+	javac ${JAVAC_FLAGS} -clxasspath ${CLASSPATH} -d out src/tests/org/owasp/html/*.java
 
 benchmark: out/org/owasp/html/Benchmark.class
 	java -cp ${CLASSPATH}:out org.owasp.html.Benchmark benchmark-data/Yahoo\!.html

src/main/org/owasp/html/HtmlStreamRenderer.java

diff --git a/src/main/org/owasp/html/HtmlStreamRenderer.java b/src/main/org/owasp/html/HtmlStreamRenderer.java
index fb3e839..296c27d 100644
--- a/src/main/org/owasp/html/HtmlStreamRenderer.java
+++ b/src/main/org/owasp/html/HtmlStreamRenderer.java
@@ -245,6 +245,7 @@
 
 
   @VisibleForTesting
+  @SuppressWarnings("fallthrough")
   static boolean isValidHtmlName(String name) {
     int n = name.length();
     if (n == 0) { return false; }
@@ -274,6 +275,7 @@
     return true;
   }
 
+  @SuppressWarnings("fallthrough")
   static void escapeHtmlOnto(String plainText, Appendable output)
       throws IOException {
     int n = plainText.length();

src/main/org/owasp/html/ParseException.java

diff --git a/src/main/org/owasp/html/ParseException.java b/src/main/org/owasp/html/ParseException.java
index caf87eb..11ff2fb 100644
--- a/src/main/org/owasp/html/ParseException.java
+++ b/src/main/org/owasp/html/ParseException.java
@@ -3,6 +3,8 @@
 import javax.annotation.Nullable;
 
 public class ParseException extends Exception {
+  static final long serialVersionUID = 8485186712334520567L;
+
   public ParseException(@Nullable String message) {
     super(message);
   }