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 2011/05/21 02:47:29 UTC
svn commit: r1125606 - in /shindig/trunk/java/gadgets/src:
main/java/org/apache/shindig/gadgets/servlet/
test/java/org/apache/shindig/gadgets/render/
test/java/org/apache/shindig/gadgets/servlet/
test/java/org/apache/shindig/gadgets/uri/
Author: lindner
Date: Sat May 21 00:47:28 2011
New Revision: 1125606
URL: http://svn.apache.org/viewvc?rev=1125606&view=rev
Log:
cleanup of improper use of internal caja classes
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsServletTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/JsUriManagerTest.java
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java?rev=1125606&r1=1125605&r2=1125606&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java Sat May 21 00:47:28 2011
@@ -28,6 +28,7 @@ import java.util.logging.Logger;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
import com.google.inject.Inject;
import com.google.inject.name.Named;
@@ -75,7 +76,6 @@ import com.google.caja.render.JsMinimalP
import com.google.caja.render.JsPrettyPrinter;
import com.google.caja.reporting.MessageContext;
import com.google.caja.reporting.RenderContext;
-import com.google.caja.util.Lists;
/**
* Service that interfaces with the system to provide information about gadgets.
@@ -280,7 +280,7 @@ public class GadgetsHandlerService {
private List<GadgetsHandlerApi.Message> convertMessages(
List<com.google.caja.reporting.Message> msgs,
final MessageContext mc) {
- List<GadgetsHandlerApi.Message> result = Lists.newArrayList(msgs.size());
+ List<GadgetsHandlerApi.Message> result = Lists.newArrayListWithExpectedSize(msgs.size());
for (final com.google.caja.reporting.Message m : msgs) {
MessageImpl msg = new MessageImpl(m.getMessageType().name(),
m.format(mc), convertMessageLevel(m.getMessageLevel().name()));
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java?rev=1125606&r1=1125605&r2=1125606&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java Sat May 21 00:47:28 2011
@@ -71,7 +71,7 @@ import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import com.google.caja.util.Join;
+import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -372,7 +372,7 @@ public class RenderingGadgetRewriterTest
@Override
public String getParameter(String name) {
if (name.equals("libs")) {
- return Join.join(":", libs);
+ return Joiner.on(':').join(libs);
}
return null;
}
@@ -473,7 +473,7 @@ public class RenderingGadgetRewriterTest
@Override
public String getParameter(String name) {
if (name.equals("libs")) {
- return Join.join(":", libs);
+ return Joiner.on(':').join(libs);
}
return null;
}
@@ -1184,7 +1184,7 @@ public class RenderingGadgetRewriterTest
private static class FakeJsUriManager implements JsUriManager {
public Uri makeExternJsUri(JsUri ctx) {
- return Uri.parse("/js/" + Join.join(":", ctx.getLibs()));
+ return Uri.parse("/js/" + Joiner.on(':').join(ctx.getLibs()));
}
public JsUri processExternJsUri(Uri uri) {
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsServletTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsServletTest.java?rev=1125606&r1=1125605&r2=1125606&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsServletTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsServletTest.java Sat May 21 00:47:28 2011
@@ -22,8 +22,8 @@ import static org.easymock.EasyMock.expe
import static org.easymock.EasyMock.getCurrentArguments;
import static org.easymock.EasyMock.isA;
-import com.google.caja.util.Lists;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.GadgetException;
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/JsUriManagerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/JsUriManagerTest.java?rev=1125606&r1=1125605&r2=1125606&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/JsUriManagerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/JsUriManagerTest.java Sat May 21 00:47:28 2011
@@ -23,7 +23,7 @@ import static org.junit.Assert.assertFal
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import com.google.caja.util.Lists;
+import com.google.common.collect.Lists;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.common.uri.UriBuilder;