I keep screweing that up, haven't figured out how to keep IntelliJ from doing that without me noticing.
On Mon, Mar 3, 2014 at 4:25 PM, <[email protected]> wrote: > Repository: tapestry-5 > Updated Branches: > refs/heads/5.3 8834c7dbe -> 590dc8adb > > > Removed @Override on interface implementations to maintain JDK 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/590dc8ad > Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/590dc8ad > Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/590dc8ad > > Branch: refs/heads/5.3 > Commit: 590dc8adb85e8049f65eb1a3e5aac4fb71e4abb7 > Parents: 8834c7d > Author: Bob Harner <[email protected]> > Authored: Mon Mar 3 16:03:09 2014 -0500 > Committer: Bob Harner <[email protected]> > Committed: Mon Mar 3 16:09:06 2014 -0500 > > ---------------------------------------------------------------------- > .../main/java/org/apache/tapestry5/alerts/AlertStorage.java | 1 - > .../internal/structure/InternalComponentResourcesImpl.java | 1 - > .../org/apache/tapestry5/internal/structure/PageImpl.java | 8 -------- > .../tapestry5/internal/transform/InjectComponentWorker.java | 1 - > .../apache/tapestry5/internal/transform/ParameterWorker.java | 1 - > .../java/org/apache/tapestry5/services/TapestryModule.java | 2 -- > .../ioc/internal/services/PerthreadManagerImpl.java | 1 - > .../ioc/internal/services/PlasticProxyFactoryImpl.java | 3 --- > .../tapestry5/internal/jpa/EntityManagerSourceImpl.java | 2 -- > .../src/test/java/org/example/app5/services/AppModule.java | 2 -- > 10 files changed, 22 deletions(-) > ---------------------------------------------------------------------- > > > > http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/590dc8ad/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/590dc8ad/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/590dc8ad/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..1e61043 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 > @@ -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/590dc8ad/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/590dc8ad/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/590dc8ad/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 d9556e5..3510bee 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 > @@ -1439,7 +1439,6 @@ public final class TapestryModule > hub.addInvalidationListener(new InvalidationListener() > { > > - @Override > public void objectWasInvalidated() > { > registry.clearCache(); > @@ -2925,7 +2924,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/590dc8ad/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImpl.java > ---------------------------------------------------------------------- > diff --git > a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImpl.java > b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImpl.java > index 984edda..8521201 100644 > --- > a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImpl.java > +++ > b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImpl.java > @@ -64,7 +64,6 @@ public class PerthreadManagerImpl implements > PerthreadManager > { > hub.addRegistryShutdownListener(new Runnable() > { > - @Override > public void run() > { > cleanup(); > > > http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/590dc8ad/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/590dc8ad/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 5f56014..39da3c4 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 > @@ -245,7 +245,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); > } > @@ -264,7 +263,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/590dc8ad/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 3b0afea..ebf0eba 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(), new > org.eclipse.persistence.jpa.PersistenceProvider()); > } > > - @Override > public void clearCachedProviders() { > } > } > > -- Howard M. Lewis Ship Creator of Apache Tapestry The source for Tapestry training, mentoring and support. Contact me to learn how I can get you up and productive in Tapestry fast! (971) 678-5210 http://howardlewisship.com
