Author: lindner
Date: Thu Oct 13 02:07:56 2011
New Revision: 1182636
URL: http://svn.apache.org/viewvc?rev=1182636&view=rev
Log:
SHINDIG-1639 | Patch from li xu | fix java 1.5 breakage
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/GadgetAdminModule.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/BasicGadgetAdminStoreTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManagerTest.java
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/GadgetAdminModule.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/GadgetAdminModule.java?rev=1182636&r1=1182635&r2=1182636&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/GadgetAdminModule.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/GadgetAdminModule.java
Thu Oct 13 02:07:56 2011
@@ -68,7 +68,6 @@ public class GadgetAdminModule extends A
}
}
- @Override
public GadgetAdminStore get() {
return store;
}
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/BasicGadgetAdminStoreTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/BasicGadgetAdminStoreTest.java?rev=1182636&r1=1182635&r2=1182636&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/BasicGadgetAdminStoreTest.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/BasicGadgetAdminStoreTest.java
Thu Oct 13 02:07:56 2011
@@ -96,7 +96,6 @@ public class BasicGadgetAdminStoreTest e
@Before
public void setUp() throws Exception {
featureRegistryProvider = new FeatureRegistryProvider() {
- @Override
public FeatureRegistry get(String repository) throws GadgetException {
return mockRegistry;
}
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManagerTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManagerTest.java?rev=1182636&r1=1182635&r2=1182636&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManagerTest.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManagerTest.java
Thu Oct 13 02:07:56 2011
@@ -70,7 +70,6 @@ public class DefaultIframeUriManagerTest
return LD_PREFIX;
}
- @Override
public String getLockedDomainPrefix(String token) {
// TODO Auto-generated method stub
return LD_PREFIX;