Author: doll
Date: Fri May 9 09:59:29 2008
New Revision: 654884
URL: http://svn.apache.org/viewvc?rev=654884&view=rev
Log:
SHINDIG-254
Patch from Brian Eaton. Fixes misc java warnings.
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicContentCache.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/LockedDomainService.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/RemoteContentRequest.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingTask.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/ProxyHandlerTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherTest.java
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicContentCache.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicContentCache.java?rev=654884&r1=654883&r2=654884&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicContentCache.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicContentCache.java
Fri May 9 09:59:29 2008
@@ -29,14 +29,17 @@
private final Map<URI, RemoteContent> cache
= new WeakHashMap<URI, RemoteContent>();
+ @Override
protected RemoteContent getContentImpl(URI uri) {
return cache.get(uri);
}
+ @Override
protected void addContentImpl(URI uri, RemoteContent content) {
cache.put(uri, content);
}
+ @Override
protected RemoteContent removeContentImpl(URI uri) {
return cache.remove(uri);
}
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/LockedDomainService.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/LockedDomainService.java?rev=654884&r1=654883&r2=654884&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/LockedDomainService.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/LockedDomainService.java
Fri May 9 09:59:29 2008
@@ -66,7 +66,7 @@
* @param host host name for the content
* @param gadget URL of the gadget
* @param container container
- * @return
+ * @return true if the gadget can render
*/
public boolean gadgetCanRender(String host, Gadget gadget, String container);
}
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/RemoteContentRequest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/RemoteContentRequest.java?rev=654884&r1=654883&r2=654884&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/RemoteContentRequest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/RemoteContentRequest.java
Fri May 9 09:59:29 2008
@@ -356,7 +356,7 @@
public boolean ownerSigned = true;
public boolean viewerSigned = true;
- public Options() {};
+ public Options() {}
/**
* Copy constructor
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingTask.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingTask.java?rev=654884&r1=654883&r2=654884&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingTask.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingTask.java
Fri May 9 09:59:29 2008
@@ -160,10 +160,9 @@
* @param gadget
* @return true if the request was handled, false if the request can proceed
* @throws IOException
- * @throws GadgetException
*/
private boolean mustRedirectToLockedDomain(Gadget gadget)
- throws IOException, GadgetException {
+ throws IOException {
String host = request.getHeader("Host");
String container = context.getContainer();
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/ProxyHandlerTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/ProxyHandlerTest.java?rev=654884&r1=654883&r2=654884&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/ProxyHandlerTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/ProxyHandlerTest.java
Fri May 9 09:59:29 2008
@@ -51,6 +51,7 @@
final PrintWriter writer = new PrintWriter(baos);
final ServletOutputStream responseStream = new ServletOutputStream() {
+ @SuppressWarnings("unused")
@Override
public void write(int b) throws IOException {
baos.write(b);
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherTest.java?rev=654884&r1=654883&r2=654884&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherTest.java
Fri May 9 09:59:29 2008
@@ -32,7 +32,6 @@
import org.apache.shindig.gadgets.oauth.OAuthStore.SignatureType;
import org.apache.shindig.util.BasicBlobCrypter;
import org.apache.shindig.util.BlobCrypter;
-import org.apache.shindig.util.BlobCrypterException;
import java.net.URI;
