Reviewers: metaweta,
Please review this at http://codereview.appspot.com/109097 Affected files: M src/com/google/caja/lang/css/CssSchema.java M src/com/google/caja/util/Criterion.java M src/com/google/caja/util/Pair.java M src/com/google/caja/util/SyntheticAttributeKey.java M src/com/google/caja/util/TransactionSafeMap.java M tests/com/google/caja/parser/js/ParserTest.java Index: tests/com/google/caja/parser/js/ParserTest.java =================================================================== --- tests/com/google/caja/parser/js/ParserTest.java (revision 3660) +++ tests/com/google/caja/parser/js/ParserTest.java (working copy) @@ -171,7 +171,6 @@ runRenderTest("parsertest9.js", "rendergolden9.txt", false, false); } public final void testThrowAsRestrictedProduction() throws Exception { - if (false) { try { js(fromString("throw \n new Error()")); fail("throw followed by newline should fail"); @@ -179,7 +178,6 @@ assertEquals(MessageType.EXPECTED_TOKEN, ex.getCajaMessage().getMessageType()); } - } // But it should pass if there is a line-continuation js(fromString("throw \\\n new Error()")); } Index: src/com/google/caja/lang/css/CssSchema.java =================================================================== --- src/com/google/caja/lang/css/CssSchema.java (revision 3660) +++ src/com/google/caja/lang/css/CssSchema.java (working copy) @@ -212,7 +212,7 @@ Object type, Criterion<String> permissiveCriterion) { if ("*".equals(type)) { return permissiveCriterion; } boolean invert = false; - if (type instanceof Map) { + if (type instanceof Map<?, ?>) { Map<?, ?> map = (Map<?, ?>) type; if (map.containsKey("exclude")) { invert = true; Index: src/com/google/caja/util/SyntheticAttributeKey.java =================================================================== --- src/com/google/caja/util/SyntheticAttributeKey.java (revision 3660) +++ src/com/google/caja/util/SyntheticAttributeKey.java (working copy) @@ -42,7 +42,7 @@ @Override public boolean equals(Object obj) { - if (!(obj instanceof SyntheticAttributeKey)) { + if (!(obj instanceof SyntheticAttributeKey<?>)) { return false; } SyntheticAttributeKey<?> that = (SyntheticAttributeKey<?>) obj; Index: src/com/google/caja/util/TransactionSafeMap.java =================================================================== --- src/com/google/caja/util/TransactionSafeMap.java (revision 3660) +++ src/com/google/caja/util/TransactionSafeMap.java (working copy) @@ -124,7 +124,7 @@ } @Override public boolean equals(Object o) { - if (!(o instanceof Map.Entry)) { return false; } + if (!(o instanceof Map.Entry<?, ?>)) { return false; } Map.Entry<?, ?> that = (Map.Entry<?, ?>) o; return (this.getKey() == null ? Index: src/com/google/caja/util/Pair.java =================================================================== --- src/com/google/caja/util/Pair.java (revision 3660) +++ src/com/google/caja/util/Pair.java (working copy) @@ -36,7 +36,7 @@ @Override public boolean equals(Object o) { - if (!(o instanceof Pair)) { return false; } + if (!(o instanceof Pair<?, ?>)) { return false; } Pair<?, ?> that = (Pair<?, ?>) o; return (this.a == null ? that.a == null : this.a.equals(that.a)) && (this.b == null ? that.b == null : this.b.equals(that.b)); Index: src/com/google/caja/util/Criterion.java =================================================================== --- src/com/google/caja/util/Criterion.java (revision 3660) +++ src/com/google/caja/util/Criterion.java (working copy) @@ -111,9 +111,9 @@ * @return non null. */ public static <T> Criterion<T> not(final Criterion<T> criterion) { - return !(criterion instanceof Contrarian) - ? new Contrarian<T>(criterion) - : ((Contrarian<T>) criterion).c; + return !(criterion instanceof Contrarian<?>) + ? new Contrarian<T>(criterion) + : ((Contrarian<T>) criterion).c; } private static final class Contrarian<T> implements Criterion<T> {
