Author: etnu
Date: Mon May 19 18:56:26 2008
New Revision: 658083
URL: http://svn.apache.org/viewvc?rev=658083&view=rev
Log:
Cleaned up warnings in gadgets artifact. social-api still has several (mostly
type checking). These should be addressed as well.
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriter.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/JavascriptTagMerger.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/LinkingTagRewriter.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssRewriterTest.java
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriter.java?rev=658083&r1=658082&r2=658083&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriter.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriter.java
Mon May 19 18:56:26 2008
@@ -20,7 +20,6 @@
import org.apache.shindig.gadgets.http.HttpResponse;
import java.io.ByteArrayOutputStream;
-import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.Reader;
@@ -39,7 +38,7 @@
public DefaultContentRewriter() {
}
-
+
public HttpResponse rewrite(URI source, HttpResponse original) {
try {
ByteArrayOutputStream baos = new ByteArrayOutputStream(
@@ -109,16 +108,6 @@
return (mime.toLowerCase().indexOf("css") != -1);
}
- private void copyContents(Reader r, Writer w) {
- try {
- for (int val = r.read(); val != -1; val = r.read()) {
- w.write(val);
- }
- } catch (IOException ioe) {
- throw new RuntimeException(ioe);
- }
- }
-
protected String getProxyUrl() {
return "/gadgets/proxy?url=";
}
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/JavascriptTagMerger.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/JavascriptTagMerger.java?rev=658083&r1=658082&r2=658083&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/JavascriptTagMerger.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/JavascriptTagMerger.java
Mon May 19 18:56:26 2008
@@ -35,6 +35,8 @@
*/
public class JavascriptTagMerger implements HtmlTagTransformer {
+ @SuppressWarnings("unchecked")
+ // Scripts has to hold both URIs and tokens.
private final List scripts = new ArrayList();
private final String concatBase;
@@ -53,6 +55,7 @@
this.relativeUrlBase = relativeUrlBase;
}
+ @SuppressWarnings("unchecked")
public void accept(Token<HtmlTokenType> token,
Token<HtmlTokenType> lastToken) {
try {
@@ -81,6 +84,7 @@
return false;
}
+ @SuppressWarnings("unchecked")
public String close() {
List<URI> concat = new ArrayList<URI>();
StringBuilder builder = new StringBuilder(100);
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/LinkingTagRewriter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/LinkingTagRewriter.java?rev=658083&r1=658082&r2=658083&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/LinkingTagRewriter.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/LinkingTagRewriter.java
Mon May 19 18:56:26 2008
@@ -43,9 +43,9 @@
public static Map<String, Set<String>> getDefaultTargets() {
Map<String, Set<String>> targets = new HashMap<String, Set<String>>();
- targets.put("img", new HashSet(Arrays.asList("src")));
- targets.put("embed", new HashSet(Arrays.asList("src")));
- targets.put("link", new HashSet(Arrays.asList("href")));
+ targets.put("img", new HashSet<String>(Arrays.asList("src")));
+ targets.put("embed", new HashSet<String>(Arrays.asList("src")));
+ targets.put("link", new HashSet<String>(Arrays.asList("href")));
return targets;
}
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java?rev=658083&r1=658082&r2=658083&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java
Mon May 19 18:56:26 2008
@@ -18,8 +18,6 @@
*/
package org.apache.shindig.gadgets.servlet;
-import com.google.inject.Inject;
-
import org.apache.shindig.common.SecurityToken;
import org.apache.shindig.common.SecurityTokenDecoder;
import org.apache.shindig.common.SecurityTokenException;
@@ -34,6 +32,9 @@
import org.apache.shindig.gadgets.rewrite.ContentRewriter;
import org.apache.shindig.gadgets.spec.Auth;
import org.apache.shindig.gadgets.spec.Preload;
+
+import com.google.inject.Inject;
+
import org.json.JSONException;
import org.json.JSONObject;
@@ -387,7 +388,6 @@
/**
* @param request
* @return A valid token for the given input.
- * @throws GadgetException
*/
private SecurityToken extractAndValidateToken(HttpServletRequest request)
throws SecurityTokenException {
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssRewriterTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssRewriterTest.java?rev=658083&r1=658082&r2=658083&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssRewriterTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssRewriterTest.java
Mon May 19 18:56:26 2008
@@ -20,7 +20,6 @@
import org.apache.shindig.gadgets.EasyMockTestCase;
import java.net.URI;
-import java.util.Map;
/**
* test CSS link rewriting
@@ -29,8 +28,6 @@
private URI dummyUri;
- private Map<String, HtmlTagTransformer> defaultTransformerMap;
-
private LinkRewriter defaultRewriter = new ProxyingLinkRewriter(
"http://www.test.com/proxy?url=";);
