Revision: 5604
Author: [email protected]
Date: Tue Sep 24 18:19:56 2013 UTC
Log: deprecate com.google.caja.util.Maps
https://codereview.appspot.com/13861043
com.google.common.collect.Maps from Guava does the same thing.
The comment at the top of the Maps class is referring to a very
old version of the google collections library, which was fixed
to be like this Maps class, and then absorbed into Guava.
the deletion of one of the newTreeBag factory methods is because
the necessary generics turn out to be weird, because of bugs in
various versions of javac. since we're not using that method
I just deleted it instead.
R=kpreid2
http://code.google.com/p/google-caja/source/detail?r=5604
Modified:
/trunk/src/com/google/caja/ancillary/linter/ErrorReporter.java
/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/SymbolTable.java
/trunk/src/com/google/caja/ancillary/opt/ConstLocalOptimization.java
/trunk/src/com/google/caja/ancillary/opt/ConstantPooler.java
/trunk/src/com/google/caja/ancillary/opt/EnvironmentData.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/StatementSimplifier.java
/trunk/src/com/google/caja/lang/css/CssPropertyPatterns.java
/trunk/src/com/google/caja/lang/css/Partitions.java
/trunk/src/com/google/caja/lang/html/HtmlDefinitions.java
/trunk/src/com/google/caja/lang/html/HtmlSchema.java
/trunk/src/com/google/caja/lexer/HtmlTextEscapingMode.java
/trunk/src/com/google/caja/parser/html/DoctypeMaker.java
/trunk/src/com/google/caja/parser/html/Html5ElementStack.java
/trunk/src/com/google/caja/parser/js/JsonMLConverter.java
/trunk/src/com/google/caja/parser/quasiliteral/AlphaRenaming.java
/trunk/src/com/google/caja/parser/quasiliteral/AlphaRenamingRewriter.java
/trunk/src/com/google/caja/parser/quasiliteral/NameContext.java
/trunk/src/com/google/caja/parser/quasiliteral/QuasiCache.java
/trunk/src/com/google/caja/parser/quasiliteral/Rule.java
/trunk/src/com/google/caja/parser/quasiliteral/RuleFilter.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/PluginCompilerMain.java
/trunk/src/com/google/caja/plugin/stages/RewriteFlashStage.java
/trunk/src/com/google/caja/plugin/stages/ValidateJavascriptStage.java
/trunk/src/com/google/caja/plugin/templates/HtmlAttributeRewriter.java
/trunk/src/com/google/caja/plugin/templates/SafeHtmlMaker.java
/trunk/src/com/google/caja/plugin/templates/TemplateCompiler.java
/trunk/src/com/google/caja/precajole/StaticPrecajoleMap.java
/trunk/src/com/google/caja/service/AbstractCajolingHandler.java
/trunk/src/com/google/caja/util/Bag.java
/trunk/src/com/google/caja/util/ContentType.java
/trunk/src/com/google/caja/util/Maps.java
/trunk/src/com/google/caja/util/Multimaps.java
/trunk/tests/com/google/caja/ancillary/opt/EnvironmentChecksTest.java
/trunk/tests/com/google/caja/parser/ParserContextTest.java
/trunk/tests/com/google/caja/parser/html/DomMembrane.java
/trunk/tests/com/google/caja/parser/quasiliteral/ModuleFormatTest.java
/trunk/tests/com/google/caja/plugin/PipelineCacheTest.java
/trunk/tests/com/google/caja/render/OrigSourceRendererTestCase.java
/trunk/tests/com/google/caja/reporting/SnippetProducerTest.java
/trunk/tests/com/google/caja/service/ServiceTestCase.java
/trunk/tests/com/google/caja/service/TestHttpServletRequest.java
/trunk/tests/com/google/caja/service/TestHttpServletResponse.java
/trunk/tests/com/google/caja/util/CollectionsTest.java
/trunk/tests/com/google/caja/util/RhinoExecutor.java
=======================================
--- /trunk/src/com/google/caja/ancillary/linter/ErrorReporter.java Thu Sep
27 23:28:55 2012 UTC
+++ /trunk/src/com/google/caja/ancillary/linter/ErrorReporter.java Tue Sep
24 18:19:56 2013 UTC
@@ -24,7 +24,7 @@
import com.google.caja.reporting.MessageTypeInt;
import com.google.caja.reporting.SnippetProducer;
import com.google.caja.util.Lists;
-import com.google.caja.util.Maps;
+import com.google.common.collect.Maps;
import java.io.IOException;
import java.util.Collections;
=======================================
--- /trunk/src/com/google/caja/ancillary/linter/ExitModes.java Thu Aug 8
00:39:21 2013 UTC
+++ /trunk/src/com/google/caja/ancillary/linter/ExitModes.java Tue Sep 24
18:19:56 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.Maps;
import com.google.caja.util.Sets;
+import com.google.common.collect.Maps;
/**
* Describes the ways in which execution of a JavaScript parse tree
completes.
=======================================
--- /trunk/src/com/google/caja/ancillary/linter/Linter.java Fri Aug 9
20:06:48 2013 UTC
+++ /trunk/src/com/google/caja/ancillary/linter/Linter.java Tue Sep 24
18:19:56 2013 UTC
@@ -63,10 +63,10 @@
import com.google.caja.tools.BuildCommand;
import com.google.caja.util.Charsets;
import com.google.caja.util.Lists;
-import com.google.caja.util.Maps;
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 java.io.File;
import java.io.FileOutputStream;
=======================================
--- /trunk/src/com/google/caja/ancillary/linter/SymbolTable.java Tue Oct 20
01:04:03 2009 UTC
+++ /trunk/src/com/google/caja/ancillary/linter/SymbolTable.java Tue Sep 24
18:19:56 2013 UTC
@@ -17,7 +17,7 @@
import com.google.caja.parser.AncestorChain;
import com.google.caja.parser.js.Declaration;
import com.google.caja.util.Lists;
-import com.google.caja.util.Maps;
+import com.google.common.collect.Maps;
import java.util.Collection;
import java.util.Collections;
=======================================
--- /trunk/src/com/google/caja/ancillary/opt/ConstLocalOptimization.java
Thu Jul 15 18:22:05 2010 UTC
+++ /trunk/src/com/google/caja/ancillary/opt/ConstLocalOptimization.java
Tue Sep 24 18:19:56 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.Maps;
import com.google.caja.util.Sets;
+import com.google.common.collect.Maps;
import java.util.List;
import java.util.Map;
=======================================
--- /trunk/src/com/google/caja/ancillary/opt/ConstantPooler.java Mon May 3
22:56:59 2010 UTC
+++ /trunk/src/com/google/caja/ancillary/opt/ConstantPooler.java Tue Sep 24
18:19:56 2013 UTC
@@ -33,7 +33,7 @@
import com.google.caja.parser.js.StringLiteral;
import com.google.caja.reporting.RenderContext;
import com.google.caja.util.Lists;
-import com.google.caja.util.Maps;
+import com.google.common.collect.Maps;
import java.util.Collections;
import java.util.List;
=======================================
--- /trunk/src/com/google/caja/ancillary/opt/EnvironmentData.java Thu Oct
27 10:16:03 2011 UTC
+++ /trunk/src/com/google/caja/ancillary/opt/EnvironmentData.java Tue Sep
24 18:19:56 2013 UTC
@@ -28,7 +28,7 @@
import com.google.caja.reporting.MessageContext;
import com.google.caja.reporting.MessageQueue;
import com.google.caja.reporting.RenderContext;
-import com.google.caja.util.Maps;
+import com.google.common.collect.Maps;
import java.io.PrintWriter;
import java.util.Map;
=======================================
--- /trunk/src/com/google/caja/ancillary/opt/ParseTreeKB.java Fri Nov 18
20:29:44 2011 UTC
+++ /trunk/src/com/google/caja/ancillary/opt/ParseTreeKB.java Tue Sep 24
18:19:56 2013 UTC
@@ -39,9 +39,9 @@
import com.google.caja.parser.quasiliteral.Scope;
import com.google.caja.reporting.MessageQueue;
import com.google.caja.util.Lists;
-import com.google.caja.util.Maps;
import com.google.caja.util.Pair;
import com.google.caja.util.Sets;
+import com.google.common.collect.Maps;
import java.util.Arrays;
import java.util.Collections;
=======================================
--- /trunk/src/com/google/caja/ancillary/opt/ScopeInfo.java Fri Nov 18
20:29:44 2011 UTC
+++ /trunk/src/com/google/caja/ancillary/opt/ScopeInfo.java Tue Sep 24
18:19:56 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.Maps;
import com.google.caja.util.Sets;
+import com.google.common.collect.Maps;
import java.util.List;
import java.util.Map;
=======================================
--- /trunk/src/com/google/caja/ancillary/opt/StatementSimplifier.java Fri
Nov 18 20:29:44 2011 UTC
+++ /trunk/src/com/google/caja/ancillary/opt/StatementSimplifier.java Tue
Sep 24 18:19:56 2013 UTC
@@ -52,8 +52,8 @@
import com.google.caja.reporting.MessageQueue;
import com.google.caja.reporting.MessageType;
import com.google.caja.util.Lists;
-import com.google.caja.util.Maps;
import com.google.caja.util.SafeIdentifierMaker;
+import com.google.common.collect.Maps;
import java.util.Arrays;
import java.util.Collections;
=======================================
--- /trunk/src/com/google/caja/lang/css/CssPropertyPatterns.java Tue Sep 3
20:37:43 2013 UTC
+++ /trunk/src/com/google/caja/lang/css/CssPropertyPatterns.java Tue Sep 24
18:19:56 2013 UTC
@@ -47,11 +47,12 @@
import com.google.caja.util.Bag;
import com.google.caja.util.Charsets;
import com.google.caja.util.Lists;
-import com.google.caja.util.Maps;
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.Maps;
import java.io.File;
import java.io.FileOutputStream;
@@ -314,7 +315,7 @@
}
private static final Map<String, CssPropBit> BUILTIN_PROP_BITS
- = Maps.<String, CssPropBit>immutableMap()
+ = new ImmutableMap.Builder<String, CssPropBit>()
.put("angle", CssPropBit.QUANTITY)
.put("frequency", CssPropBit.QUANTITY)
.put("global-name", CssPropBit.GLOBAL_NAME)
@@ -332,7 +333,7 @@
.put("unreserved-word", CssPropBit.UNRESERVED_WORD)
.put("uri", CssPropBit.URL)
.put("z-index", CssPropBit.QUANTITY)
- .create();
+ .build();
public static void generatePatterns(CssSchema schema, Appendable out)
throws IOException {
=======================================
--- /trunk/src/com/google/caja/lang/css/Partitions.java Thu Jan 19 17:04:11
2012 UTC
+++ /trunk/src/com/google/caja/lang/css/Partitions.java Tue Sep 24 18:19:56
2013 UTC
@@ -16,7 +16,7 @@
import com.google.caja.util.Bag;
import com.google.caja.util.Lists;
-import com.google.caja.util.Maps;
+import com.google.common.collect.Maps;
import java.lang.reflect.Array;
import java.util.Arrays;
=======================================
--- /trunk/src/com/google/caja/lang/html/HtmlDefinitions.java Mon Dec 3
22:28:47 2012 UTC
+++ /trunk/src/com/google/caja/lang/html/HtmlDefinitions.java Tue Sep 24
18:19:56 2013 UTC
@@ -62,7 +62,7 @@
import com.google.caja.util.Charsets;
import com.google.caja.util.Function;
import com.google.caja.util.Lists;
-import com.google.caja.util.Maps;
+import com.google.common.collect.Maps;
/**
* Generates a JavaScript tree with tables mapping HTML element and
attribute
=======================================
--- /trunk/src/com/google/caja/lang/html/HtmlSchema.java Wed Mar 6
20:22:42 2013 UTC
+++ /trunk/src/com/google/caja/lang/html/HtmlSchema.java Tue Sep 24
18:19:56 2013 UTC
@@ -27,12 +27,12 @@
import com.google.caja.reporting.MessageQueue;
import com.google.caja.reporting.SimpleMessageQueue;
import com.google.caja.util.Lists;
-import com.google.caja.util.Maps;
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 java.io.IOException;
import java.net.URI;
@@ -61,7 +61,7 @@
private static final ElKey STYLE = ElKey.forHtmlElement("style");
private static final String DEFAULT_SCHEMA_INTERFACE = "HTMLElement";
private static final String UNKNOWN_INTERFACE = "HTMLUnknownElement";
-
+
private final Set<ElKey> allowedElements;
private final Map<ElKey, HTML.Element> elementDetails;
private final Set<AttribKey> allowedAttributes;
=======================================
--- /trunk/src/com/google/caja/lexer/HtmlTextEscapingMode.java Fri Jun 15
01:06:33 2012 UTC
+++ /trunk/src/com/google/caja/lexer/HtmlTextEscapingMode.java Tue Sep 24
18:19:56 2013 UTC
@@ -14,7 +14,7 @@
package com.google.caja.lexer;
-import com.google.caja.util.Maps;
+import com.google.common.collect.Maps;
import java.util.Map;
=======================================
--- /trunk/src/com/google/caja/parser/html/DoctypeMaker.java Fri Jun 22
16:42:32 2012 UTC
+++ /trunk/src/com/google/caja/parser/html/DoctypeMaker.java Tue Sep 24
18:19:56 2013 UTC
@@ -15,7 +15,7 @@
package com.google.caja.parser.html;
import com.google.caja.util.Function;
-import com.google.caja.util.Maps;
+import com.google.common.collect.ImmutableMap;
import com.google.caja.util.Strings;
import java.util.Map;
@@ -103,7 +103,7 @@
}
private static final Map<String, String> BY_SYSTEM_ID
- = Maps.<String, String>immutableMap()
+ = new ImmutableMap.Builder<String, String>()
.put("http://www.w3.org/TR/html4/*.dtd";,
Namespaces.HTML_NAMESPACE_URI)
.put("http://www.w3.org/TR/xhtml1/DTD/*.dtd";,
Namespaces.HTML_NAMESPACE_URI)
@@ -111,7 +111,7 @@
Namespaces.SVG_NAMESPACE_URI)
.put("http://www.w3.org/Graphics/SVG/1.1/DTD/*.dtd";,
Namespaces.SVG_NAMESPACE_URI)
- .create();
+ .build();
public static String systemIdToNsUri(String systemId) {
String nsUri = BY_SYSTEM_ID.get(systemId);
=======================================
--- /trunk/src/com/google/caja/parser/html/Html5ElementStack.java Fri Jun
22 16:42:32 2012 UTC
+++ /trunk/src/com/google/caja/parser/html/Html5ElementStack.java Tue Sep
24 18:19:56 2013 UTC
@@ -24,9 +24,9 @@
import com.google.caja.reporting.MessageQueue;
import com.google.caja.reporting.MessageType;
import com.google.caja.util.Lists;
-import com.google.caja.util.Maps;
import com.google.caja.util.Strings;
import com.google.common.collect.MapMaker;
+import com.google.common.collect.Maps;
import java.util.Collections;
import java.util.List;
=======================================
--- /trunk/src/com/google/caja/parser/js/JsonMLConverter.java Tue Jun 5
22:38:57 2012 UTC
+++ /trunk/src/com/google/caja/parser/js/JsonMLConverter.java Tue Sep 24
18:19:56 2013 UTC
@@ -21,7 +21,7 @@
import com.google.caja.parser.ParseTreeNodes;
import com.google.caja.parser.ParserBase;
import com.google.caja.util.Lists;
-import com.google.caja.util.Maps;
+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;
=======================================
--- /trunk/src/com/google/caja/parser/quasiliteral/AlphaRenaming.java Fri
Nov 18 20:29:44 2011 UTC
+++ /trunk/src/com/google/caja/parser/quasiliteral/AlphaRenaming.java Tue
Sep 24 18:19:56 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.Maps;
import com.google.caja.util.Sets;
+import com.google.common.collect.Maps;
import java.util.List;
import java.util.Map;
=======================================
---
/trunk/src/com/google/caja/parser/quasiliteral/AlphaRenamingRewriter.java
Fri Nov 18 20:29:44 2011 UTC
+++
/trunk/src/com/google/caja/parser/quasiliteral/AlphaRenamingRewriter.java
Tue Sep 24 18:19:56 2013 UTC
@@ -34,7 +34,7 @@
import com.google.caja.reporting.MessagePart;
import com.google.caja.reporting.MessageQueue;
import com.google.caja.util.Lists;
-import com.google.caja.util.Maps;
+import com.google.common.collect.Maps;
import java.util.Collections;
import java.util.List;
=======================================
--- /trunk/src/com/google/caja/parser/quasiliteral/NameContext.java Sat
Apr 9 06:31:20 2011 UTC
+++ /trunk/src/com/google/caja/parser/quasiliteral/NameContext.java Tue Sep
24 18:19:56 2013 UTC
@@ -18,7 +18,7 @@
import com.google.caja.lexer.FilePosition;
import com.google.caja.reporting.Message;
import com.google.caja.reporting.MessagePart;
-import com.google.caja.util.Maps;
+import com.google.common.collect.Maps;
import java.util.Collections;
import java.util.Iterator;
=======================================
--- /trunk/src/com/google/caja/parser/quasiliteral/QuasiCache.java Tue Dec
13 00:56:03 2011 UTC
+++ /trunk/src/com/google/caja/parser/quasiliteral/QuasiCache.java Tue Sep
24 18:19:56 2013 UTC
@@ -15,7 +15,7 @@
package com.google.caja.parser.quasiliteral;
import com.google.caja.lexer.ParseException;
-import com.google.caja.util.Maps;
+import com.google.common.collect.Maps;
import java.util.Map;
=======================================
--- /trunk/src/com/google/caja/parser/quasiliteral/Rule.java Fri Aug 9
20:06:48 2013 UTC
+++ /trunk/src/com/google/caja/parser/quasiliteral/Rule.java Tue Sep 24
18:19:56 2013 UTC
@@ -44,7 +44,7 @@
import com.google.caja.reporting.RenderContext;
import com.google.caja.util.Callback;
import com.google.caja.util.Lists;
-import com.google.caja.util.Maps;
+import com.google.common.collect.Maps;
import java.io.IOException;
import java.lang.reflect.Method;
=======================================
--- /trunk/src/com/google/caja/parser/quasiliteral/RuleFilter.java Thu Aug
8 00:39:21 2013 UTC
+++ /trunk/src/com/google/caja/parser/quasiliteral/RuleFilter.java Tue Sep
24 18:19:56 2013 UTC
@@ -15,7 +15,7 @@
package com.google.caja.parser.quasiliteral;
import com.google.caja.parser.ParseTreeNode;
-import com.google.caja.util.Maps;
+import com.google.common.collect.Maps;
import java.util.ArrayList;
import java.util.Collections;
=======================================
--- /trunk/src/com/google/caja/parser/quasiliteral/Scope.java Sun Jun 3
21:36:01 2012 UTC
+++ /trunk/src/com/google/caja/parser/quasiliteral/Scope.java Tue Sep 24
18:19:56 2013 UTC
@@ -40,9 +40,9 @@
import com.google.caja.reporting.MessagePart;
import com.google.caja.reporting.MessageType;
import com.google.caja.util.Lists;
-import com.google.caja.util.Maps;
import com.google.caja.util.Pair;
import com.google.caja.util.Sets;
+import com.google.common.collect.Maps;
import java.util.Arrays;
import java.util.Collections;
=======================================
--- /trunk/src/com/google/caja/parser/quasiliteral/opt/ScopeTree.java Sat
Feb 5 20:02:35 2011 UTC
+++ /trunk/src/com/google/caja/parser/quasiliteral/opt/ScopeTree.java Tue
Sep 24 18:19:56 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.Maps;
import com.google.caja.util.Sets;
+import com.google.common.collect.Maps;
import java.util.Collections;
import java.util.List;
=======================================
--- /trunk/src/com/google/caja/plugin/BuildServiceImplementation.java Thu
Aug 22 08:11:25 2013 UTC
+++ /trunk/src/com/google/caja/plugin/BuildServiceImplementation.java Tue
Sep 24 18:19:56 2013 UTC
@@ -51,9 +51,9 @@
import com.google.caja.util.Charsets;
import com.google.caja.util.FileIO;
import com.google.caja.util.Lists;
-import com.google.caja.util.Maps;
import com.google.caja.util.Pair;
import com.google.caja.util.Sets;
+import com.google.common.collect.Maps;
import java.io.File;
import java.io.FileInputStream;
=======================================
--- /trunk/src/com/google/caja/plugin/PluginCompilerMain.java Sat Sep 21
22:20:38 2013 UTC
+++ /trunk/src/com/google/caja/plugin/PluginCompilerMain.java Tue Sep 24
18:19:56 2013 UTC
@@ -38,7 +38,7 @@
import com.google.caja.reporting.SimpleMessageQueue;
import com.google.caja.util.Callback;
import com.google.caja.util.Charsets;
-import com.google.caja.util.Maps;
+import com.google.common.collect.Maps;
import java.io.BufferedReader;
import java.io.File;
=======================================
--- /trunk/src/com/google/caja/plugin/stages/RewriteFlashStage.java Thu
Aug 8 00:39:21 2013 UTC
+++ /trunk/src/com/google/caja/plugin/stages/RewriteFlashStage.java Tue Sep
24 18:19:56 2013 UTC
@@ -42,9 +42,9 @@
import com.google.caja.reporting.MessageType;
import com.google.caja.reporting.MessageTypeInt;
import com.google.caja.util.ContentType;
-import com.google.caja.util.Maps;
import com.google.caja.util.Pipeline;
import com.google.caja.util.Strings;
+import com.google.common.collect.Maps;
/**
* This searches for Flash embeds in unsanitized html and rewrites them.
=======================================
--- /trunk/src/com/google/caja/plugin/stages/ValidateJavascriptStage.java
Thu Aug 8 00:39:21 2013 UTC
+++ /trunk/src/com/google/caja/plugin/stages/ValidateJavascriptStage.java
Tue Sep 24 18:19:56 2013 UTC
@@ -27,8 +27,8 @@
import com.google.caja.plugin.JobEnvelope;
import com.google.caja.plugin.Jobs;
import com.google.caja.util.ContentType;
-import com.google.caja.util.Maps;
import com.google.caja.util.Pipeline;
+import com.google.common.collect.Maps;
import java.util.ListIterator;
import java.util.Map;
=======================================
--- /trunk/src/com/google/caja/plugin/templates/HtmlAttributeRewriter.java
Mon Jul 15 20:10:17 2013 UTC
+++ /trunk/src/com/google/caja/plugin/templates/HtmlAttributeRewriter.java
Tue Sep 24 18:19:56 2013 UTC
@@ -57,8 +57,8 @@
import com.google.caja.reporting.MessagePart;
import com.google.caja.reporting.MessageQueue;
import com.google.caja.util.Lists;
-import com.google.caja.util.Maps;
import com.google.caja.util.SyntheticAttributeKey;
+import com.google.common.collect.Maps;
import org.w3c.dom.Attr;
import java.net.URI;
=======================================
--- /trunk/src/com/google/caja/plugin/templates/SafeHtmlMaker.java Thu Aug
8 00:39:21 2013 UTC
+++ /trunk/src/com/google/caja/plugin/templates/SafeHtmlMaker.java Tue Sep
24 18:19:56 2013 UTC
@@ -40,9 +40,9 @@
import com.google.caja.plugin.stages.JobCache;
import com.google.caja.reporting.MessageContext;
import com.google.caja.util.Lists;
-import com.google.caja.util.Maps;
import com.google.caja.util.Pair;
import com.google.caja.util.Sets;
+import com.google.common.collect.Maps;
import java.util.List;
import java.util.Map;
=======================================
--- /trunk/src/com/google/caja/plugin/templates/TemplateCompiler.java Sun
Jun 3 21:36:01 2012 UTC
+++ /trunk/src/com/google/caja/plugin/templates/TemplateCompiler.java Tue
Sep 24 18:19:56 2013 UTC
@@ -32,8 +32,8 @@
import com.google.caja.reporting.MessageLevel;
import com.google.caja.reporting.MessageQueue;
import com.google.caja.util.Lists;
-import com.google.caja.util.Maps;
import com.google.caja.util.Pair;
+import com.google.common.collect.Maps;
import java.util.List;
import java.util.Map;
=======================================
--- /trunk/src/com/google/caja/precajole/StaticPrecajoleMap.java Fri Aug 9
20:06:48 2013 UTC
+++ /trunk/src/com/google/caja/precajole/StaticPrecajoleMap.java Tue Sep 24
18:19:56 2013 UTC
@@ -17,8 +17,8 @@
import com.google.caja.SomethingWidgyHappenedError;
import com.google.caja.parser.js.CajoledModule;
import com.google.caja.util.Lists;
-import com.google.caja.util.Maps;
import com.google.caja.util.Strings;
+import com.google.common.collect.Maps;
import com.google.common.io.ByteStreams;
import com.google.common.io.Files;
=======================================
--- /trunk/src/com/google/caja/service/AbstractCajolingHandler.java Tue Sep
24 17:39:42 2013 UTC
+++ /trunk/src/com/google/caja/service/AbstractCajolingHandler.java Tue Sep
24 18:19:56 2013 UTC
@@ -35,7 +35,7 @@
import com.google.caja.reporting.SimpleMessageQueue;
import com.google.caja.util.ContentType;
import com.google.caja.util.Json;
-import com.google.caja.util.Maps;
+import com.google.common.collect.Maps;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.w3c.dom.Node;
=======================================
--- /trunk/src/com/google/caja/util/Bag.java Mon Jul 15 21:11:53 2013 UTC
+++ /trunk/src/com/google/caja/util/Bag.java Tue Sep 24 18:19:56 2013 UTC
@@ -14,7 +14,8 @@
package com.google.caja.util;
-import java.util.Comparator;
+import com.google.common.collect.Maps;
+
import java.util.Map;
import java.util.Set;
@@ -29,9 +30,6 @@
public static <T extends Comparable<T>> Bag<T> newTreeBag() {
return new Bag<T>(Maps.<T, Integer>newTreeMap());
}
- public static <T> Bag<T> newTreeBag(Comparator<T> cmp) {
- return new Bag<T>(Maps.<T, Integer>newTreeMap(cmp));
- }
public static <T> Bag<T> newIdentityHashBag() {
return new Bag<T>(Maps.<T, Integer>newIdentityHashMap());
}
=======================================
--- /trunk/src/com/google/caja/util/ContentType.java Fri Jun 22 16:42:32
2012 UTC
+++ /trunk/src/com/google/caja/util/ContentType.java Tue Sep 24 18:19:56
2013 UTC
@@ -14,7 +14,7 @@
package com.google.caja.util;
-import com.google.caja.util.Maps;
+import com.google.common.collect.ImmutableMap;
import com.google.caja.util.Strings;
import java.util.Map;
@@ -44,7 +44,7 @@
}
private static final Map<String, ContentType> MIME_TYPES
- = Maps.<String, ContentType>immutableMap()
+ = new ImmutableMap.Builder<String, ContentType>()
// From http://krijnhoetmer.nl/stuff/javascript/mime-types/ and
others.
.put("text/javascript", ContentType.JS)
.put("application/x-javascript", ContentType.JS)
@@ -60,7 +60,7 @@
.put("application/x-winzip", ContentType.ZIP)
.put("application/zip", ContentType.ZIP)
.put("application/x-java-archive", ContentType.ZIP)
- .create();
+ .build();
public static ContentType fromMimeType(String mimeType) {
int end = mimeType.indexOf(';');
=======================================
--- /trunk/src/com/google/caja/util/Maps.java Sat Sep 4 00:29:26 2010 UTC
+++ /trunk/src/com/google/caja/util/Maps.java Tue Sep 24 18:19:56 2013 UTC
@@ -26,10 +26,9 @@
/**
* Shortcuts for creating maps.
- * 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.Maps from Guava instead
*/
+@Deprecated
public final class Maps {
public static <K, V>
Map<K, V> newHashMap() {
=======================================
--- /trunk/src/com/google/caja/util/Multimaps.java Wed Sep 2 22:23:09 2009
UTC
+++ /trunk/src/com/google/caja/util/Multimaps.java Tue Sep 24 18:19:56 2013
UTC
@@ -14,6 +14,8 @@
package com.google.caja.util;
+import com.google.common.collect.Maps;
+
import java.util.Collection;
import java.util.Collections;
import java.util.List;
=======================================
--- /trunk/tests/com/google/caja/ancillary/opt/EnvironmentChecksTest.java
Tue Oct 27 01:40:33 2009 UTC
+++ /trunk/tests/com/google/caja/ancillary/opt/EnvironmentChecksTest.java
Tue Sep 24 18:19:56 2013 UTC
@@ -15,9 +15,9 @@
package com.google.caja.ancillary.opt;
import com.google.caja.util.CajaTestCase;
-import com.google.caja.util.Maps;
import com.google.caja.util.RhinoExecutor;
import com.google.caja.util.RhinoTestBed;
+import com.google.common.collect.Maps;
import java.util.Map;
=======================================
--- /trunk/tests/com/google/caja/parser/ParserContextTest.java Thu Aug 8
19:36:28 2013 UTC
+++ /trunk/tests/com/google/caja/parser/ParserContextTest.java Tue Sep 24
18:19:56 2013 UTC
@@ -28,8 +28,8 @@
import com.google.caja.reporting.DevNullMessageQueue;
import com.google.caja.util.CajaTestCase;
import com.google.caja.util.ContentType;
-import com.google.caja.util.Maps;
import com.google.caja.util.TestUtil;
+import com.google.common.collect.Maps;
/**
* @author [email protected] (Jasvir Nagra)
=======================================
--- /trunk/tests/com/google/caja/parser/html/DomMembrane.java Tue Feb 14
22:47:05 2012 UTC
+++ /trunk/tests/com/google/caja/parser/html/DomMembrane.java Tue Sep 24
18:19:56 2013 UTC
@@ -14,7 +14,7 @@
package com.google.caja.parser.html;
-import com.google.caja.util.Maps;
+import com.google.common.collect.Maps;
import java.util.Map;
=======================================
--- /trunk/tests/com/google/caja/parser/quasiliteral/ModuleFormatTest.java
Thu Aug 8 19:36:28 2013 UTC
+++ /trunk/tests/com/google/caja/parser/quasiliteral/ModuleFormatTest.java
Tue Sep 24 18:19:56 2013 UTC
@@ -32,7 +32,7 @@
import com.google.caja.reporting.TestBuildInfo;
import com.google.caja.util.CajaTestCase;
import com.google.caja.util.Callback;
-import com.google.caja.util.Maps;
+import com.google.common.collect.Maps;
import java.io.IOException;
=======================================
--- /trunk/tests/com/google/caja/plugin/PipelineCacheTest.java Thu Aug 8
00:39:21 2013 UTC
+++ /trunk/tests/com/google/caja/plugin/PipelineCacheTest.java Tue Sep 24
18:19:56 2013 UTC
@@ -33,9 +33,9 @@
import com.google.caja.util.ContentType;
import com.google.caja.util.Join;
import com.google.caja.util.Lists;
-import com.google.caja.util.Maps;
import com.google.caja.util.Pipeline;
import com.google.caja.util.Sets;
+import com.google.common.collect.Maps;
import java.net.URI;
import java.util.Collections;
=======================================
--- /trunk/tests/com/google/caja/render/OrigSourceRendererTestCase.java Fri
Aug 9 20:06:48 2013 UTC
+++ /trunk/tests/com/google/caja/render/OrigSourceRendererTestCase.java Tue
Sep 24 18:19:56 2013 UTC
@@ -20,8 +20,8 @@
import com.google.caja.lexer.TokenConsumer;
import com.google.caja.reporting.MessageContext;
import com.google.caja.reporting.RenderContext;
-import com.google.caja.util.Maps;
import com.google.caja.util.TestUtil;
+import com.google.common.collect.Maps;
import java.io.IOException;
import java.net.URI;
=======================================
--- /trunk/tests/com/google/caja/reporting/SnippetProducerTest.java Mon
Nov 2 21:56:19 2009 UTC
+++ /trunk/tests/com/google/caja/reporting/SnippetProducerTest.java Tue Sep
24 18:19:56 2013 UTC
@@ -17,7 +17,7 @@
import com.google.caja.lexer.CharProducer;
import com.google.caja.lexer.FilePosition;
import com.google.caja.lexer.InputSource;
-import com.google.caja.util.Maps;
+import com.google.common.collect.Maps;
import java.io.IOException;
import java.io.StringReader;
=======================================
--- /trunk/tests/com/google/caja/service/ServiceTestCase.java Sat Sep 21
22:20:38 2013 UTC
+++ /trunk/tests/com/google/caja/service/ServiceTestCase.java Tue Sep 24
18:19:56 2013 UTC
@@ -17,13 +17,13 @@
import com.google.caja.SomethingWidgyHappenedError;
import com.google.caja.util.CajaTestCase;
import com.google.caja.util.Charsets;
-import com.google.caja.util.Maps;
import com.google.caja.lexer.ExternalReference;
import com.google.caja.lexer.FetchedData;
import com.google.caja.lexer.InputSource;
import com.google.caja.plugin.UriFetcher;
import com.google.caja.reporting.MessageLevel;
import com.google.caja.reporting.TestBuildInfo;
+import com.google.common.collect.Maps;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
=======================================
--- /trunk/tests/com/google/caja/service/TestHttpServletRequest.java Fri
Jun 22 16:42:32 2012 UTC
+++ /trunk/tests/com/google/caja/service/TestHttpServletRequest.java Tue
Sep 24 18:19:56 2013 UTC
@@ -15,8 +15,9 @@
package com.google.caja.service;
import com.google.caja.SomethingWidgyHappenedError;
-import com.google.caja.util.Maps;
import com.google.caja.util.Strings;
+import com.google.common.collect.Maps;
+
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.UnsupportedEncodingException;
=======================================
--- /trunk/tests/com/google/caja/service/TestHttpServletResponse.java Wed
Feb 20 01:00:43 2013 UTC
+++ /trunk/tests/com/google/caja/service/TestHttpServletResponse.java Tue
Sep 24 18:19:56 2013 UTC
@@ -15,8 +15,8 @@
package com.google.caja.service;
import com.google.caja.SomethingWidgyHappenedError;
-import com.google.caja.util.Maps;
import com.google.caja.util.Strings;
+import com.google.common.collect.Maps;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -40,7 +40,7 @@
*/
public final class TestHttpServletResponse implements HttpServletResponse {
private int status = 200;
- private Map<String, String> headers = Maps.newLinkedHashMap();
+ private final Map<String, String> headers = Maps.newLinkedHashMap();
private Object output;
public void addCookie(Cookie a) { throw new
UnsupportedOperationException(); }
public boolean containsHeader(String n) { return headers.containsKey(n);
}
=======================================
--- /trunk/tests/com/google/caja/util/CollectionsTest.java Thu Aug 8
19:36:28 2013 UTC
+++ /trunk/tests/com/google/caja/util/CollectionsTest.java Tue Sep 24
18:19:56 2013 UTC
@@ -14,6 +14,8 @@
package com.google.caja.util;
+import com.google.common.collect.Maps;
+
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
=======================================
***Additional files exist in this changeset.***
--
---
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.
