You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by ss...@apache.org on 2012/08/01 00:54:49 UTC
svn commit: r1367812 - in /shindig/trunk/java:
common/src/main/java/org/apache/shindig/protocol/conversion/xstream/
common/src/test/java/org/apache/shindig/common/testing/
gadgets/src/main/java/org/apache/shindig/gadgets/render/
gadgets/src/test/java/o...
Author: ssievers
Date: Tue Jul 31 22:54:48 2012
New Revision: 1367812
URL: http://svn.apache.org/viewvc?rev=1367812&view=rev
Log:
Fixing Java5 build errors.
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ImplicitCollectionFieldMapping.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/StackDriver.java
shindig/trunk/java/common/src/test/java/org/apache/shindig/common/testing/FakeGadgetToken.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookup.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureResourceLoaderTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultServiceFetcherTest.java
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ImplicitCollectionFieldMapping.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ImplicitCollectionFieldMapping.java?rev=1367812&r1=1367811&r2=1367812&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ImplicitCollectionFieldMapping.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ImplicitCollectionFieldMapping.java Tue Jul 31 22:54:48 2012
@@ -153,7 +153,6 @@ public class ImplicitCollectionFieldMapp
return itemType;
}
- @Override
public String getKeyFieldName() {
return null;
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/StackDriver.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/StackDriver.java?rev=1367812&r1=1367811&r2=1367812&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/StackDriver.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/StackDriver.java Tue Jul 31 22:54:48 2012
@@ -117,12 +117,10 @@ public class StackDriver implements Hier
return new StackWriterWrapper(parentWriter, writerStack, namespaces);
}
- @Override
public HierarchicalStreamReader createReader(URL url) {
return parent.createReader(url);
}
- @Override
public HierarchicalStreamReader createReader(File file) {
return parent.createReader(file);
}
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/common/testing/FakeGadgetToken.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/testing/FakeGadgetToken.java?rev=1367812&r1=1367811&r2=1367812&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/common/testing/FakeGadgetToken.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/common/testing/FakeGadgetToken.java Tue Jul 31 22:54:48 2012
@@ -105,7 +105,6 @@ public class FakeGadgetToken extends Abs
return this;
}
- @Override
public String getUpdatedToken() {
return updated;
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookup.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookup.java?rev=1367812&r1=1367811&r2=1367812&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookup.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookup.java Tue Jul 31 22:54:48 2012
@@ -76,7 +76,6 @@ public class DefaultRpcServiceLookup imp
try {
return containerServices.get(container,
new Callable<Multimap<String, String>>() {
- @Override
public Multimap<String, String> call() {
return Objects.firstNonNull(fetcher.getServicesForContainer(container, host),
ImmutableMultimap.<String,String>of());
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureResourceLoaderTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureResourceLoaderTest.java?rev=1367812&r1=1367811&r2=1367812&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureResourceLoaderTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureResourceLoaderTest.java Tue Jul 31 22:54:48 2012
@@ -290,7 +290,6 @@ public class FeatureResourceLoaderTest {
public CapturingHttpFetcher() {
}
- @Override
public HttpResponse fetch(HttpRequest request) throws GadgetException {
this.request = request;
return new HttpResponseBuilder().setHttpStatusCode( HttpResponse.SC_OK )
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultServiceFetcherTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultServiceFetcherTest.java?rev=1367812&r1=1367811&r2=1367812&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultServiceFetcherTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultServiceFetcherTest.java Tue Jul 31 22:54:48 2012
@@ -180,7 +180,6 @@ public class DefaultServiceFetcherTest e
public CapturingHttpFetcher() {
}
- @Override
public HttpResponse fetch(HttpRequest request) throws GadgetException {
this.request = request;
return new HttpResponseBuilder().setHttpStatusCode( HttpResponse.SC_OK )