Revision: 5605
Author: [email protected]
Date: Tue Sep 24 19:27:18 2013 UTC
Log: deprecate com.google.caja.util.Sets
https://codereview.appspot.com/13863043
similar to the recent CL that deprecates Maps
R=kpreid2
http://code.google.com/p/google-caja/source/detail?r=5605
Modified:
/trunk/src/com/google/caja/ancillary/linter/ExitModes.java
/trunk/src/com/google/caja/ancillary/linter/Linter.java
/trunk/src/com/google/caja/ancillary/linter/LiveSet.java
/trunk/src/com/google/caja/ancillary/linter/NodeBuckets.java
/trunk/src/com/google/caja/ancillary/linter/ScopeAnalyzer.java
/trunk/src/com/google/caja/ancillary/opt/ConstLocalOptimization.java
/trunk/src/com/google/caja/ancillary/opt/LocalVarRenamer.java
/trunk/src/com/google/caja/ancillary/opt/ParseTreeKB.java
/trunk/src/com/google/caja/ancillary/opt/ScopeInfo.java
/trunk/src/com/google/caja/ancillary/opt/VarCollector.java
/trunk/src/com/google/caja/demos/playground/server/AppEngineJobCacheKeys.java
/trunk/src/com/google/caja/lang/css/CssPropertyPatterns.java
/trunk/src/com/google/caja/lang/html/HtmlSchema.java
/trunk/src/com/google/caja/parser/html/CajaTreeBuilder.java
/trunk/src/com/google/caja/parser/html/DoctypeMaker.java
/trunk/src/com/google/caja/parser/html/Nodes.java
/trunk/src/com/google/caja/parser/js/JsonMLConverter.java
/trunk/src/com/google/caja/parser/js/Parser.java
/trunk/src/com/google/caja/parser/js/scope/ScopeAnalyzer.java
/trunk/src/com/google/caja/parser/quasiliteral/AlphaRenaming.java
/trunk/src/com/google/caja/parser/quasiliteral/ES53Rewriter.java
/trunk/src/com/google/caja/parser/quasiliteral/Scope.java
/trunk/src/com/google/caja/parser/quasiliteral/opt/ScopeTree.java
/trunk/src/com/google/caja/plugin/BuildServiceImplementation.java
/trunk/src/com/google/caja/plugin/Config.java
/trunk/src/com/google/caja/plugin/LinkStyleWhitelist.java
/trunk/src/com/google/caja/plugin/Planner.java
/trunk/src/com/google/caja/plugin/stages/InlineCssImportsStage.java
/trunk/src/com/google/caja/plugin/stages/RewriteHtmlStage.java
/trunk/src/com/google/caja/plugin/templates/SafeHtmlMaker.java
/trunk/src/com/google/caja/tools/AbstractCajaAntTask.java
/trunk/src/com/google/caja/tools/TransformAntTask.java
/trunk/src/com/google/caja/util/ContentType.java
/trunk/src/com/google/caja/util/Multimaps.java
/trunk/src/com/google/caja/util/Sets.java
/trunk/src/com/google/caja/util/TypesafeSet.java
/trunk/tests/com/google/caja/ancillary/linter/LinterTest.java
/trunk/tests/com/google/caja/lang/css/CssPropertyPatternsTest.java
/trunk/tests/com/google/caja/lang/css/PartitionsTest.java
/trunk/tests/com/google/caja/parser/quasiliteral/AlphaRenamingTest.java
/trunk/tests/com/google/caja/plugin/CssRewriterTest.java
/trunk/tests/com/google/caja/plugin/PipelineCacheTest.java
/trunk/tests/com/google/caja/util/RhinoExecutor.java
=======================================
--- /trunk/src/com/google/caja/ancillary/linter/ExitModes.java Tue Sep 24
18:19:56 2013 UTC
+++ /trunk/src/com/google/caja/ancillary/linter/ExitModes.java Tue Sep 24
19:27:18 2013 UTC
@@ -27,8 +27,8 @@
import com.google.caja.parser.js.Statement;
import com.google.caja.parser.js.ThrowStmt;
import com.google.caja.util.Lists;
-import com.google.caja.util.Sets;
import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
/**
* Describes the ways in which execution of a JavaScript parse tree
completes.
=======================================
--- /trunk/src/com/google/caja/ancillary/linter/Linter.java Tue Sep 24
18:19:56 2013 UTC
+++ /trunk/src/com/google/caja/ancillary/linter/Linter.java Tue Sep 24
19:27:18 2013 UTC
@@ -64,9 +64,10 @@
import com.google.caja.util.Charsets;
import com.google.caja.util.Lists;
import com.google.caja.util.Pair;
-import com.google.caja.util.Sets;
import com.google.caja.util.Strings;
+import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
import java.io.File;
import java.io.FileOutputStream;
@@ -590,12 +591,12 @@
final Set<String> outers;
public Environment(Set<String> outers) {
- this.outers = Sets.immutableSet(outers);
+ this.outers = ImmutableSet.copyOf(outers);
}
}
public static final Environment BROWSER_ENVIRONMENT = new Environment(
- Sets.newLinkedHashSet(
+ ImmutableSet.of(
"window", "document", "setTimeout", "setInterval", "location",
"XMLHttpRequest", "clearInterval", "clearTimeout", "navigator",
"event", "alert", "confirm", "prompt", "this", "JSON"));
@@ -775,7 +776,8 @@
LexicalScope globalScope, LexicalScope scope,
Set<String> documentedGlobals, MessageQueue mq) {
for (String symbolName : Sets.difference(
- scope.symbols.symbolNames(), documentedGlobals)) {
+ Sets.newLinkedHashSet(scope.symbols.symbolNames()),
+ documentedGlobals)) {
for (AncestorChain<?> decl
: scope.symbols.getSymbol(symbolName).getDeclarations()) {
if (decl == globalScope.root) { continue; } // a built-in
=======================================
--- /trunk/src/com/google/caja/ancillary/linter/LiveSet.java Tue Oct 20
01:04:03 2009 UTC
+++ /trunk/src/com/google/caja/ancillary/linter/LiveSet.java Tue Sep 24
19:27:18 2013 UTC
@@ -19,7 +19,7 @@
import com.google.caja.parser.js.Declaration;
import com.google.caja.parser.js.Reference;
import com.google.caja.util.Pair;
-import com.google.caja.util.Sets;
+import com.google.common.collect.Sets;
import java.util.Collections;
import java.util.Iterator;
=======================================
--- /trunk/src/com/google/caja/ancillary/linter/NodeBuckets.java Wed Jun 20
22:20:40 2012 UTC
+++ /trunk/src/com/google/caja/ancillary/linter/NodeBuckets.java Tue Sep 24
19:27:18 2013 UTC
@@ -21,7 +21,7 @@
import com.google.caja.parser.ParseTreeNode;
import com.google.caja.util.Multimap;
import com.google.caja.util.Multimaps;
-import com.google.caja.util.Sets;
+import com.google.common.collect.Sets;
/**
* Groups nodes in a parse tree by type.
=======================================
--- /trunk/src/com/google/caja/ancillary/linter/ScopeAnalyzer.java Thu Aug
8 00:39:21 2013 UTC
+++ /trunk/src/com/google/caja/ancillary/linter/ScopeAnalyzer.java Tue Sep
24 19:27:18 2013 UTC
@@ -26,8 +26,8 @@
import com.google.caja.parser.js.Reference;
import com.google.caja.parser.js.WithStmt;
import com.google.caja.util.Lists;
-import com.google.caja.util.Sets;
import com.google.caja.util.SyntheticAttributeKey;
+import com.google.common.collect.ImmutableSet;
import java.util.Collection;
import java.util.Collections;
@@ -48,7 +48,7 @@
LexicalScope.class, "definingScope");
static final Collection<String> ECMASCRIPT_BUILTINS
- = Collections.unmodifiableCollection(Sets.newLinkedHashSet(
+ = Collections.unmodifiableCollection(ImmutableSet.of(
"Array",
"Boolean",
"Date",
=======================================
--- /trunk/src/com/google/caja/ancillary/opt/ConstLocalOptimization.java
Tue Sep 24 18:19:56 2013 UTC
+++ /trunk/src/com/google/caja/ancillary/opt/ConstLocalOptimization.java
Tue Sep 24 19:27:18 2013 UTC
@@ -42,8 +42,8 @@
import com.google.caja.parser.js.scope.ScopeListener;
import com.google.caja.parser.js.scope.ScopeType;
import com.google.caja.util.Lists;
-import com.google.caja.util.Sets;
import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
import java.util.List;
import java.util.Map;
=======================================
--- /trunk/src/com/google/caja/ancillary/opt/LocalVarRenamer.java Wed Jun
20 22:20:40 2012 UTC
+++ /trunk/src/com/google/caja/ancillary/opt/LocalVarRenamer.java Tue Sep
24 19:27:18 2013 UTC
@@ -32,8 +32,8 @@
import com.google.caja.reporting.MessageQueue;
import com.google.caja.util.Iterators;
import com.google.caja.util.SafeIdentifierMaker;
-import com.google.caja.util.Sets;
import com.google.caja.util.SyntheticAttributeKey;
+import com.google.common.collect.Sets;
import java.util.Iterator;
import java.util.Set;
=======================================
--- /trunk/src/com/google/caja/ancillary/opt/ParseTreeKB.java Tue Sep 24
18:19:56 2013 UTC
+++ /trunk/src/com/google/caja/ancillary/opt/ParseTreeKB.java Tue Sep 24
19:27:18 2013 UTC
@@ -40,8 +40,8 @@
import com.google.caja.reporting.MessageQueue;
import com.google.caja.util.Lists;
import com.google.caja.util.Pair;
-import com.google.caja.util.Sets;
import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
import java.util.Arrays;
import java.util.Collections;
=======================================
--- /trunk/src/com/google/caja/ancillary/opt/ScopeInfo.java Tue Sep 24
18:19:56 2013 UTC
+++ /trunk/src/com/google/caja/ancillary/opt/ScopeInfo.java Tue Sep 24
19:27:18 2013 UTC
@@ -23,8 +23,8 @@
import com.google.caja.parser.quasiliteral.Scope;
import com.google.caja.reporting.MessageQueue;
import com.google.caja.util.Lists;
-import com.google.caja.util.Sets;
import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
import java.util.List;
import java.util.Map;
=======================================
--- /trunk/src/com/google/caja/ancillary/opt/VarCollector.java Tue Apr 26
02:19:22 2011 UTC
+++ /trunk/src/com/google/caja/ancillary/opt/VarCollector.java Tue Sep 24
19:27:18 2013 UTC
@@ -38,7 +38,7 @@
import com.google.caja.parser.js.Statement;
import com.google.caja.util.Lists;
import com.google.caja.util.Pair;
-import com.google.caja.util.Sets;
+import com.google.common.collect.Sets;
import java.util.Collections;
import java.util.Comparator;
=======================================
---
/trunk/src/com/google/caja/demos/playground/server/AppEngineJobCacheKeys.java
Tue Jun 5 22:50:03 2012 UTC
+++
/trunk/src/com/google/caja/demos/playground/server/AppEngineJobCacheKeys.java
Tue Sep 24 19:27:18 2013 UTC
@@ -16,7 +16,7 @@
import com.google.caja.plugin.stages.JobCache;
import com.google.caja.util.Lists;
-import com.google.caja.util.Sets;
+import com.google.common.collect.Sets;
import java.util.ArrayList;
import java.util.Iterator;
=======================================
--- /trunk/src/com/google/caja/lang/css/CssPropertyPatterns.java Tue Sep 24
18:19:56 2013 UTC
+++ /trunk/src/com/google/caja/lang/css/CssPropertyPatterns.java Tue Sep 24
19:27:18 2013 UTC
@@ -49,10 +49,11 @@
import com.google.caja.util.Lists;
import com.google.caja.util.Name;
import com.google.caja.util.Pair;
-import com.google.caja.util.Sets;
import com.google.caja.util.Strings;
import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
import java.io.File;
import java.io.FileOutputStream;
@@ -157,7 +158,7 @@
return data;
}
- private static final Set<String> KNOWN_VENDOR_PREFIXES =
Sets.immutableSet(
+ private static final Set<String> KNOWN_VENDOR_PREFIXES = ImmutableSet.of(
"apple",
"css",
"epub",
=======================================
--- /trunk/src/com/google/caja/lang/html/HtmlSchema.java Tue Sep 24
18:19:56 2013 UTC
+++ /trunk/src/com/google/caja/lang/html/HtmlSchema.java Tue Sep 24
19:27:18 2013 UTC
@@ -30,9 +30,9 @@
import com.google.caja.util.Multimap;
import com.google.caja.util.Multimaps;
import com.google.caja.util.Pair;
-import com.google.caja.util.Sets;
import com.google.caja.util.Strings;
import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
import java.io.IOException;
import java.net.URI;
=======================================
--- /trunk/src/com/google/caja/parser/html/CajaTreeBuilder.java Mon Jul 11
12:10:19 2011 UTC
+++ /trunk/src/com/google/caja/parser/html/CajaTreeBuilder.java Tue Sep 24
19:27:18 2013 UTC
@@ -22,7 +22,7 @@
import com.google.caja.reporting.MessagePart;
import com.google.caja.reporting.MessageQueue;
import com.google.caja.reporting.MessageType;
-import com.google.caja.util.Sets;
+import com.google.common.collect.Sets;
import java.util.List;
import java.util.Set;
=======================================
--- /trunk/src/com/google/caja/parser/html/DoctypeMaker.java Tue Sep 24
18:19:56 2013 UTC
+++ /trunk/src/com/google/caja/parser/html/DoctypeMaker.java Tue Sep 24
19:27:18 2013 UTC
@@ -15,8 +15,8 @@
package com.google.caja.parser.html;
import com.google.caja.util.Function;
-import com.google.common.collect.ImmutableMap;
import com.google.caja.util.Strings;
+import com.google.common.collect.ImmutableMap;
import java.util.Map;
import java.util.regex.Matcher;
=======================================
--- /trunk/src/com/google/caja/parser/html/Nodes.java Thu Aug 8 00:39:21
2013 UTC
+++ /trunk/src/com/google/caja/parser/html/Nodes.java Tue Sep 24 19:27:18
2013 UTC
@@ -24,9 +24,9 @@
import com.google.caja.render.Concatenator;
import com.google.caja.reporting.MarkupRenderMode;
import com.google.caja.reporting.RenderContext;
-import com.google.caja.util.Sets;
import com.google.caja.util.SparseBitSet;
import com.google.caja.util.Strings;
+import com.google.common.collect.ImmutableSet;
import java.net.URI;
import java.net.URISyntaxException;
@@ -988,7 +988,7 @@
* @see <a href="http://www.w3.org/TR/html401/index/attributes.html";>
* the HTML4.01 attributes index</a>
*/
- private static final Set<String> BOOLEAN_ATTR_NAMES = Sets.immutableSet(
+ private static final Set<String> BOOLEAN_ATTR_NAMES = ImmutableSet.of(
"checked", "compact", "declare", "defer", "disabled", "ismap",
"multiple",
"nohref", "noresize", "noshade", "nowrap", "readonly", "selected");
=======================================
--- /trunk/src/com/google/caja/parser/js/JsonMLConverter.java Tue Sep 24
18:19:56 2013 UTC
+++ /trunk/src/com/google/caja/parser/js/JsonMLConverter.java Tue Sep 24
19:27:18 2013 UTC
@@ -21,10 +21,10 @@
import com.google.caja.parser.ParseTreeNodes;
import com.google.caja.parser.ParserBase;
import com.google.caja.util.Lists;
-import com.google.common.collect.Maps;
import com.google.javascript.jscomp.jsonml.JsonML;
import com.google.javascript.jscomp.jsonml.TagAttr;
import com.google.javascript.jscomp.jsonml.TagType;
+import com.google.common.collect.Maps;
import java.util.Collections;
import java.util.List;
=======================================
--- /trunk/src/com/google/caja/parser/js/Parser.java Mon Jul 15 20:10:17
2013 UTC
+++ /trunk/src/com/google/caja/parser/js/Parser.java Tue Sep 24 19:27:18
2013 UTC
@@ -34,7 +34,7 @@
import com.google.caja.reporting.RenderContext;
import com.google.caja.util.Lists;
import com.google.caja.util.Pair;
-import com.google.caja.util.Sets;
+import com.google.common.collect.Sets;
import com.google.javascript.jscomp.jsonml.JsonML;
import java.math.BigDecimal;
=======================================
--- /trunk/src/com/google/caja/parser/js/scope/ScopeAnalyzer.java Thu Aug
8 00:39:21 2013 UTC
+++ /trunk/src/com/google/caja/parser/js/scope/ScopeAnalyzer.java Tue Sep
24 19:27:18 2013 UTC
@@ -29,7 +29,7 @@
import com.google.caja.parser.js.Reference;
import com.google.caja.parser.js.WithStmt;
import com.google.caja.util.Lists;
-import com.google.caja.util.Sets;
+import com.google.common.collect.Sets;
import java.util.List;
import java.util.Set;
=======================================
--- /trunk/src/com/google/caja/parser/quasiliteral/AlphaRenaming.java Tue
Sep 24 18:19:56 2013 UTC
+++ /trunk/src/com/google/caja/parser/quasiliteral/AlphaRenaming.java Tue
Sep 24 19:27:18 2013 UTC
@@ -32,8 +32,8 @@
import com.google.caja.reporting.MessagePart;
import com.google.caja.reporting.MessageQueue;
import com.google.caja.util.Lists;
-import com.google.caja.util.Sets;
import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
import java.util.List;
import java.util.Map;
=======================================
--- /trunk/src/com/google/caja/parser/quasiliteral/ES53Rewriter.java Thu
Aug 8 00:39:21 2013 UTC
+++ /trunk/src/com/google/caja/parser/quasiliteral/ES53Rewriter.java Tue
Sep 24 19:27:18 2013 UTC
@@ -69,7 +69,7 @@
import com.google.caja.reporting.MessagePart;
import com.google.caja.reporting.MessageQueue;
import com.google.caja.util.Lists;
-import com.google.caja.util.Sets;
+import com.google.common.collect.Sets;
import java.net.URI;
import java.util.Arrays;
=======================================
--- /trunk/src/com/google/caja/parser/quasiliteral/Scope.java Tue Sep 24
18:19:56 2013 UTC
+++ /trunk/src/com/google/caja/parser/quasiliteral/Scope.java Tue Sep 24
19:27:18 2013 UTC
@@ -41,8 +41,9 @@
import com.google.caja.reporting.MessageType;
import com.google.caja.util.Lists;
import com.google.caja.util.Pair;
-import com.google.caja.util.Sets;
+import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
import java.util.Arrays;
import java.util.Collections;
@@ -623,7 +624,7 @@
* JavaScript identifiers where masking may change the behavior of
synthetic
* code or cause lots of confusion.
*/
- public static final Set<String> UNMASKABLE_IDENTIFIERS =
Sets.immutableSet(
+ public static final Set<String> UNMASKABLE_IDENTIFIERS = ImmutableSet.of(
"Array", // Masking Array can change the behavior of [0, 1, ...]
"Infinity",
"NaN",
=======================================
--- /trunk/src/com/google/caja/parser/quasiliteral/opt/ScopeTree.java Tue
Sep 24 18:19:56 2013 UTC
+++ /trunk/src/com/google/caja/parser/quasiliteral/opt/ScopeTree.java Tue
Sep 24 19:27:18 2013 UTC
@@ -26,8 +26,8 @@
import com.google.caja.parser.js.scope.WorstCaseScopeAnalyzer;
import com.google.caja.parser.quasiliteral.Scope;
import com.google.caja.util.Lists;
-import com.google.caja.util.Sets;
import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
import java.util.Collections;
import java.util.List;
=======================================
--- /trunk/src/com/google/caja/plugin/BuildServiceImplementation.java Tue
Sep 24 18:19:56 2013 UTC
+++ /trunk/src/com/google/caja/plugin/BuildServiceImplementation.java Tue
Sep 24 19:27:18 2013 UTC
@@ -52,8 +52,8 @@
import com.google.caja.util.FileIO;
import com.google.caja.util.Lists;
import com.google.caja.util.Pair;
-import com.google.caja.util.Sets;
import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
import java.io.File;
import java.io.FileInputStream;
=======================================
--- /trunk/src/com/google/caja/plugin/Config.java Wed Mar 6 20:22:42 2013
UTC
+++ /trunk/src/com/google/caja/plugin/Config.java Tue Sep 24 19:27:18 2013
UTC
@@ -26,8 +26,8 @@
import com.google.caja.util.Join;
import com.google.caja.util.Lists;
import com.google.caja.util.Pair;
-import com.google.caja.util.Sets;
import com.google.caja.util.Strings;
+import com.google.common.collect.ImmutableSet;
import java.io.File;
import java.io.IOException;
@@ -364,10 +364,10 @@
return false;
}
- fUris = Sets.immutableSet(getOptionValues(cl, F_URI));
+ fUris = ImmutableSet.copyOf(getOptionValues(cl, F_URI));
fUriAll = cl.hasOption(F_URI_ALL.getOpt());
- lUris = Sets.immutableSet(getOptionValues(cl, L_URI));
+ lUris = ImmutableSet.copyOf(getOptionValues(cl, L_URI));
lUriAll = cl.hasOption(L_URI_ALL.getOpt());
lUriRuntime = cl.hasOption(L_URI_RUNTIME.getOpt());
=======================================
--- /trunk/src/com/google/caja/plugin/LinkStyleWhitelist.java Mon Jul 15
21:11:53 2013 UTC
+++ /trunk/src/com/google/caja/plugin/LinkStyleWhitelist.java Tue Sep 24
19:27:18 2013 UTC
@@ -3,8 +3,8 @@
import java.util.Set;
import com.google.caja.util.Name;
-import com.google.caja.util.Sets;
import com.google.caja.util.TypesafeSet;
+import com.google.common.collect.Sets;
public class LinkStyleWhitelist {
/**
=======================================
--- /trunk/src/com/google/caja/plugin/Planner.java Wed Jun 22 16:53:38 2011
UTC
+++ /trunk/src/com/google/caja/plugin/Planner.java Tue Sep 24 19:27:18 2013
UTC
@@ -15,7 +15,7 @@
package com.google.caja.plugin;
import com.google.caja.util.Lists;
-import com.google.caja.util.Sets;
+import com.google.common.collect.Sets;
import java.util.Arrays;
import java.util.Collections;
@@ -136,7 +136,7 @@
} else if (prior == null) {
used = Collections.singleton(tool);
} else {
- used = Sets.newIdentityHashSet(prior.used);
+ used = Sets.newLinkedHashSet(prior.used);
used.add(tool);
}
}
=======================================
--- /trunk/src/com/google/caja/plugin/stages/InlineCssImportsStage.java Thu
Dec 15 05:58:17 2011 UTC
+++ /trunk/src/com/google/caja/plugin/stages/InlineCssImportsStage.java Tue
Sep 24 19:27:18 2013 UTC
@@ -36,7 +36,7 @@
import com.google.caja.util.Lists;
import com.google.caja.util.Name;
import com.google.caja.util.Pipeline;
-import com.google.caja.util.Sets;
+import com.google.common.collect.Sets;
import java.io.UnsupportedEncodingException;
import java.net.URI;
=======================================
--- /trunk/src/com/google/caja/plugin/stages/RewriteHtmlStage.java Tue Oct
30 23:18:53 2012 UTC
+++ /trunk/src/com/google/caja/plugin/stages/RewriteHtmlStage.java Tue Sep
24 19:27:18 2013 UTC
@@ -45,7 +45,7 @@
import com.google.caja.util.Lists;
import com.google.caja.util.Name;
import com.google.caja.util.Pipeline;
-import com.google.caja.util.Sets;
+import com.google.common.collect.Sets;
import java.net.URI;
import java.util.Collections;
=======================================
--- /trunk/src/com/google/caja/plugin/templates/SafeHtmlMaker.java Tue Sep
24 18:19:56 2013 UTC
+++ /trunk/src/com/google/caja/plugin/templates/SafeHtmlMaker.java Tue Sep
24 19:27:18 2013 UTC
@@ -41,8 +41,8 @@
import com.google.caja.reporting.MessageContext;
import com.google.caja.util.Lists;
import com.google.caja.util.Pair;
-import com.google.caja.util.Sets;
import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
import java.util.List;
import java.util.Map;
=======================================
--- /trunk/src/com/google/caja/tools/AbstractCajaAntTask.java Tue Sep 24
17:39:42 2013 UTC
+++ /trunk/src/com/google/caja/tools/AbstractCajaAntTask.java Tue Sep 24
19:27:18 2013 UTC
@@ -16,8 +16,8 @@
import com.google.caja.plugin.BuildServiceImplementation;
import com.google.caja.util.Lists;
-import com.google.caja.util.Sets;
import com.google.caja.util.Strings;
+import com.google.common.collect.Sets;
import java.io.File;
import java.io.PrintWriter;
=======================================
--- /trunk/src/com/google/caja/tools/TransformAntTask.java Thu Aug 22
08:11:25 2013 UTC
+++ /trunk/src/com/google/caja/tools/TransformAntTask.java Tue Sep 24
19:27:18 2013 UTC
@@ -16,7 +16,7 @@
import com.google.caja.ancillary.linter.Linter;
import com.google.caja.util.FileIO;
-import com.google.caja.util.Sets;
+import com.google.common.collect.Sets;
import java.io.File;
import java.io.IOException;
=======================================
--- /trunk/src/com/google/caja/util/ContentType.java Tue Sep 24 18:19:56
2013 UTC
+++ /trunk/src/com/google/caja/util/ContentType.java Tue Sep 24 19:27:18
2013 UTC
@@ -14,8 +14,8 @@
package com.google.caja.util;
-import com.google.common.collect.ImmutableMap;
import com.google.caja.util.Strings;
+import com.google.common.collect.ImmutableMap;
import java.util.Map;
=======================================
--- /trunk/src/com/google/caja/util/Multimaps.java Tue Sep 24 18:19:56 2013
UTC
+++ /trunk/src/com/google/caja/util/Multimaps.java Tue Sep 24 19:27:18 2013
UTC
@@ -15,6 +15,7 @@
package com.google.caja.util;
import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
import java.util.Collection;
import java.util.Collections;
=======================================
--- /trunk/src/com/google/caja/util/Sets.java Mon Jul 15 21:11:53 2013 UTC
+++ /trunk/src/com/google/caja/util/Sets.java Tue Sep 24 19:27:18 2013 UTC
@@ -25,10 +25,9 @@
/**
* Shortcuts for creating sets.
- * Inspired by
- * <a href="http://code.google.com/p/google-collections/";>Google
Collections</a>
- * but does not use any type suppressions.
+ * Use com.google.common.collect.Sets instead
*/
+@Deprecated
public final class Sets {
public static <E>
Set<E> newHashSet() {
=======================================
--- /trunk/src/com/google/caja/util/TypesafeSet.java Mon Jul 15 21:11:53
2013 UTC
+++ /trunk/src/com/google/caja/util/TypesafeSet.java Tue Sep 24 19:27:18
2013 UTC
@@ -14,6 +14,8 @@
package com.google.caja.util;
+import com.google.common.collect.ImmutableSet;
+
import java.util.Arrays;
import java.util.Iterator;
import java.util.Set;
@@ -31,7 +33,7 @@
private final Set<T> contents;
private TypesafeSet(Iterable<? extends T> els) {
- this.contents = Sets.<T>immutableSet(els);
+ this.contents = ImmutableSet.copyOf(els);
}
public static final <T> TypesafeSet<T> of(T... els) {
=======================================
--- /trunk/tests/com/google/caja/ancillary/linter/LinterTest.java Thu Aug
8 00:39:21 2013 UTC
+++ /trunk/tests/com/google/caja/ancillary/linter/LinterTest.java Tue Sep
24 19:27:18 2013 UTC
@@ -22,7 +22,7 @@
import com.google.caja.util.CajaTestCase;
import com.google.caja.util.Lists;
import com.google.caja.util.MoreAsserts;
-import com.google.caja.util.Sets;
+import com.google.common.collect.Sets;
import java.net.URI;
import java.util.Arrays;
=======================================
--- /trunk/tests/com/google/caja/lang/css/CssPropertyPatternsTest.java Wed
Aug 28 18:22:02 2013 UTC
+++ /trunk/tests/com/google/caja/lang/css/CssPropertyPatternsTest.java Tue
Sep 24 19:27:18 2013 UTC
@@ -35,8 +35,8 @@
import com.google.caja.util.CajaTestCase;
import com.google.caja.util.Function;
import com.google.caja.util.Lists;
-import com.google.caja.util.Sets;
import com.google.caja.util.Strings;
+import com.google.common.collect.Sets;
import java.util.Arrays;
import java.util.Collections;
=======================================
--- /trunk/tests/com/google/caja/lang/css/PartitionsTest.java Thu Aug 8
19:36:28 2013 UTC
+++ /trunk/tests/com/google/caja/lang/css/PartitionsTest.java Tue Sep 24
19:27:18 2013 UTC
@@ -21,8 +21,8 @@
import com.google.caja.util.CajaTestCase;
import com.google.caja.util.Lists;
import com.google.caja.util.MoreAsserts;
-import com.google.caja.util.Sets;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Sets;
@SuppressWarnings("static-method")
public class PartitionsTest extends CajaTestCase {
=======================================
--- /trunk/tests/com/google/caja/parser/quasiliteral/AlphaRenamingTest.java
Tue Mar 27 11:19:32 2012 UTC
+++ /trunk/tests/com/google/caja/parser/quasiliteral/AlphaRenamingTest.java
Tue Sep 24 19:27:18 2013 UTC
@@ -27,7 +27,7 @@
import com.google.caja.reporting.MessageType;
import com.google.caja.util.CajaTestCase;
import com.google.caja.util.SafeIdentifierMaker;
-import com.google.caja.util.Sets;
+import com.google.common.collect.Sets;
import java.util.Arrays;
import java.util.Set;
=======================================
--- /trunk/tests/com/google/caja/plugin/CssRewriterTest.java Wed Aug 21
04:26:59 2013 UTC
+++ /trunk/tests/com/google/caja/plugin/CssRewriterTest.java Tue Sep 24
19:27:18 2013 UTC
@@ -41,7 +41,7 @@
import com.google.caja.util.Lists;
import com.google.caja.util.MoreAsserts;
import com.google.caja.util.Name;
-import com.google.caja.util.Sets;
+import com.google.common.collect.Sets;
import java.net.URI;
import java.net.URISyntaxException;
=======================================
--- /trunk/tests/com/google/caja/plugin/PipelineCacheTest.java Tue Sep 24
18:19:56 2013 UTC
+++ /trunk/tests/com/google/caja/plugin/PipelineCacheTest.java Tue Sep 24
19:27:18 2013 UTC
@@ -34,8 +34,8 @@
import com.google.caja.util.Join;
import com.google.caja.util.Lists;
import com.google.caja.util.Pipeline;
-import com.google.caja.util.Sets;
import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
import java.net.URI;
import java.util.Collections;
=======================================
--- /trunk/tests/com/google/caja/util/RhinoExecutor.java Tue Sep 24
18:19:56 2013 UTC
+++ /trunk/tests/com/google/caja/util/RhinoExecutor.java Tue Sep 24
19:27:18 2013 UTC
@@ -17,6 +17,7 @@
import com.google.caja.SomethingWidgyHappenedError;
import com.google.caja.plugin.BrowserTestCatalog;
import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
import java.io.ByteArrayInputStream;
import java.io.File;
--
---
You received this message because you are subscribed to the Google Groups "Google Caja Discuss" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
