You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by ul...@apache.org on 2012/10/26 10:47:24 UTC
git commit: restore java 1.5 compatibility
Updated Branches:
refs/heads/master f79dc7db8 -> 209efb827
restore java 1.5 compatibility
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/209efb82
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/209efb82
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/209efb82
Branch: refs/heads/master
Commit: 209efb82723603d9a78d209d6c3edeb901987b3b
Parents: f79dc7d
Author: Ulrich Staerk <ul...@apache.org>
Authored: Fri Oct 26 10:47:00 2012 +0200
Committer: Ulrich Staerk <ul...@apache.org>
Committed: Fri Oct 26 10:47:00 2012 +0200
----------------------------------------------------------------------
build.gradle | 2 +-
.../org/apache/tapestry5/alerts/AlertStorage.java | 1 -
.../structure/InternalComponentResourcesImpl.java | 1 -
.../tapestry5/internal/structure/PageImpl.java | 10 +---------
.../internal/transform/InjectComponentWorker.java | 1 -
.../internal/transform/OperationWorker.java | 1 -
.../internal/transform/ParameterWorker.java | 1 -
.../apache/tapestry5/services/TapestryModule.java | 1 -
.../DefaultRequestExceptionHandlerTest.java | 1 -
.../internal/services/PlasticProxyFactoryImpl.java | 3 ---
.../org/apache/tapestry5/ioc/BarneyModule.java | 2 --
.../internal/jpa/EntityManagerSourceImpl.java | 2 --
.../java/org/example/app5/services/AppModule.java | 2 --
.../yuicompressor/JavaScriptResourceMinimizer.java | 2 --
14 files changed, 2 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/209efb82/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 84a64cc..f3d129b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -77,7 +77,7 @@ allprojects {
project {
// Technically, Tapestry is built for JDK 1.5, but we're all using Eclipse or IntelliJ with
// JDK 1.6 at this point.
- jdkName = "1.6"
+ jdkName = "1.5"
}
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/209efb82/tapestry-core/src/main/java/org/apache/tapestry5/alerts/AlertStorage.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/alerts/AlertStorage.java b/tapestry-core/src/main/java/org/apache/tapestry5/alerts/AlertStorage.java
index 8d50951..be4deca 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/alerts/AlertStorage.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/alerts/AlertStorage.java
@@ -33,7 +33,6 @@ public class AlertStorage extends LockSupport implements Serializable, Optimized
private final List<Alert> alerts = CollectionFactory.newList();
- @Override
public boolean checkAndResetDirtyMarker()
{
try
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/209efb82/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImpl.java
index e4545ee..78cdd07 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImpl.java
@@ -684,7 +684,6 @@ public class InternalComponentResourcesImpl extends LockSupport implements Inter
queue.push(element);
}
- @Override
public PageLifecycleCallbackHub getPageLifecycleCallbackHub()
{
return page;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/209efb82/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageImpl.java
index 9ef1842..fa3de66 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageImpl.java
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 The Apache Software Foundation
+// Copyright 2006-2012 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -165,7 +165,6 @@ public class PageImpl implements Page
addPageLoadedCallback(new Runnable()
{
- @Override
public void run()
{
listener.containingPageDidLoad();
@@ -174,7 +173,6 @@ public class PageImpl implements Page
addPageAttachedCallback(new Runnable()
{
- @Override
public void run()
{
listener.containingPageDidAttach();
@@ -183,7 +181,6 @@ public class PageImpl implements Page
addPageDetachedCallback(new Runnable()
{
- @Override
public void run()
{
listener.containingPageDidDetach();
@@ -277,7 +274,6 @@ public class PageImpl implements Page
return name;
}
- @Override
public void addResetCallback(Runnable callback)
{
assert callback != null;
@@ -293,7 +289,6 @@ public class PageImpl implements Page
addResetCallback(new Runnable()
{
- @Override
public void run()
{
listener.containingPageDidReset();
@@ -325,7 +320,6 @@ public class PageImpl implements Page
return attachCount.get();
}
- @Override
public void addPageLoadedCallback(Runnable callback)
{
lifecycleListenersLock.check();
@@ -335,7 +329,6 @@ public class PageImpl implements Page
loadedCallbacks.add(callback);
}
- @Override
public void addPageAttachedCallback(Runnable callback)
{
lifecycleListenersLock.check();
@@ -345,7 +338,6 @@ public class PageImpl implements Page
attachCallbacks.add(callback);
}
- @Override
public void addPageDetachedCallback(Runnable callback)
{
lifecycleListenersLock.check();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/209efb82/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectComponentWorker.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectComponentWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectComponentWorker.java
index 367636d..dbe4703 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectComponentWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectComponentWorker.java
@@ -52,7 +52,6 @@ public class InjectComponentWorker implements ComponentClassTransformWorker2
resources.getPageLifecycleCallbackHub().addPageAttachedCallback(new Runnable()
{
- @Override
public void run()
{
load();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/209efb82/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/OperationWorker.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/OperationWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/OperationWorker.java
index 077c88d..1eae9c2 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/OperationWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/OperationWorker.java
@@ -34,7 +34,6 @@ public class OperationWorker implements ComponentClassTransformWorker2
this.advisor = advisor;
}
- @Override
public void transform(PlasticClass plasticClass, TransformationSupport support, MutableComponentModel model)
{
for (PlasticMethod method : plasticClass.getMethodsWithAnnotation(Operation.class))
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/209efb82/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ParameterWorker.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ParameterWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ParameterWorker.java
index a2a306c..ccfe3d0 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ParameterWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ParameterWorker.java
@@ -198,7 +198,6 @@ public class ParameterWorker implements ComponentClassTransformWorker2
icr.setParameterConduit(parameterName, this);
icr.getPageLifecycleCallbackHub().addPageLoadedCallback(new Runnable()
{
- @Override
public void run()
{
load();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/209efb82/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
index a7f35bc..307767f 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
@@ -2874,7 +2874,6 @@ public final class TapestryModule
{
hub.addInvalidationListener(new InvalidationListener()
{
- @Override
public void objectWasInvalidated()
{
proxyFactory.clearCache();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/209efb82/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandlerTest.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandlerTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandlerTest.java
index 01b99cc..b9bf0c9 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandlerTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandlerTest.java
@@ -132,7 +132,6 @@ public class DefaultRequestExceptionHandlerTest extends InternalBaseTestCase {
@Test
public void handleRequestExceptionWithConfiguredAssistant() throws IOException {
ExceptionHandlerAssistant assistant = new ExceptionHandlerAssistant() {
- @Override
public Object handleRequestException(Throwable exception, List<Object> exceptionContext)
throws IOException
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/209efb82/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticProxyFactoryImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticProxyFactoryImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticProxyFactoryImpl.java
index 45bf82e..a5f5a13 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticProxyFactoryImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticProxyFactoryImpl.java
@@ -117,7 +117,6 @@ public class PlasticProxyFactoryImpl implements PlasticProxyFactory
{
ObjectCreator<String> descriptionCreator = new ObjectCreator<String>()
{
- @Override
public String createObject()
{
return InternalUtils.asString(method);
@@ -132,7 +131,6 @@ public class PlasticProxyFactoryImpl implements PlasticProxyFactory
{
ObjectCreator<String> descriptionCreator = new ObjectCreator<String>()
{
- @Override
public String createObject()
{
StringBuilder builder = new StringBuilder(constructor.getDeclaringClass().getName()).append("(");
@@ -156,7 +154,6 @@ public class PlasticProxyFactoryImpl implements PlasticProxyFactory
descriptionCreator);
}
- @Override
public void clearCache()
{
memberToLocation.clear();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/209efb82/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/BarneyModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/BarneyModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/BarneyModule.java
index eeb143b..55ea96b 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/BarneyModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/BarneyModule.java
@@ -67,14 +67,12 @@ public class BarneyModule {
@Contribute(Sizer.class)
public void moreSizerContributions(MappedConfiguration<Class, Sizer> configuration) {
Sizer defaultSizer = new Sizer() {
- @Override
public int size(Object object) {
return 1;
}
};
Sizer nullSizer = new Sizer() {
- @Override
public int size(Object object) {
return 0;
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/209efb82/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java
index e1be6ab..6f02b32 100644
--- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java
+++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java
@@ -244,7 +244,6 @@ public class EntityManagerSourceImpl implements EntityManagerSource
private PersistenceProvider findPersistenceProviderByName(final List<PersistenceProvider> providers, final String providerClassName)
{
PersistenceProvider provider = F.flow(providers).filter(new Predicate<PersistenceProvider>() {
- @Override
public boolean accept(PersistenceProvider next) {
return next.getClass().getName().equals(providerClassName);
}
@@ -263,7 +262,6 @@ public class EntityManagerSourceImpl implements EntityManagerSource
private List<Class> toProviderClasses(final List<PersistenceProvider> providers)
{
return F.flow(providers).map(new Mapper<PersistenceProvider, Class>() {
- @Override
public Class map(PersistenceProvider element) {
return element.getClass();
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/209efb82/tapestry-jpa/src/test/java/org/example/app5/services/AppModule.java
----------------------------------------------------------------------
diff --git a/tapestry-jpa/src/test/java/org/example/app5/services/AppModule.java b/tapestry-jpa/src/test/java/org/example/app5/services/AppModule.java
index 93dc5d1..7d82421 100644
--- a/tapestry-jpa/src/test/java/org/example/app5/services/AppModule.java
+++ b/tapestry-jpa/src/test/java/org/example/app5/services/AppModule.java
@@ -35,12 +35,10 @@ public class AppModule {
static {
PersistenceProviderResolverHolder.setPersistenceProviderResolver(new PersistenceProviderResolver() {
- @Override
public List<PersistenceProvider> getPersistenceProviders() {
return Arrays.<PersistenceProvider>asList(new DummyPersistenceProvider());
}
- @Override
public void clearCachedProviders() {
}
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/209efb82/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/internal/yuicompressor/JavaScriptResourceMinimizer.java
----------------------------------------------------------------------
diff --git a/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/internal/yuicompressor/JavaScriptResourceMinimizer.java b/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/internal/yuicompressor/JavaScriptResourceMinimizer.java
index 4a3a999..1b57d44 100644
--- a/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/internal/yuicompressor/JavaScriptResourceMinimizer.java
+++ b/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/internal/yuicompressor/JavaScriptResourceMinimizer.java
@@ -61,7 +61,6 @@ public class JavaScriptResourceMinimizer extends AbstractMinimizer
{
boolean sourceIdentified = false;
- @Override
public void run()
{
if (!sourceIdentified)
@@ -76,7 +75,6 @@ public class JavaScriptResourceMinimizer extends AbstractMinimizer
final AtomicInteger warningCount = new AtomicInteger();
Runnable identifyWarnings = new Runnable() {
- @Override
public void run()
{
if (warningCount.get() > 0)