Revision: 5606
Author: [email protected]
Date: Tue Sep 24 20:06:05 2013 UTC
Log: deprecate com.google.caja.util.Lists
https://codereview.appspot.com/13705046
similar to the recent change deprecating ...util.Maps
R=kpreid2
http://code.google.com/p/google-caja/source/detail?r=5606
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/LexicalScope.java
/trunk/src/com/google/caja/ancillary/linter/Linter.java
/trunk/src/com/google/caja/ancillary/linter/ScopeAnalyzer.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/JsOptimizer.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/ancillary/opt/VarCollector.java
/trunk/src/com/google/caja/demos/playground/server/AppEngineJobCache.java
/trunk/src/com/google/caja/demos/playground/server/AppEngineJobCacheKeys.java
/trunk/src/com/google/caja/demos/playground/server/GWTCajolingServiceImpl.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/HTML.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/CssLexer.java
/trunk/src/com/google/caja/lexer/escaping/Escaping.java
/trunk/src/com/google/caja/lexer/escaping/UriUtil.java
/trunk/src/com/google/caja/parser/AbstractParseTreeNode.java
/trunk/src/com/google/caja/parser/css/CssParser.java
/trunk/src/com/google/caja/parser/html/AbstractElementStack.java
/trunk/src/com/google/caja/parser/html/DomParser.java
/trunk/src/com/google/caja/parser/html/Html5ElementStack.java
/trunk/src/com/google/caja/parser/js/JsonMLCompatible.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/PlainModule.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/AlphaRenamingRewriter.java
/trunk/src/com/google/caja/parser/quasiliteral/ES53Rewriter.java
/trunk/src/com/google/caja/parser/quasiliteral/MultiPropertyQuasi.java
/trunk/src/com/google/caja/parser/quasiliteral/ObjectCtorQuasiNode.java
/trunk/src/com/google/caja/parser/quasiliteral/QuasiBuilder.java
/trunk/src/com/google/caja/parser/quasiliteral/QuasiNode.java
/trunk/src/com/google/caja/parser/quasiliteral/Rule.java
/trunk/src/com/google/caja/parser/quasiliteral/Scope.java
/trunk/src/com/google/caja/parser/quasiliteral/SimpleQuasiNode.java
/trunk/src/com/google/caja/parser/quasiliteral/SinglePropertyQuasi.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/CssDynamicExpressionRewriter.java
/trunk/src/com/google/caja/plugin/CssRewriter.java
/trunk/src/com/google/caja/plugin/Jobs.java
/trunk/src/com/google/caja/plugin/PipelineMaker.java
/trunk/src/com/google/caja/plugin/Planner.java
/trunk/src/com/google/caja/plugin/PluginCompiler.java
/trunk/src/com/google/caja/plugin/UriFetcher.java
/trunk/src/com/google/caja/plugin/stages/CompileHtmlStage.java
/trunk/src/com/google/caja/plugin/stages/ConsolidateCodeStage.java
/trunk/src/com/google/caja/plugin/stages/HtmlEmbeddedContentFinder.java
/trunk/src/com/google/caja/plugin/stages/InlineCssImportsStage.java
/trunk/src/com/google/caja/plugin/stages/LegacyNamespaceFixupStage.java
/trunk/src/com/google/caja/plugin/stages/PipelineStoreStage.java
/trunk/src/com/google/caja/plugin/stages/RewriteHtmlStage.java
/trunk/src/com/google/caja/plugin/stages/StubJobCache.java
/trunk/src/com/google/caja/plugin/templates/HtmlAttributeRewriter.java
/trunk/src/com/google/caja/plugin/templates/SafeCssMaker.java
/trunk/src/com/google/caja/plugin/templates/SafeHtmlMaker.java
/trunk/src/com/google/caja/plugin/templates/TemplateCompiler.java
/trunk/src/com/google/caja/plugin/templates/TemplateSanitizer.java
/trunk/src/com/google/caja/precajole/StaticPrecajoleMap.java
/trunk/src/com/google/caja/render/BufferingRenderer.java
/trunk/src/com/google/caja/render/CssPrettyPrinter.java
/trunk/src/com/google/caja/render/JsMinimalPrinter.java
/trunk/src/com/google/caja/service/CajolingService.java
/trunk/src/com/google/caja/tools/AbstractCajaAntTask.java
/trunk/src/com/google/caja/tracing/TracingRewriter.java
/trunk/src/com/google/caja/util/Lists.java
/trunk/src/com/google/caja/util/Multimaps.java
/trunk/tests/com/google/caja/ancillary/linter/LinterTest.java
/trunk/tests/com/google/caja/ancillary/opt/ParseTreeKBTest.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/ParseTreeNodeTest.java
/trunk/tests/com/google/caja/parser/html/DomParserTest.java
/trunk/tests/com/google/caja/parser/html/Html5ElementStackTest.java
/trunk/tests/com/google/caja/parser/html/NodesTest.java
/trunk/tests/com/google/caja/parser/js/scope/ScopeAnalyzerTest.java
/trunk/tests/com/google/caja/parser/quasiliteral/ES53ConformanceTest.java
/trunk/tests/com/google/caja/parser/quasiliteral/ES53RewriterTest.java
/trunk/tests/com/google/caja/plugin/CssRewriterTest.java
/trunk/tests/com/google/caja/plugin/CssValidatorTest.java
/trunk/tests/com/google/caja/plugin/HtmlEmitterTest.java
/trunk/tests/com/google/caja/plugin/PipelineCacheTest.java
/trunk/tests/com/google/caja/plugin/PipelineMakerTest.java
/trunk/tests/com/google/caja/plugin/stages/LegacyNamespaceFixupStageTest.java
/trunk/tests/com/google/caja/plugin/stages/PipelineStageTestCase.java
/trunk/tests/com/google/caja/plugin/templates/TemplateCompilerTest.java
/trunk/tests/com/google/caja/tracing/TracingRewriterTest.java
=======================================
--- /trunk/src/com/google/caja/ancillary/linter/ErrorReporter.java Tue Sep
24 18:19:56 2013 UTC
+++ /trunk/src/com/google/caja/ancillary/linter/ErrorReporter.java Tue Sep
24 20:06:05 2013 UTC
@@ -23,7 +23,7 @@
import com.google.caja.reporting.MessageQueue;
import com.google.caja.reporting.MessageTypeInt;
import com.google.caja.reporting.SnippetProducer;
-import com.google.caja.util.Lists;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import java.io.IOException;
=======================================
--- /trunk/src/com/google/caja/ancillary/linter/ExitModes.java Tue Sep 24
19:27:18 2013 UTC
+++ /trunk/src/com/google/caja/ancillary/linter/ExitModes.java Tue Sep 24
20:06:05 2013 UTC
@@ -26,7 +26,7 @@
import com.google.caja.parser.js.ReturnStmt;
import com.google.caja.parser.js.Statement;
import com.google.caja.parser.js.ThrowStmt;
-import com.google.caja.util.Lists;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
=======================================
--- /trunk/src/com/google/caja/ancillary/linter/LexicalScope.java Tue Dec
1 04:14:27 2009 UTC
+++ /trunk/src/com/google/caja/ancillary/linter/LexicalScope.java Tue Sep
24 20:06:05 2013 UTC
@@ -18,7 +18,7 @@
import com.google.caja.parser.js.CatchStmt;
import com.google.caja.parser.js.FunctionConstructor;
import com.google.caja.parser.js.WithStmt;
-import com.google.caja.util.Lists;
+import com.google.common.collect.Lists;
import java.util.List;
=======================================
--- /trunk/src/com/google/caja/ancillary/linter/Linter.java Tue Sep 24
19:27:18 2013 UTC
+++ /trunk/src/com/google/caja/ancillary/linter/Linter.java Tue Sep 24
20:06:05 2013 UTC
@@ -62,10 +62,10 @@
import com.google.caja.reporting.SimpleMessageQueue;
import com.google.caja.tools.BuildCommand;
import com.google.caja.util.Charsets;
-import com.google.caja.util.Lists;
import com.google.caja.util.Pair;
import com.google.caja.util.Strings;
import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
=======================================
--- /trunk/src/com/google/caja/ancillary/linter/ScopeAnalyzer.java Tue Sep
24 19:27:18 2013 UTC
+++ /trunk/src/com/google/caja/ancillary/linter/ScopeAnalyzer.java Tue Sep
24 20:06:05 2013 UTC
@@ -25,9 +25,9 @@
import com.google.caja.parser.js.Operator;
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.SyntheticAttributeKey;
import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
import java.util.Collection;
import java.util.Collections;
=======================================
--- /trunk/src/com/google/caja/ancillary/linter/SymbolTable.java Tue Sep 24
18:19:56 2013 UTC
+++ /trunk/src/com/google/caja/ancillary/linter/SymbolTable.java Tue Sep 24
20:06:05 2013 UTC
@@ -16,7 +16,7 @@
import com.google.caja.parser.AncestorChain;
import com.google.caja.parser.js.Declaration;
-import com.google.caja.util.Lists;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import java.util.Collection;
=======================================
--- /trunk/src/com/google/caja/ancillary/opt/ConstLocalOptimization.java
Tue Sep 24 19:27:18 2013 UTC
+++ /trunk/src/com/google/caja/ancillary/opt/ConstLocalOptimization.java
Tue Sep 24 20:06:05 2013 UTC
@@ -41,7 +41,7 @@
import com.google.caja.parser.js.scope.ES5ScopeAnalyzer;
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.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
=======================================
--- /trunk/src/com/google/caja/ancillary/opt/ConstantPooler.java Tue Sep 24
18:19:56 2013 UTC
+++ /trunk/src/com/google/caja/ancillary/opt/ConstantPooler.java Tue Sep 24
20:06:05 2013 UTC
@@ -32,7 +32,7 @@
import com.google.caja.parser.js.Statement;
import com.google.caja.parser.js.StringLiteral;
import com.google.caja.reporting.RenderContext;
-import com.google.caja.util.Lists;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import java.util.Collections;
=======================================
--- /trunk/src/com/google/caja/ancillary/opt/JsOptimizer.java Thu Aug 8
00:39:21 2013 UTC
+++ /trunk/src/com/google/caja/ancillary/opt/JsOptimizer.java Tue Sep 24
20:06:05 2013 UTC
@@ -37,7 +37,7 @@
import com.google.caja.reporting.PropertyNameQuotingMode;
import com.google.caja.reporting.RenderContext;
import com.google.caja.reporting.SimpleMessageQueue;
-import com.google.caja.util.Lists;
+import com.google.common.collect.Lists;
import java.io.File;
import java.io.IOException;
=======================================
--- /trunk/src/com/google/caja/ancillary/opt/ParseTreeKB.java Tue Sep 24
19:27:18 2013 UTC
+++ /trunk/src/com/google/caja/ancillary/opt/ParseTreeKB.java Tue Sep 24
20:06:05 2013 UTC
@@ -38,8 +38,8 @@
import com.google.caja.parser.quasiliteral.Rewriter;
import com.google.caja.parser.quasiliteral.Scope;
import com.google.caja.reporting.MessageQueue;
-import com.google.caja.util.Lists;
import com.google.caja.util.Pair;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -509,7 +509,7 @@
int nEmitted = i;
List<ParseTreeNode> newChildren = null;
if (i != 0) {
- newChildren = Lists.newArrayList(n);
+ newChildren = Lists.newArrayListWithCapacity(n);
}
while (i < n) {
ParseTreeNode child = children.get(i);
@@ -519,7 +519,9 @@
Boolean optCond = (i & 1) == 0 && i + 1 < n
? ((Expression) newChild).conditionResult() : null;
if (optCond != null || child != newChild) {
- if (newChildren == null) { newChildren = Lists.newArrayList(n); }
+ if (newChildren == null) {
+ newChildren = Lists.newArrayListWithCapacity(n);
+ }
newChildren.addAll(children.subList(nEmitted, i));
if (optCond != null) { // The condition is known, so we can
remove it.
Expression sideEffect = ((Expression) newChild)
=======================================
--- /trunk/src/com/google/caja/ancillary/opt/ScopeInfo.java Tue Sep 24
19:27:18 2013 UTC
+++ /trunk/src/com/google/caja/ancillary/opt/ScopeInfo.java Tue Sep 24
20:06:05 2013 UTC
@@ -22,7 +22,7 @@
import com.google.caja.parser.quasiliteral.Rewriter;
import com.google.caja.parser.quasiliteral.Scope;
import com.google.caja.reporting.MessageQueue;
-import com.google.caja.util.Lists;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
=======================================
--- /trunk/src/com/google/caja/ancillary/opt/StatementSimplifier.java Tue
Sep 24 18:19:56 2013 UTC
+++ /trunk/src/com/google/caja/ancillary/opt/StatementSimplifier.java Tue
Sep 24 20:06:05 2013 UTC
@@ -51,8 +51,8 @@
import com.google.caja.reporting.MessagePart;
import com.google.caja.reporting.MessageQueue;
import com.google.caja.reporting.MessageType;
-import com.google.caja.util.Lists;
import com.google.caja.util.SafeIdentifierMaker;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import java.util.Arrays;
@@ -201,7 +201,7 @@
ParseTreeNode newChild = optimize(child, childNeedsBlock);
if (child != newChild) {
if (newChildren == null) {
- newChildren = Lists.newArrayList(nChildren);
+ newChildren = Lists.newArrayListWithCapacity(nChildren);
}
newChildren.addAll(children.subList(newChildren.size(), i));
newChildren.add(newChild);
@@ -279,7 +279,9 @@
ParseTreeNode s = stmts.get(i);
ParseTreeNode optS = optimize(s, false);
if (s != optS || optS instanceof Noop || optS instanceof Block) {
- if (newStmts == null) { newStmts = Lists.newArrayList(nStmts); }
+ if (newStmts == null) {
+ newStmts = Lists.newArrayListWithCapacity(nStmts);
+ }
newStmts.addAll(stmts.subList(pos, i));
if (optS instanceof Block) {
newStmts.addAll(((Block) optS).children());
=======================================
--- /trunk/src/com/google/caja/ancillary/opt/VarCollector.java Tue Sep 24
19:27:18 2013 UTC
+++ /trunk/src/com/google/caja/ancillary/opt/VarCollector.java Tue Sep 24
20:06:05 2013 UTC
@@ -36,8 +36,8 @@
import com.google.caja.parser.js.Operator;
import com.google.caja.parser.js.Reference;
import com.google.caja.parser.js.Statement;
-import com.google.caja.util.Lists;
import com.google.caja.util.Pair;
+import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import java.util.Collections;
=======================================
---
/trunk/src/com/google/caja/demos/playground/server/AppEngineJobCache.java
Thu Aug 8 00:39:21 2013 UTC
+++
/trunk/src/com/google/caja/demos/playground/server/AppEngineJobCache.java
Tue Sep 24 20:06:05 2013 UTC
@@ -18,7 +18,7 @@
import com.google.caja.plugin.Job;
import com.google.caja.plugin.stages.JobCache;
import com.google.caja.util.ContentType;
-import com.google.caja.util.Lists;
+import com.google.common.collect.Lists;
import java.io.IOException;
import java.io.ObjectOutputStream;
=======================================
---
/trunk/src/com/google/caja/demos/playground/server/AppEngineJobCacheKeys.java
Tue Sep 24 19:27:18 2013 UTC
+++
/trunk/src/com/google/caja/demos/playground/server/AppEngineJobCacheKeys.java
Tue Sep 24 20:06:05 2013 UTC
@@ -15,7 +15,7 @@
package com.google.caja.demos.playground.server;
import com.google.caja.plugin.stages.JobCache;
-import com.google.caja.util.Lists;
+import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import java.util.ArrayList;
=======================================
---
/trunk/src/com/google/caja/demos/playground/server/GWTCajolingServiceImpl.java
Fri Aug 9 20:06:48 2013 UTC
+++
/trunk/src/com/google/caja/demos/playground/server/GWTCajolingServiceImpl.java
Tue Sep 24 20:06:05 2013 UTC
@@ -45,7 +45,7 @@
import com.google.caja.reporting.RenderContext;
import com.google.caja.reporting.SimpleMessageQueue;
import com.google.caja.reporting.SnippetProducer;
-import com.google.caja.util.Lists;
+import com.google.common.collect.Lists;
import com.google.gwt.user.server.rpc.RemoteServiceServlet;
import java.io.IOException;
=======================================
--- /trunk/src/com/google/caja/lang/css/CssPropertyPatterns.java Tue Sep 24
19:27:18 2013 UTC
+++ /trunk/src/com/google/caja/lang/css/CssPropertyPatterns.java Tue Sep 24
20:06:05 2013 UTC
@@ -46,12 +46,12 @@
import com.google.caja.tools.BuildCommand;
import com.google.caja.util.Bag;
import com.google.caja.util.Charsets;
-import com.google.caja.util.Lists;
import com.google.caja.util.Name;
import com.google.caja.util.Pair;
import com.google.caja.util.Strings;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
=======================================
--- /trunk/src/com/google/caja/lang/css/Partitions.java Tue Sep 24 18:19:56
2013 UTC
+++ /trunk/src/com/google/caja/lang/css/Partitions.java Tue Sep 24 20:06:05
2013 UTC
@@ -15,7 +15,7 @@
package com.google.caja.lang.css;
import com.google.caja.util.Bag;
-import com.google.caja.util.Lists;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import java.lang.reflect.Array;
=======================================
--- /trunk/src/com/google/caja/lang/html/HTML.java Tue Nov 13 18:21:28 2012
UTC
+++ /trunk/src/com/google/caja/lang/html/HTML.java Tue Sep 24 20:06:05 2013
UTC
@@ -18,7 +18,7 @@
import com.google.caja.parser.html.ElKey;
import com.google.caja.plugin.LoaderType;
import com.google.caja.plugin.UriEffect;
-import com.google.caja.util.Lists;
+import com.google.common.collect.Lists;
import java.util.Collections;
import java.util.List;
=======================================
--- /trunk/src/com/google/caja/lang/html/HtmlDefinitions.java Tue Sep 24
18:19:56 2013 UTC
+++ /trunk/src/com/google/caja/lang/html/HtmlDefinitions.java Tue Sep 24
20:06:05 2013 UTC
@@ -61,7 +61,7 @@
import com.google.caja.tools.BuildCommand;
import com.google.caja.util.Charsets;
import com.google.caja.util.Function;
-import com.google.caja.util.Lists;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
/**
=======================================
--- /trunk/src/com/google/caja/lang/html/HtmlSchema.java Tue Sep 24
19:27:18 2013 UTC
+++ /trunk/src/com/google/caja/lang/html/HtmlSchema.java Tue Sep 24
20:06:05 2013 UTC
@@ -26,11 +26,11 @@
import com.google.caja.reporting.Message;
import com.google.caja.reporting.MessageQueue;
import com.google.caja.reporting.SimpleMessageQueue;
-import com.google.caja.util.Lists;
import com.google.caja.util.Multimap;
import com.google.caja.util.Multimaps;
import com.google.caja.util.Pair;
import com.google.caja.util.Strings;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
=======================================
--- /trunk/src/com/google/caja/lexer/CssLexer.java Thu Aug 8 00:39:21 2013
UTC
+++ /trunk/src/com/google/caja/lexer/CssLexer.java Tue Sep 24 20:06:05 2013
UTC
@@ -19,8 +19,8 @@
import com.google.caja.reporting.MessagePart;
import com.google.caja.reporting.MessageQueue;
import com.google.caja.reporting.MessageType;
-import com.google.caja.util.Lists;
import com.google.caja.util.Strings;
+import com.google.common.collect.Lists;
import java.util.LinkedList;
import java.util.NoSuchElementException;
=======================================
--- /trunk/src/com/google/caja/lexer/escaping/Escaping.java Thu Aug 8
00:39:21 2013 UTC
+++ /trunk/src/com/google/caja/lexer/escaping/Escaping.java Tue Sep 24
20:06:05 2013 UTC
@@ -15,8 +15,8 @@
package com.google.caja.lexer.escaping;
import com.google.caja.SomethingWidgyHappenedError;
-import com.google.caja.util.Lists;
import com.google.caja.util.SparseBitSet;
+import com.google.common.collect.Lists;
import java.io.IOException;
import java.util.List;
=======================================
--- /trunk/src/com/google/caja/lexer/escaping/UriUtil.java Fri Jun 22
16:42:32 2012 UTC
+++ /trunk/src/com/google/caja/lexer/escaping/UriUtil.java Tue Sep 24
20:06:05 2013 UTC
@@ -16,8 +16,8 @@
import com.google.caja.SomethingWidgyHappenedError;
import com.google.caja.util.Join;
-import com.google.caja.util.Lists;
import com.google.caja.util.Strings;
+import com.google.common.collect.Lists;
import java.io.IOException;
import java.net.URI;
=======================================
--- /trunk/src/com/google/caja/parser/AbstractParseTreeNode.java Tue Jun 12
00:16:11 2012 UTC
+++ /trunk/src/com/google/caja/parser/AbstractParseTreeNode.java Tue Sep 24
20:06:05 2013 UTC
@@ -20,9 +20,9 @@
import com.google.caja.reporting.MessageContext;
import com.google.caja.reporting.MessagePart;
import com.google.caja.util.Join;
-import com.google.caja.util.Lists;
import com.google.caja.util.SyntheticAttributeKey;
import com.google.caja.util.SyntheticAttributes;
+import com.google.common.collect.Lists;
import java.io.IOException;
import java.io.Serializable;
=======================================
--- /trunk/src/com/google/caja/parser/css/CssParser.java Wed Jun 12
19:17:07 2013 UTC
+++ /trunk/src/com/google/caja/parser/css/CssParser.java Tue Sep 24
20:06:05 2013 UTC
@@ -30,9 +30,9 @@
import com.google.caja.reporting.MessageType;
import com.google.caja.reporting.MessageTypeInt;
import com.google.caja.util.Criterion;
-import com.google.caja.util.Lists;
import com.google.caja.util.Name;
import com.google.caja.util.Strings;
+import com.google.common.collect.Lists;
import java.net.URI;
import java.net.URISyntaxException;
@@ -670,7 +670,7 @@
SKIP_TO_CHUNK_END_FROM_WITHIN_BLOCK.recover(this, m);
return null;
}
- List<CssTree> children = Lists.newArrayList(3);
+ List<CssTree> children = Lists.newArrayListWithCapacity(3);
children.add(property);
if (expect(":", SKIP_TO_CHUNK_END_FROM_WITHIN_BLOCK, m)) {
return null;
=======================================
--- /trunk/src/com/google/caja/parser/html/AbstractElementStack.java Thu
Aug 8 00:39:21 2013 UTC
+++ /trunk/src/com/google/caja/parser/html/AbstractElementStack.java Tue
Sep 24 20:06:05 2013 UTC
@@ -18,7 +18,7 @@
import com.google.caja.reporting.MessagePart;
import com.google.caja.reporting.MessageQueue;
import com.google.caja.reporting.MessageType;
-import com.google.caja.util.Lists;
+import com.google.common.collect.Lists;
import java.util.List;
=======================================
--- /trunk/src/com/google/caja/parser/html/DomParser.java Fri Dec 21
00:13:06 2012 UTC
+++ /trunk/src/com/google/caja/parser/html/DomParser.java Tue Sep 24
20:06:05 2013 UTC
@@ -32,8 +32,8 @@
import com.google.caja.reporting.MessageType;
import com.google.caja.util.Criterion;
import com.google.caja.util.Function;
-import com.google.caja.util.Lists;
import com.google.caja.util.Strings;
+import com.google.common.collect.Lists;
import java.io.IOException;
import java.io.Reader;
=======================================
--- /trunk/src/com/google/caja/parser/html/Html5ElementStack.java Tue Sep
24 18:19:56 2013 UTC
+++ /trunk/src/com/google/caja/parser/html/Html5ElementStack.java Tue Sep
24 20:06:05 2013 UTC
@@ -23,9 +23,9 @@
import com.google.caja.reporting.MessagePart;
import com.google.caja.reporting.MessageQueue;
import com.google.caja.reporting.MessageType;
-import com.google.caja.util.Lists;
import com.google.caja.util.Strings;
import com.google.common.collect.MapMaker;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import java.util.Collections;
=======================================
--- /trunk/src/com/google/caja/parser/js/JsonMLCompatible.java Mon Sep 20
21:30:08 2010 UTC
+++ /trunk/src/com/google/caja/parser/js/JsonMLCompatible.java Tue Sep 24
20:06:05 2013 UTC
@@ -15,7 +15,7 @@
package com.google.caja.parser.js;
import com.google.caja.lexer.FilePosition;
-import com.google.caja.util.Lists;
+import com.google.common.collect.Lists;
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/js/JsonMLConverter.java Tue Sep 24
19:27:18 2013 UTC
+++ /trunk/src/com/google/caja/parser/js/JsonMLConverter.java Tue Sep 24
20:06:05 2013 UTC
@@ -20,10 +20,10 @@
import com.google.caja.parser.ParseTreeNode;
import com.google.caja.parser.ParseTreeNodes;
import com.google.caja.parser.ParserBase;
-import com.google.caja.util.Lists;
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.Lists;
import com.google.common.collect.Maps;
import java.util.Collections;
@@ -61,7 +61,8 @@
List<? extends JsonML> children = jsonML.getChildren();
switch (jsonML.getType()) {
case ArrayExpr: {
- List<Expression> elements = Lists.newArrayList(children.size());
+ List<Expression> elements = Lists.newArrayListWithCapacity(
+ children.size());
for (JsonML child : children) {
if (child.getType() == TagType.Empty) {
elements.add(new Elision(pos));
@@ -139,7 +140,8 @@
op = Operator.MEMBER_ACCESS;
}
}
- List<Expression> operands = Lists.newArrayList(children.size() -
1);
+ List<Expression> operands = Lists.newArrayListWithCapacity(
+ children.size() - 1);
operands.add(Operation.create(
FilePosition.span(obj.getFilePosition(),
key.getFilePosition()),
op, obj, key));
@@ -413,7 +415,7 @@
List<? extends JsonML> jsonMLs, Class<T> clazz) {
int n = jsonMLs.size();
if (n == 0) { return Collections.emptyList(); }
- List<T> out = Lists.newArrayList(n);
+ List<T> out = Lists.newArrayListWithCapacity(n);
int i = 0;
if (jsonMLs.get(0).getType() == TagType.PrologueDecl) {
FilePosition start = null;
=======================================
--- /trunk/src/com/google/caja/parser/js/Parser.java Tue Sep 24 19:27:18
2013 UTC
+++ /trunk/src/com/google/caja/parser/js/Parser.java Tue Sep 24 20:06:05
2013 UTC
@@ -32,8 +32,8 @@
import com.google.caja.reporting.MessageQueue;
import com.google.caja.reporting.MessageType;
import com.google.caja.reporting.RenderContext;
-import com.google.caja.util.Lists;
import com.google.caja.util.Pair;
+import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.google.javascript.jscomp.jsonml.JsonML;
=======================================
--- /trunk/src/com/google/caja/parser/js/PlainModule.java Sat Sep 21
22:20:38 2013 UTC
+++ /trunk/src/com/google/caja/parser/js/PlainModule.java Tue Sep 24
20:06:05 2013 UTC
@@ -22,7 +22,7 @@
import com.google.caja.render.JsPrettyPrinter;
import com.google.caja.reporting.RenderContext;
import com.google.caja.util.Callback;
-import com.google.caja.util.Lists;
+import com.google.common.collect.Lists;
import java.io.IOException;
import java.util.List;
=======================================
--- /trunk/src/com/google/caja/parser/js/scope/ScopeAnalyzer.java Tue Sep
24 19:27:18 2013 UTC
+++ /trunk/src/com/google/caja/parser/js/scope/ScopeAnalyzer.java Tue Sep
24 20:06:05 2013 UTC
@@ -28,7 +28,7 @@
import com.google.caja.parser.js.OperatorCategory;
import com.google.caja.parser.js.Reference;
import com.google.caja.parser.js.WithStmt;
-import com.google.caja.util.Lists;
+import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import java.util.List;
=======================================
--- /trunk/src/com/google/caja/parser/quasiliteral/AlphaRenaming.java Tue
Sep 24 19:27:18 2013 UTC
+++ /trunk/src/com/google/caja/parser/quasiliteral/AlphaRenaming.java Tue
Sep 24 20:06:05 2013 UTC
@@ -31,7 +31,7 @@
import com.google.caja.reporting.DevNullMessageQueue;
import com.google.caja.reporting.MessagePart;
import com.google.caja.reporting.MessageQueue;
-import com.google.caja.util.Lists;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
=======================================
---
/trunk/src/com/google/caja/parser/quasiliteral/AlphaRenamingRewriter.java
Tue Sep 24 18:19:56 2013 UTC
+++
/trunk/src/com/google/caja/parser/quasiliteral/AlphaRenamingRewriter.java
Tue Sep 24 20:06:05 2013 UTC
@@ -33,7 +33,7 @@
import com.google.caja.parser.js.Statement;
import com.google.caja.reporting.MessagePart;
import com.google.caja.reporting.MessageQueue;
-import com.google.caja.util.Lists;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import java.util.Collections;
=======================================
--- /trunk/src/com/google/caja/parser/quasiliteral/ES53Rewriter.java Tue
Sep 24 19:27:18 2013 UTC
+++ /trunk/src/com/google/caja/parser/quasiliteral/ES53Rewriter.java Tue
Sep 24 20:06:05 2013 UTC
@@ -68,7 +68,7 @@
import com.google.caja.reporting.MessageLevel;
import com.google.caja.reporting.MessagePart;
import com.google.caja.reporting.MessageQueue;
-import com.google.caja.util.Lists;
+import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import java.net.URI;
=======================================
--- /trunk/src/com/google/caja/parser/quasiliteral/MultiPropertyQuasi.java
Mon May 3 22:56:59 2010 UTC
+++ /trunk/src/com/google/caja/parser/quasiliteral/MultiPropertyQuasi.java
Tue Sep 24 20:06:05 2013 UTC
@@ -20,7 +20,7 @@
import com.google.caja.parser.js.ObjProperty;
import com.google.caja.parser.js.StringLiteral;
import com.google.caja.parser.js.ValueProperty;
-import com.google.caja.util.Lists;
+import com.google.common.collect.Lists;
import java.util.List;
import java.util.Map;
=======================================
--- /trunk/src/com/google/caja/parser/quasiliteral/ObjectCtorQuasiNode.java
Mon May 3 22:56:59 2010 UTC
+++ /trunk/src/com/google/caja/parser/quasiliteral/ObjectCtorQuasiNode.java
Tue Sep 24 20:06:05 2013 UTC
@@ -18,7 +18,7 @@
import com.google.caja.parser.ParseTreeNode;
import com.google.caja.parser.js.ObjProperty;
import com.google.caja.parser.js.ObjectConstructor;
-import com.google.caja.util.Lists;
+import com.google.common.collect.Lists;
import java.util.Arrays;
import java.util.List;
=======================================
--- /trunk/src/com/google/caja/parser/quasiliteral/QuasiBuilder.java Tue
Dec 13 00:56:03 2011 UTC
+++ /trunk/src/com/google/caja/parser/quasiliteral/QuasiBuilder.java Tue
Sep 24 20:06:05 2013 UTC
@@ -43,7 +43,7 @@
import com.google.caja.parser.js.SyntheticNodes;
import com.google.caja.parser.js.ValueProperty;
import com.google.caja.reporting.DevNullMessageQueue;
-import com.google.caja.util.Lists;
+import com.google.common.collect.Lists;
import java.util.Collections;
import java.util.LinkedHashMap;
=======================================
--- /trunk/src/com/google/caja/parser/quasiliteral/QuasiNode.java Sat Feb
27 00:15:29 2010 UTC
+++ /trunk/src/com/google/caja/parser/quasiliteral/QuasiNode.java Tue Sep
24 20:06:05 2013 UTC
@@ -18,7 +18,7 @@
import com.google.caja.parser.ParseTreeNodes;
import com.google.caja.parser.js.Identifier;
import com.google.caja.parser.js.StringLiteral;
-import com.google.caja.util.Lists;
+import com.google.common.collect.Lists;
import java.util.ArrayList;
import java.util.Arrays;
=======================================
--- /trunk/src/com/google/caja/parser/quasiliteral/Rule.java Tue Sep 24
18:19:56 2013 UTC
+++ /trunk/src/com/google/caja/parser/quasiliteral/Rule.java Tue Sep 24
20:06:05 2013 UTC
@@ -43,7 +43,7 @@
import com.google.caja.reporting.MessagePart;
import com.google.caja.reporting.RenderContext;
import com.google.caja.util.Callback;
-import com.google.caja.util.Lists;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import java.io.IOException;
=======================================
--- /trunk/src/com/google/caja/parser/quasiliteral/Scope.java Tue Sep 24
19:27:18 2013 UTC
+++ /trunk/src/com/google/caja/parser/quasiliteral/Scope.java Tue Sep 24
20:06:05 2013 UTC
@@ -39,9 +39,9 @@
import com.google.caja.reporting.MessageLevel;
import com.google.caja.reporting.MessagePart;
import com.google.caja.reporting.MessageType;
-import com.google.caja.util.Lists;
import com.google.caja.util.Pair;
import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
=======================================
--- /trunk/src/com/google/caja/parser/quasiliteral/SimpleQuasiNode.java Tue
Dec 13 00:56:03 2011 UTC
+++ /trunk/src/com/google/caja/parser/quasiliteral/SimpleQuasiNode.java Tue
Sep 24 20:06:05 2013 UTC
@@ -20,7 +20,7 @@
import com.google.caja.parser.js.Block;
import com.google.caja.parser.js.Directive;
import com.google.caja.parser.js.DirectivePrologue;
-import com.google.caja.util.Lists;
+import com.google.common.collect.Lists;
import java.util.List;
import java.util.Map;
=======================================
--- /trunk/src/com/google/caja/parser/quasiliteral/SinglePropertyQuasi.java
Mon May 3 22:56:59 2010 UTC
+++ /trunk/src/com/google/caja/parser/quasiliteral/SinglePropertyQuasi.java
Tue Sep 24 20:06:05 2013 UTC
@@ -18,7 +18,7 @@
import com.google.caja.parser.js.Expression;
import com.google.caja.parser.js.StringLiteral;
import com.google.caja.parser.js.ValueProperty;
-import com.google.caja.util.Lists;
+import com.google.common.collect.Lists;
import java.util.Iterator;
import java.util.List;
=======================================
--- /trunk/src/com/google/caja/parser/quasiliteral/opt/ScopeTree.java Tue
Sep 24 19:27:18 2013 UTC
+++ /trunk/src/com/google/caja/parser/quasiliteral/opt/ScopeTree.java Tue
Sep 24 20:06:05 2013 UTC
@@ -25,7 +25,7 @@
import com.google.caja.parser.js.scope.ScopeType;
import com.google.caja.parser.js.scope.WorstCaseScopeAnalyzer;
import com.google.caja.parser.quasiliteral.Scope;
-import com.google.caja.util.Lists;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
=======================================
--- /trunk/src/com/google/caja/plugin/BuildServiceImplementation.java Tue
Sep 24 19:27:18 2013 UTC
+++ /trunk/src/com/google/caja/plugin/BuildServiceImplementation.java Tue
Sep 24 20:06:05 2013 UTC
@@ -50,8 +50,8 @@
import com.google.caja.tools.BuildService;
import com.google.caja.util.Charsets;
import com.google.caja.util.FileIO;
-import com.google.caja.util.Lists;
import com.google.caja.util.Pair;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
=======================================
--- /trunk/src/com/google/caja/plugin/Config.java Tue Sep 24 19:27:18 2013
UTC
+++ /trunk/src/com/google/caja/plugin/Config.java Tue Sep 24 20:06:05 2013
UTC
@@ -24,10 +24,10 @@
import com.google.caja.reporting.MessageQueue;
import com.google.caja.reporting.MessageType;
import com.google.caja.util.Join;
-import com.google.caja.util.Lists;
import com.google.caja.util.Pair;
import com.google.caja.util.Strings;
import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
import java.io.File;
import java.io.IOException;
=======================================
--- /trunk/src/com/google/caja/plugin/CssDynamicExpressionRewriter.java Thu
Aug 8 00:39:21 2013 UTC
+++ /trunk/src/com/google/caja/plugin/CssDynamicExpressionRewriter.java Tue
Sep 24 20:06:05 2013 UTC
@@ -30,7 +30,7 @@
import com.google.caja.parser.quasiliteral.QuasiBuilder;
import com.google.caja.render.CssPrettyPrinter;
import com.google.caja.reporting.RenderContext;
-import com.google.caja.util.Lists;
+import com.google.common.collect.Lists;
import java.util.List;
import javax.annotation.Nullable;
=======================================
--- /trunk/src/com/google/caja/plugin/CssRewriter.java Wed Sep 18 20:40:53
2013 UTC
+++ /trunk/src/com/google/caja/plugin/CssRewriter.java Tue Sep 24 20:06:05
2013 UTC
@@ -33,10 +33,10 @@
import com.google.caja.reporting.MessagePart;
import com.google.caja.reporting.MessageQueue;
import com.google.caja.reporting.RenderContext;
-import com.google.caja.util.Lists;
import com.google.caja.util.Name;
import com.google.caja.util.Pair;
import com.google.caja.util.TypesafeSet;
+import com.google.common.collect.Lists;
import java.net.URI;
import java.net.URISyntaxException;
@@ -55,7 +55,7 @@
*/
public final class CssRewriter {
private final UriPolicy uriPolicy;
- private HtmlSchema htmlSchema;
+ private final HtmlSchema htmlSchema;
private final MessageQueue mq;
private MessageLevel invalidNodeMessageLevel = MessageLevel.ERROR;
=======================================
***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.
