You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2009/08/05 02:22:17 UTC
svn commit: r801039 - in /incubator/shindig/trunk/java:
common/src/main/java/org/apache/shindig/protocol/
common/src/main/java/org/apache/shindig/protocol/conversion/
common/src/main/java/org/apache/shindig/protocol/conversion/xstream/
gadgets/src/main...
Author: lindner
Date: Wed Aug 5 00:22:16 2009
New Revision: 801039
URL: http://svn.apache.org/viewvc?rev=801039&view=rev
Log:
use WithCapacity instead of WithExpectedSize
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/BaseRequestItem.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/GuiceBeanProvider.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssLexerParser.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/BaseRequestItem.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/BaseRequestItem.java?rev=801039&r1=801038&r2=801039&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/BaseRequestItem.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/BaseRequestItem.java Wed Aug 5 00:22:16 2009
@@ -255,7 +255,7 @@
} else if (param instanceof JSONArray) {
try {
JSONArray jsonArray = (JSONArray)param;
- List<String> returnVal = Lists.newArrayListWithExpectedSize(jsonArray.length());
+ List<String> returnVal = Lists.newArrayListWithCapacity(jsonArray.length());
for (int i = 0; i < jsonArray.length(); i++) {
returnVal.add(jsonArray.getString(i));
}
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java?rev=801039&r1=801038&r2=801039&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java Wed Aug 5 00:22:16 2009
@@ -150,7 +150,7 @@
HttpServletRequest servletRequest, HttpServletResponse servletResponse,
SecurityToken token) throws JSONException, IOException {
// Use linked hash map to preserve order
- List<Future<?>> responses = Lists.newArrayListWithExpectedSize(batch.length());
+ List<Future<?>> responses = Lists.newArrayListWithCapacity(batch.length());
// Gather all Futures. We do this up front so that
// the first call to get() comes after all futures are created,
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java?rev=801039&r1=801038&r2=801039&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java Wed Aug 5 00:22:16 2009
@@ -247,7 +247,7 @@
}
private List<Object> convertToList(JSONArray in, Type type) {
- ArrayList<Object> out = Lists.newArrayListWithExpectedSize(in.length());
+ ArrayList<Object> out = Lists.newArrayListWithCapacity(in.length());
for (int i = 0, j = in.length(); i < j; ++i) {
out.add(convertToObject(in.opt(i), type));
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/GuiceBeanProvider.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/GuiceBeanProvider.java?rev=801039&r1=801038&r2=801039&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/GuiceBeanProvider.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/GuiceBeanProvider.java Wed Aug 5 00:22:16 2009
@@ -112,7 +112,7 @@
Set<String> names = (propertyNameComparator == null) ? nameMap.keySet() :
ImmutableSortedSet.orderedBy(propertyNameComparator).addAll(nameMap.keySet()).build();
- List<PropertyDescriptor> result = Lists.newArrayListWithExpectedSize(nameMap.size());
+ List<PropertyDescriptor> result = Lists.newArrayListWithCapacity(nameMap.size());
for (final String name : names) {
final PropertyDescriptor descriptor = nameMap.get(name);
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssLexerParser.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssLexerParser.java?rev=801039&r1=801038&r2=801039&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssLexerParser.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssLexerParser.java Wed Aug 5 00:22:16 2009
@@ -79,7 +79,7 @@
}
if (shouldCache) {
- List<Object> cloned = Lists.newArrayListWithExpectedSize(parsedCss.size());
+ List<Object> cloned = Lists.newArrayListWithCapacity(parsedCss.size());
for (Object o : parsedCss) {
if (o instanceof ImportDecl) {
cloned.add(new ImportDecl(((ImportDecl) o).getUri()));
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java?rev=801039&r1=801038&r2=801039&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java Wed Aug 5 00:22:16 2009
@@ -136,7 +136,7 @@
// Remove all the elements currently in head and add them back after we inject content
NodeList children = head.getChildNodes();
- List<Node> existingHeadContent = Lists.newArrayListWithCapacity(children.getLength());
+ List<Node> existingHeadContent = Lists.newArrayListWithExpectedSize(children.getLength());
for (int i = 0; i < children.getLength(); i++) {
existingHeadContent.add(children.item(i));
}
@@ -478,4 +478,4 @@
text.appendData(";");
scriptTag.appendChild(text);
}
-}
\ No newline at end of file
+}
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java?rev=801039&r1=801038&r2=801039&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java Wed Aug 5 00:22:16 2009
@@ -74,7 +74,7 @@
// Process all JSON first so that we don't wind up with hanging threads if
// a JSONException is thrown.
- gadgets = Lists.newArrayListWithExpectedSize(requestedGadgets.length());
+ gadgets = Lists.newArrayListWithCapacity(requestedGadgets.length());
for (int i = 0, j = requestedGadgets.length(); i < j; ++i) {
GadgetContext context = new JsonRpcGadgetContext(
@@ -220,7 +220,7 @@
private List<JSONObject> getOrderedEnums(UserPref pref) throws JSONException {
List<UserPref.EnumValuePair> orderedEnums = pref.getOrderedEnumValues();
- List<JSONObject> jsonEnums = Lists.newArrayListWithExpectedSize(orderedEnums.size());
+ List<JSONObject> jsonEnums = Lists.newArrayListWithCapacity(orderedEnums.size());
for (UserPref.EnumValuePair evp : orderedEnums) {
JSONObject curEnum = new JSONObject();
curEnum.put("value", evp.getValue());
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java?rev=801039&r1=801038&r2=801039&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java Wed Aug 5 00:22:16 2009
@@ -223,7 +223,7 @@
if (userPrefs.isEmpty()) {
spec.userPrefs = Collections.emptyList();
} else {
- List<UserPref> prefs = Lists.newArrayListWithExpectedSize(userPrefs.size());
+ List<UserPref> prefs = Lists.newArrayListWithCapacity(userPrefs.size());
for (UserPref pref : userPrefs) {
prefs.add(pref.substitute(substituter));
}