You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2014/05/23 16:27:00 UTC

[3/7] Required Java version is now 1.6, this applies to building as well as to using Tapestry

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DelegatingInjectionResources.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DelegatingInjectionResources.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DelegatingInjectionResources.java
index e91741d..c3214ae 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DelegatingInjectionResources.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DelegatingInjectionResources.java
@@ -31,6 +31,7 @@ public class DelegatingInjectionResources implements InjectionResources
         this.next = next;
     }
 
+    @Override
     public <T> T findResource(Class<T> type, Type genericType)
     {
         T result = first.findResource(type, genericType);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DummyLock.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DummyLock.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DummyLock.java
index bb5d903..fd20a43 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DummyLock.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DummyLock.java
@@ -23,10 +23,12 @@ import java.util.concurrent.locks.Lock;
  */
 public class DummyLock implements Lock
 {
+    @Override
     public void lock()
     {
     }
 
+    @Override
     public void lockInterruptibly() throws InterruptedException
     {
     }
@@ -34,23 +36,27 @@ public class DummyLock implements Lock
     /**
      * Returns null.
      */
+    @Override
     public Condition newCondition()
     {
         return null;
     }
 
     /** @return true */
+    @Override
     public boolean tryLock()
     {
         return true;
     }
 
     /** @return true */
+    @Override
     public boolean tryLock(long time, TimeUnit unit) throws InterruptedException
     {
         return true;
     }
 
+    @Override
     public void unlock()
     {
     }

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java
index 5fd8c24..1a6dd80 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java
@@ -486,16 +486,19 @@ public class GenericsUtils
     {
         return new ParameterizedType()
         {
+            @Override
             public Type[] getActualTypeArguments()
             {
                 return typeArguments;
             }
 
+            @Override
             public Type getRawType()
             {
                 return rawType;
             }
 
+            @Override
             public Type getOwnerType()
             {
                 return ownerType;
@@ -513,6 +516,7 @@ public class GenericsUtils
     {
         return new GenericArrayType()
         {
+            @Override
             public Type getGenericComponentType()
             {
                 return componentType;
@@ -536,11 +540,13 @@ public class GenericsUtils
 
         return new WildcardType()
         {
+            @Override
             public Type[] getUpperBounds()
             {
                 return upperBounds;
             }
 
+            @Override
             public Type[] getLowerBounds()
             {
                 return lowerBounds;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/IdToDependencyNode.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/IdToDependencyNode.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/IdToDependencyNode.java
index 3f4a1bc..fadd30c 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/IdToDependencyNode.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/IdToDependencyNode.java
@@ -56,6 +56,7 @@ public class IdToDependencyNode<T>
 
   final DependencyLinker<T> before = new DependencyLinker<T>()
   {
+    @Override
     public void link(DependencyNode<T> source, DependencyNode<T> target)
     {
       target.addDependency(source);
@@ -67,6 +68,7 @@ public class IdToDependencyNode<T>
 
   final DependencyLinker<T> after = new DependencyLinker<T>()
   {
+    @Override
     public void link(DependencyNode<T> source, DependencyNode<T> target)
     {
       source.addDependency(target);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearch.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearch.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearch.java
index c645807..f1830a7 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearch.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearch.java
@@ -76,16 +76,19 @@ public class InheritanceSearch implements Iterator<Class>, Iterable<Class>
         }
     }
 
+    @Override
     public Iterator<Class> iterator()
     {
         return this;
     }
 
+    @Override
     public boolean hasNext()
     {
         return state != State.DONE;
     }
 
+    @Override
     public Class next()
     {
         switch (state)
@@ -147,6 +150,7 @@ public class InheritanceSearch implements Iterator<Class>, Iterable<Class>
      * @throws UnsupportedOperationException
      *         always
      */
+    @Override
     public void remove()
     {
         throw new UnsupportedOperationException();

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java
index 3e15834..96c356b 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java
@@ -186,6 +186,7 @@ public class InternalUtils
     {
         return new ObjectCreator<Object>()
         {
+            @Override
             public Object createObject()
             {
                 return fixedValue;
@@ -198,6 +199,7 @@ public class InternalUtils
     {
         final AnnotationProvider provider = new AnnotationProvider()
         {
+            @Override
             public <T extends Annotation> T getAnnotation(Class<T> annotationClass)
             {
                 return findAnnotation(annotations, annotationClass);
@@ -244,6 +246,7 @@ public class InternalUtils
         {
             return new ObjectCreator()
             {
+                @Override
                 public Object createObject()
                 {
                     return locator.getObject(injectionType, provider);
@@ -284,6 +287,7 @@ public class InternalUtils
 
             final Invokable<ObjectCreator> operation = new Invokable<ObjectCreator>()
             {
+                @Override
                 public ObjectCreator invoke()
                 {
                     return calculateInjection(type, genericType, annotations, locator, resources);
@@ -329,6 +333,7 @@ public class InternalUtils
 
                 final AnnotationProvider ap = new AnnotationProvider()
                 {
+                    @Override
                     public <T extends Annotation> T getAnnotation(Class<T> annotationClass)
                     {
                         return f.getAnnotation(annotationClass);
@@ -341,6 +346,7 @@ public class InternalUtils
 
                 tracker.run(description, new Runnable()
                 {
+                    @Override
                     public void run()
                     {
                         final Class<?> fieldType = f.getType();
@@ -610,16 +616,19 @@ public class InternalUtils
 
         return new Iterator<T>()
         {
+            @Override
             public boolean hasNext()
             {
                 return normal.hasPrevious();
             }
 
+            @Override
             public T next()
             {
                 return normal.previous();
             }
 
+            @Override
             public void remove()
             {
                 throw new UnsupportedOperationException();
@@ -704,6 +713,7 @@ public class InternalUtils
 
         Comparator<Constructor> comparator = new Comparator<Constructor>()
         {
+            @Override
             public int compare(Constructor o1, Constructor o2)
             {
                 return o2.getParameterTypes().length - o1.getParameterTypes().length;
@@ -824,6 +834,7 @@ public class InternalUtils
      */
     public static final Mapper<Class, AnnotationProvider> CLASS_TO_AP_MAPPER = new Mapper<Class, AnnotationProvider>()
     {
+        @Override
         public AnnotationProvider map(final Class element)
         {
             return toAnnotationProvider(element);
@@ -838,6 +849,7 @@ public class InternalUtils
     {
         return new AnnotationProvider()
         {
+            @Override
             public <T extends Annotation> T getAnnotation(Class<T> annotationClass)
             {
                 return annotationClass.cast(element.getAnnotation(annotationClass));
@@ -852,6 +864,7 @@ public class InternalUtils
      */
     public static final Mapper<Method, AnnotationProvider> METHOD_TO_AP_MAPPER = new Mapper<Method, AnnotationProvider>()
     {
+        @Override
         public AnnotationProvider map(final Method element)
         {
             return toAnnotationProvider(element);
@@ -889,16 +902,19 @@ public class InternalUtils
         {
             // ServiceDef3 methods:
 
+            @Override
             public AnnotationProvider getClassAnnotationProvider()
             {
                 return toAnnotationProvider(getServiceInterface());
             }
 
+            @Override
             public AnnotationProvider getMethodAnnotationProvider(final String methodName, final Class... argumentTypes)
             {
                 return toAnnotationProvider(findMethod(getServiceInterface(), methodName, argumentTypes));
             }
             
+            @Override
             public Class getServiceImplementation() 
             {
                 return null;
@@ -906,36 +922,43 @@ public class InternalUtils
 
             // ServiceDef2 methods:
 
+            @Override
             public boolean isPreventDecoration()
             {
                 return sd2.isPreventDecoration();
             }
 
+            @Override
             public ObjectCreator createServiceCreator(ServiceBuilderResources resources)
             {
                 return sd2.createServiceCreator(resources);
             }
 
+            @Override
             public String getServiceId()
             {
                 return sd2.getServiceId();
             }
 
+            @Override
             public Set<Class> getMarkers()
             {
                 return sd2.getMarkers();
             }
 
+            @Override
             public Class getServiceInterface()
             {
                 return sd2.getServiceInterface();
             }
 
+            @Override
             public String getServiceScope()
             {
                 return sd2.getServiceScope();
             }
 
+            @Override
             public boolean isEagerLoad()
             {
                 return sd2.isEagerLoad();
@@ -953,6 +976,7 @@ public class InternalUtils
         {
             // ServiceDef2 methods:
 
+            @Override
             public boolean isPreventDecoration()
             {
                 return false;
@@ -960,31 +984,37 @@ public class InternalUtils
 
             // ServiceDef methods:
 
+            @Override
             public ObjectCreator createServiceCreator(ServiceBuilderResources resources)
             {
                 return sd.createServiceCreator(resources);
             }
 
+            @Override
             public String getServiceId()
             {
                 return sd.getServiceId();
             }
 
+            @Override
             public Set<Class> getMarkers()
             {
                 return sd.getMarkers();
             }
 
+            @Override
             public Class getServiceInterface()
             {
                 return sd.getServiceInterface();
             }
 
+            @Override
             public String getServiceScope()
             {
                 return sd.getServiceScope();
             }
 
+            @Override
             public boolean isEagerLoad()
             {
                 return sd.isEagerLoad();
@@ -1005,41 +1035,49 @@ public class InternalUtils
 
         return new ModuleDef2()
         {
+            @Override
             public Set<AdvisorDef> getAdvisorDefs()
             {
                 return Collections.emptySet();
             }
 
+            @Override
             public Class getBuilderClass()
             {
                 return md.getBuilderClass();
             }
 
+            @Override
             public Set<ContributionDef> getContributionDefs()
             {
                 return md.getContributionDefs();
             }
 
+            @Override
             public Set<DecoratorDef> getDecoratorDefs()
             {
                 return md.getDecoratorDefs();
             }
 
+            @Override
             public String getLoggerName()
             {
                 return md.getLoggerName();
             }
 
+            @Override
             public ServiceDef getServiceDef(String serviceId)
             {
                 return md.getServiceDef(serviceId);
             }
 
+            @Override
             public Set<String> getServiceIds()
             {
                 return md.getServiceIds();
             }
 
+            @Override
             public Set<StartupDef> getStartups()
             {
                 return Collections.emptySet();
@@ -1057,16 +1095,19 @@ public class InternalUtils
 
         return new ServiceLifecycle2()
         {
+            @Override
             public boolean requiresProxy()
             {
                 return true;
             }
 
+            @Override
             public Object createService(ServiceResources resources, ObjectCreator creator)
             {
                 return lifecycle.createService(resources, creator);
             }
 
+            @Override
             public boolean isSingleton()
             {
                 return lifecycle.isSingleton();
@@ -1106,34 +1147,40 @@ public class InternalUtils
         return new ContributionDef2()
         {
 
+            @Override
             public Set<Class> getMarkers()
             {
                 return Collections.emptySet();
             }
 
+            @Override
             public Class getServiceInterface()
             {
                 return null;
             }
 
+            @Override
             public void contribute(ModuleBuilderSource moduleSource, ServiceResources resources,
                                    Configuration configuration)
             {
                 contribution.contribute(moduleSource, resources, configuration);
             }
 
+            @Override
             public void contribute(ModuleBuilderSource moduleSource, ServiceResources resources,
                                    OrderedConfiguration configuration)
             {
                 contribution.contribute(moduleSource, resources, configuration);
             }
 
+            @Override
             public void contribute(ModuleBuilderSource moduleSource, ServiceResources resources,
                                    MappedConfiguration configuration)
             {
                 contribution.contribute(moduleSource, resources, configuration);
             }
 
+            @Override
             public String getServiceId()
             {
                 return contribution.getServiceId();
@@ -1159,36 +1206,43 @@ public class InternalUtils
 
         return new ContributionDef3()
         {
+            @Override
             public boolean isOptional()
             {
                 return false;
             }
 
+            @Override
             public String getServiceId()
             {
                 return cd2.getServiceId();
             }
 
+            @Override
             public void contribute(ModuleBuilderSource moduleSource, ServiceResources resources, Configuration configuration)
             {
                 cd2.contribute(moduleSource, resources, configuration);
             }
 
+            @Override
             public void contribute(ModuleBuilderSource moduleSource, ServiceResources resources, OrderedConfiguration configuration)
             {
                 cd2.contribute(moduleSource, resources, configuration);
             }
 
+            @Override
             public void contribute(ModuleBuilderSource moduleSource, ServiceResources resources, MappedConfiguration configuration)
             {
                 cd2.contribute(moduleSource, resources, configuration);
             }
 
+            @Override
             public Set<Class> getMarkers()
             {
                 return cd2.getMarkers();
             }
 
+            @Override
             public Class getServiceInterface()
             {
                 return cd2.getServiceInterface();
@@ -1213,31 +1267,37 @@ public class InternalUtils
         return new AdvisorDef2()
         {
 
+            @Override
             public ServiceAdvisor createAdvisor(ModuleBuilderSource moduleSource, ServiceResources resources)
             {
                 return advisor.createAdvisor(moduleSource, resources);
             }
 
+            @Override
             public String getAdvisorId()
             {
                 return advisor.getAdvisorId();
             }
 
+            @Override
             public String[] getConstraints()
             {
                 return advisor.getConstraints();
             }
 
+            @Override
             public boolean matches(ServiceDef serviceDef)
             {
                 return advisor.matches(serviceDef);
             }
 
+            @Override
             public Set<Class> getMarkers()
             {
                 return Collections.emptySet();
             }
 
+            @Override
             public Class getServiceInterface()
             {
                 return null;
@@ -1262,31 +1322,37 @@ public class InternalUtils
         return new DecoratorDef2()
         {
 
+            @Override
             public ServiceDecorator createDecorator(ModuleBuilderSource moduleSource, ServiceResources resources)
             {
                 return decorator.createDecorator(moduleSource, resources);
             }
 
+            @Override
             public String[] getConstraints()
             {
                 return decorator.getConstraints();
             }
 
+            @Override
             public String getDecoratorId()
             {
                 return decorator.getDecoratorId();
             }
 
+            @Override
             public boolean matches(ServiceDef serviceDef)
             {
                 return decorator.matches(serviceDef);
             }
 
+            @Override
             public Set<Class> getMarkers()
             {
                 return Collections.emptySet();
             }
 
+            @Override
             public Class getServiceInterface()
             {
                 return null;
@@ -1334,6 +1400,7 @@ public class InternalUtils
 
         return new Mapper<S, T>()
         {
+            @Override
             public T map(S value)
             {
                 return coercion.coerce(value);
@@ -1396,6 +1463,7 @@ public class InternalUtils
 
         return new AnnotationProvider()
         {
+            @Override
             public <T extends Annotation> T getAnnotation(Class<T> annotationClass)
             {
                 return element.getAnnotation(annotationClass);
@@ -1413,6 +1481,7 @@ public class InternalUtils
                 constructor.getDeclaringClass().getName(),
                 constructor), new Invokable<ObjectCreator<T>>()
         {
+            @Override
             public ObjectCreator<T> invoke()
             {
                 validateConstructorForAutobuild(constructor);
@@ -1453,6 +1522,7 @@ public class InternalUtils
 
                 final AnnotationProvider ap = new AnnotationProvider()
                 {
+                    @Override
                     public <T extends Annotation> T getAnnotation(Class<T> annotationClass)
                     {
                         return f.getAnnotation(annotationClass);
@@ -1465,6 +1535,7 @@ public class InternalUtils
 
                 tracker.run(description, new Runnable()
                 {
+                    @Override
                     public void run()
                     {
                         final Class<?> fieldType = f.getType();
@@ -1519,6 +1590,7 @@ public class InternalUtils
     {
         plan.add(new InitializationPlan<T>()
         {
+            @Override
             public String getDescription()
             {
                 return String.format("Injecting %s into field %s of class %s.",
@@ -1527,6 +1599,7 @@ public class InternalUtils
                         field.getDeclaringClass().getName());
             }
 
+            @Override
             public void initialize(T instance)
             {
                 inject(instance, field, injectedValue);
@@ -1555,6 +1628,7 @@ public class InternalUtils
         tracker.run("Computing parameters for post-injection method " + method,
                 new Runnable()
                 {
+                    @Override
                     public void run()
                     {
                         final ObjectCreator[] parameters = InternalUtils.calculateParametersForMethod(method, locator,
@@ -1562,11 +1636,13 @@ public class InternalUtils
 
                         plan.add(new InitializationPlan<Object>()
                         {
+                            @Override
                             public String getDescription()
                             {
                                 return "Invoking " + method;
                             }
 
+                            @Override
                             public void initialize(Object instance)
                             {
                                 Throwable fail = null;
@@ -1606,6 +1682,7 @@ public class InternalUtils
 
         return tracker.invoke("Creating plan to invoke " + method, new Invokable<ObjectCreator<T>>()
         {
+            @Override
             public ObjectCreator<T> invoke()
             {
                 ObjectCreator[] methodParameters = calculateParametersForMethod(method, locator, resources, tracker);
@@ -1624,6 +1701,7 @@ public class InternalUtils
      */
     public static Mapper<ObjectCreator, Object> CREATE_OBJECT = new Mapper<ObjectCreator, Object>()
     {
+        @Override
         public Object map(ObjectCreator element)
         {
             return element.createObject();

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LocationImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LocationImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LocationImpl.java
index 211ca3b..1ef232e 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LocationImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LocationImpl.java
@@ -49,16 +49,19 @@ public final class LocationImpl implements Location
         this.column = column;
     }
 
+    @Override
     public Resource getResource()
     {
         return resource;
     }
 
+    @Override
     public int getLine()
     {
         return line;
     }
 
+    @Override
     public int getColumn()
     {
         return column;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LoggingInvokableWrapper.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LoggingInvokableWrapper.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LoggingInvokableWrapper.java
index acaf2bf..1fe7ddb 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LoggingInvokableWrapper.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LoggingInvokableWrapper.java
@@ -35,6 +35,7 @@ public class LoggingInvokableWrapper<T> implements Invokable<T>
         this.delegate = delegate;
     }
 
+    @Override
     public T invoke()
     {
         logger.debug(message);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MapInjectionResources.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MapInjectionResources.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MapInjectionResources.java
index 92aeb67..50a936b 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MapInjectionResources.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MapInjectionResources.java
@@ -26,6 +26,7 @@ public class MapInjectionResources implements InjectionResources
 
     public MapInjectionResources(Map<Class, Object> map) {this.map = map;}
 
+    @Override
     @SuppressWarnings({"unchecked"})
     public <T> T findResource(Class<T> type, Type genericType)
     {

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessageFormatterImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessageFormatterImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessageFormatterImpl.java
index 737a12b..f4d8949 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessageFormatterImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessageFormatterImpl.java
@@ -32,6 +32,7 @@ public class MessageFormatterImpl implements MessageFormatter
         this.locale = locale;
     }
 
+    @Override
     public String format(Object... args)
     {
         for (int i = 0; i < args.length; i++)
@@ -55,6 +56,7 @@ public class MessageFormatterImpl implements MessageFormatter
      *
      * @since 5.4
      */
+    @Override
     public String toString()
     {
         return format;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessagesImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessagesImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessagesImpl.java
index 9d7a5b4..c06ef90 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessagesImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessagesImpl.java
@@ -66,6 +66,7 @@ public class MessagesImpl extends AbstractMessages
         return properties.get(key);
     }
 
+    @Override
     public Set<String> getKeys()
     {
         return properties.keySet();

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MethodInvoker.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MethodInvoker.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MethodInvoker.java
index 53ce6fb..5b54e89 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MethodInvoker.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MethodInvoker.java
@@ -40,6 +40,7 @@ public class MethodInvoker<T> implements Invokable<T>
         this.methodParameters = methodParameters;
     }
 
+    @Override
     public T invoke()
     {
         Throwable fail;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/Orderer.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/Orderer.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/Orderer.java
index 565f6e8..9f7adfc 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/Orderer.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/Orderer.java
@@ -56,6 +56,7 @@ public class Orderer<T>
 
     final DependencyLinker<T> _before = new DependencyLinker<T>()
     {
+        @Override
         public void link(DependencyNode<T> source, DependencyNode<T> target)
         {
             target.addDependency(source);
@@ -67,6 +68,7 @@ public class Orderer<T>
 
     final DependencyLinker<T> _after = new DependencyLinker<T>()
     {
+        @Override
         public void link(DependencyNode<T> source, DependencyNode<T> target)
         {
             source.addDependency(target);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/TapestryException.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/TapestryException.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/TapestryException.java
index 7332a9d..ef217cb 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/TapestryException.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/TapestryException.java
@@ -58,6 +58,7 @@ public class TapestryException extends RuntimeException implements Locatable
         this.location = location;
     }
 
+    @Override
     public Location getLocation()
     {
         return location;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/WrongConfigurationTypeGuard.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/WrongConfigurationTypeGuard.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/WrongConfigurationTypeGuard.java
index b18cb0a..3d76c54 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/WrongConfigurationTypeGuard.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/WrongConfigurationTypeGuard.java
@@ -34,6 +34,7 @@ public class WrongConfigurationTypeGuard implements InjectionResources
         this.expectedType = expectedType;
     }
 
+    @Override
     public <T> T findResource(Class<T> type, Type genericType)
     {
         if (type == guardType)

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/modules/TapestryIOCModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/modules/TapestryIOCModule.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/modules/TapestryIOCModule.java
index 7f95181..6e49788 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/modules/TapestryIOCModule.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/modules/TapestryIOCModule.java
@@ -95,6 +95,7 @@ public final class TapestryIOCModule
 
         return new ServiceLifecycleSource()
         {
+            @Override
             public ServiceLifecycle get(String scope)
             {
                 return lifecycles.get(scope);
@@ -139,6 +140,7 @@ public final class TapestryIOCModule
 
         ObjectProvider wrapper = new ObjectProvider()
         {
+            @Override
             public <T> T provide(Class<T> objectType, AnnotationProvider annotationProvider, ObjectLocator locator)
             {
                 return serviceOverride.getServiceOverrideProvider().provide(objectType, annotationProvider, locator);
@@ -188,6 +190,7 @@ public final class TapestryIOCModule
     {
         add(configuration, Object.class, String.class, new Coercion<Object, String>()
         {
+            @Override
             public String coerce(Object input)
             {
                 return input.toString();
@@ -196,6 +199,7 @@ public final class TapestryIOCModule
 
         add(configuration, Object.class, Boolean.class, new Coercion<Object, Boolean>()
         {
+            @Override
             public Boolean coerce(Object input)
             {
                 return input != null;
@@ -204,6 +208,7 @@ public final class TapestryIOCModule
 
         add(configuration, String.class, Double.class, new Coercion<String, Double>()
         {
+            @Override
             public Double coerce(String input)
             {
                 return new Double(input);
@@ -215,6 +220,7 @@ public final class TapestryIOCModule
 
         add(configuration, String.class, BigDecimal.class, new Coercion<String, BigDecimal>()
         {
+            @Override
             public BigDecimal coerce(String input)
             {
                 return new BigDecimal(input);
@@ -223,6 +229,7 @@ public final class TapestryIOCModule
 
         add(configuration, BigDecimal.class, Double.class, new Coercion<BigDecimal, Double>()
         {
+            @Override
             public Double coerce(BigDecimal input)
             {
                 return input.doubleValue();
@@ -231,6 +238,7 @@ public final class TapestryIOCModule
 
         add(configuration, String.class, BigInteger.class, new Coercion<String, BigInteger>()
         {
+            @Override
             public BigInteger coerce(String input)
             {
                 return new BigInteger(input);
@@ -239,6 +247,7 @@ public final class TapestryIOCModule
 
         add(configuration, String.class, Long.class, new Coercion<String, Long>()
         {
+            @Override
             public Long coerce(String input)
             {
                 return new Long(input);
@@ -247,6 +256,7 @@ public final class TapestryIOCModule
 
         add(configuration, Long.class, Byte.class, new Coercion<Long, Byte>()
         {
+            @Override
             public Byte coerce(Long input)
             {
                 return input.byteValue();
@@ -255,6 +265,7 @@ public final class TapestryIOCModule
 
         add(configuration, Long.class, Short.class, new Coercion<Long, Short>()
         {
+            @Override
             public Short coerce(Long input)
             {
                 return input.shortValue();
@@ -263,6 +274,7 @@ public final class TapestryIOCModule
 
         add(configuration, Long.class, Integer.class, new Coercion<Long, Integer>()
         {
+            @Override
             public Integer coerce(Long input)
             {
                 return input.intValue();
@@ -271,6 +283,7 @@ public final class TapestryIOCModule
 
         add(configuration, Number.class, Long.class, new Coercion<Number, Long>()
         {
+            @Override
             public Long coerce(Number input)
             {
                 return input.longValue();
@@ -279,6 +292,7 @@ public final class TapestryIOCModule
 
         add(configuration, Double.class, Float.class, new Coercion<Double, Float>()
         {
+            @Override
             public Float coerce(Double input)
             {
                 return input.floatValue();
@@ -287,6 +301,7 @@ public final class TapestryIOCModule
 
         add(configuration, Long.class, Double.class, new Coercion<Long, Double>()
         {
+            @Override
             public Double coerce(Long input)
             {
                 return input.doubleValue();
@@ -295,6 +310,7 @@ public final class TapestryIOCModule
 
         add(configuration, String.class, Boolean.class, new Coercion<String, Boolean>()
         {
+            @Override
             public Boolean coerce(String input)
             {
                 String trimmed = input == null ? "" : input.trim();
@@ -310,6 +326,7 @@ public final class TapestryIOCModule
 
         add(configuration, Number.class, Boolean.class, new Coercion<Number, Boolean>()
         {
+            @Override
             public Boolean coerce(Number input)
             {
                 return input.longValue() != 0;
@@ -318,6 +335,7 @@ public final class TapestryIOCModule
 
         add(configuration, Void.class, Boolean.class, new Coercion<Void, Boolean>()
         {
+            @Override
             public Boolean coerce(Void input)
             {
                 return false;
@@ -326,6 +344,7 @@ public final class TapestryIOCModule
 
         add(configuration, Collection.class, Boolean.class, new Coercion<Collection, Boolean>()
         {
+            @Override
             public Boolean coerce(Collection input)
             {
                 return !input.isEmpty();
@@ -334,6 +353,7 @@ public final class TapestryIOCModule
 
         add(configuration, Object.class, List.class, new Coercion<Object, List>()
         {
+            @Override
             public List coerce(Object input)
             {
                 return Collections.singletonList(input);
@@ -342,6 +362,7 @@ public final class TapestryIOCModule
 
         add(configuration, Object[].class, List.class, new Coercion<Object[], List>()
         {
+            @Override
             public List coerce(Object[] input)
             {
                 return Arrays.asList(input);
@@ -350,6 +371,7 @@ public final class TapestryIOCModule
 
         add(configuration, Object[].class, Boolean.class, new Coercion<Object[], Boolean>()
         {
+            @Override
             public Boolean coerce(Object[] input)
             {
                 return input != null && input.length > 0;
@@ -358,6 +380,7 @@ public final class TapestryIOCModule
 
         add(configuration, Float.class, Double.class, new Coercion<Float, Double>()
         {
+            @Override
             public Double coerce(Float input)
             {
                 return input.doubleValue();
@@ -366,6 +389,7 @@ public final class TapestryIOCModule
 
         Coercion primitiveArrayCoercion = new Coercion<Object, List>()
         {
+            @Override
             public List<Object> coerce(Object input)
             {
                 int length = Array.getLength(input);
@@ -389,6 +413,7 @@ public final class TapestryIOCModule
 
         add(configuration, String.class, File.class, new Coercion<String, File>()
         {
+            @Override
             public File coerce(String input)
             {
                 return new File(input);
@@ -397,6 +422,7 @@ public final class TapestryIOCModule
 
         add(configuration, String.class, TimeInterval.class, new Coercion<String, TimeInterval>()
         {
+            @Override
             public TimeInterval coerce(String input)
             {
                 return new TimeInterval(input);
@@ -405,6 +431,7 @@ public final class TapestryIOCModule
 
         add(configuration, TimeInterval.class, Long.class, new Coercion<TimeInterval, Long>()
         {
+            @Override
             public Long coerce(TimeInterval input)
             {
                 return input.milliseconds();
@@ -413,6 +440,7 @@ public final class TapestryIOCModule
 
         add(configuration, Object.class, Object[].class, new Coercion<Object, Object[]>()
         {
+            @Override
             public Object[] coerce(Object input)
             {
                 return new Object[]
@@ -422,6 +450,7 @@ public final class TapestryIOCModule
 
         add(configuration, Collection.class, Object[].class, new Coercion<Collection, Object[]>()
         {
+            @Override
             public Object[] coerce(Collection input)
             {
                 return input.toArray();
@@ -430,6 +459,7 @@ public final class TapestryIOCModule
 
         add(configuration, Flow.class, List.class, new Coercion<Flow, List>()
         {
+            @Override
             public List coerce(Flow input)
             {
                 return input.toList();
@@ -438,6 +468,7 @@ public final class TapestryIOCModule
 
         add(configuration, Flow.class, Boolean.class, new Coercion<Flow, Boolean>()
         {
+            @Override
             public Boolean coerce(Flow input)
             {
                 return !input.isEmpty();
@@ -511,6 +542,7 @@ public final class TapestryIOCModule
 
         shutdownHub.addRegistryShutdownListener(new Runnable()
         {
+            @Override
             public void run()
             {
                 executorService.shutdown();

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/CoercionTuple.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/CoercionTuple.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/CoercionTuple.java
index 8658686..746de1e 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/CoercionTuple.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/CoercionTuple.java
@@ -49,6 +49,7 @@ public final class CoercionTuple<S, T>
             this.coercion = coercion;
         }
 
+        @Override
         public WT coerce(WS input)
         {
             return coercion.coerce(input);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/CronSchedule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/CronSchedule.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/CronSchedule.java
index 1c76332..0198d59 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/CronSchedule.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/CronSchedule.java
@@ -34,11 +34,13 @@ public class CronSchedule implements Schedule
         }
     }
 
+    @Override
     public long firstExecution()
     {
         return getNextValidTimeAfterNow();
     }
 
+    @Override
     public long nextExecution(long previousExecution)
     {
         return getNextValidTimeAfterNow();

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/IntervalSchedule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/IntervalSchedule.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/IntervalSchedule.java
index 1c42ed0..70ecfbf 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/IntervalSchedule.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/IntervalSchedule.java
@@ -36,11 +36,13 @@ public class IntervalSchedule implements Schedule
         this.interval = interval;
     }
 
+    @Override
     public long firstExecution()
     {
         return nextExecution(System.currentTimeMillis());
     }
 
+    @Override
     public long nextExecution(long previousExecution)
     {
         return previousExecution + interval;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/AbstractMessages.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/AbstractMessages.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/AbstractMessages.java
index 95641e0..590c337 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/AbstractMessages.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/AbstractMessages.java
@@ -50,11 +50,13 @@ public abstract class AbstractMessages implements Messages
     protected abstract String valueForKey(String key);
 
 
+    @Override
     public boolean contains(String key)
     {
         return valueForKey(key) != null;
     }
 
+    @Override
     public String get(String key)
     {
         if (contains(key)) return valueForKey(key);
@@ -62,6 +64,7 @@ public abstract class AbstractMessages implements Messages
         return String.format("[[missing key: %s]]", key);
     }
 
+    @Override
     public MessageFormatter getFormatter(String key)
     {
         MessageFormatter result = cache.get(key);
@@ -82,6 +85,7 @@ public abstract class AbstractMessages implements Messages
         return new MessageFormatterImpl(format, locale);
     }
 
+    @Override
     public String format(String key, Object... args)
     {
         return getFormatter(key).format(args);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMap.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMap.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMap.java
index 09f464d..f5aff7e 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMap.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMap.java
@@ -52,16 +52,19 @@ public class CaseInsensitiveMap<V> extends AbstractMap<String, V> implements Ser
             this.value = value;
         }
 
+        @Override
         public String getKey()
         {
             return key;
         }
 
+        @Override
         public V getValue()
         {
             return value;
         }
 
+        @Override
         public V setValue(V value)
         {
             V result = this.value;
@@ -98,11 +101,13 @@ public class CaseInsensitiveMap<V> extends AbstractMap<String, V> implements Ser
 
         int current = -1;
 
+        @Override
         public boolean hasNext()
         {
             return index < size;
         }
 
+        @Override
         public Object next()
         {
             check();
@@ -114,6 +119,7 @@ public class CaseInsensitiveMap<V> extends AbstractMap<String, V> implements Ser
             return entries[current];
         }
 
+        @Override
         public void remove()
         {
             check();

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/LocalizedNameGenerator.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/LocalizedNameGenerator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/LocalizedNameGenerator.java
index 62c8cdd..6f86cc7 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/LocalizedNameGenerator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/LocalizedNameGenerator.java
@@ -154,6 +154,7 @@ public class LocalizedNameGenerator implements Iterator<String>, Iterable<String
      * Returns true if there are more name variants to be returned, false otherwise.
      */
 
+    @Override
     public boolean hasNext()
     {
         return state != EXHAUSTED;
@@ -166,6 +167,7 @@ public class LocalizedNameGenerator implements Iterator<String>, Iterable<String
      *             if all variants have been returned.
      */
 
+    @Override
     public String next()
     {
         if (state == EXHAUSTED)
@@ -239,6 +241,7 @@ public class LocalizedNameGenerator implements Iterator<String>, Iterable<String
     /**
      * @throws UnsupportedOperationException
      */
+    @Override
     public void remove()
     {
         throw new UnsupportedOperationException();
@@ -247,6 +250,7 @@ public class LocalizedNameGenerator implements Iterator<String>, Iterable<String
     /**
      * So that LNG may be used with the for loop.
      */
+    @Override
     public Iterator<String> iterator()
     {
         return this;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/util/StringToEnumCoercion.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/util/StringToEnumCoercion.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/util/StringToEnumCoercion.java
index f918773..77c9a8d 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/util/StringToEnumCoercion.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/util/StringToEnumCoercion.java
@@ -51,6 +51,7 @@ public final class StringToEnumCoercion<T extends Enum> implements Coercion<Stri
             stringToEnum.put(value.name(), value);
     }
 
+    @Override
     public T coerce(String input)
     {
         if (InternalUtils.isBlank(input))

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/com/example/CounterImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/com/example/CounterImpl.java b/tapestry-ioc/src/test/java/com/example/CounterImpl.java
index dd6cc55..22d592a 100644
--- a/tapestry-ioc/src/test/java/com/example/CounterImpl.java
+++ b/tapestry-ioc/src/test/java/com/example/CounterImpl.java
@@ -24,6 +24,7 @@ public class CounterImpl implements Counter, ReloadAware
 
     private int count;
 
+    @Override
     public boolean shutdownImplementationForReload()
     {
         ReloadAwareModule.counterReloads++;
@@ -31,6 +32,7 @@ public class CounterImpl implements Counter, ReloadAware
         return true;
     }
 
+    @Override
     public synchronized int increment()
     {
         return ++count;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/com/example/ExtraRunnableModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/com/example/ExtraRunnableModule.java b/tapestry-ioc/src/test/java/com/example/ExtraRunnableModule.java
index a00eb96..d65c35d 100644
--- a/tapestry-ioc/src/test/java/com/example/ExtraRunnableModule.java
+++ b/tapestry-ioc/src/test/java/com/example/ExtraRunnableModule.java
@@ -30,11 +30,13 @@ public class ExtraRunnableModule
     {
         return new ExtraRunnable()
         {
+            @Override
             public void runOrThrow() throws Exception
             {
                 run();
             }
 
+            @Override
             public void run()
             {
                 for (Runnable r : configuration)
@@ -49,6 +51,7 @@ public class ExtraRunnableModule
     {
         configuration.add("Solo", new Runnable()
         {
+            @Override
             public void run()
             {
                 InvokeCounts.contributionInvokeCount++;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/AdviceDemoModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/AdviceDemoModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/AdviceDemoModule.java
index 581ac80..c3bad72 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/AdviceDemoModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/AdviceDemoModule.java
@@ -29,6 +29,7 @@ public class AdviceDemoModule
     {
         return new Greeter()
         {
+            @Override
             public String getGreeting()
             {
                 return "Advice is Easy!";
@@ -47,6 +48,7 @@ public class AdviceDemoModule
     {
         MethodAdvice advice = new MethodAdvice()
         {
+            @Override
             public void advise(MethodInvocation invocation)
             {
                 invocation.proceed();

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/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 55ea96b..89e6bc6 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
@@ -44,6 +44,7 @@ public class BarneyModule {
 
   public void contributeSizer(MappedConfiguration<Class, Sizer> configuration) {
     Sizer listSizer = new Sizer() {
+      @Override
       public int size(Object object) {
         List list = (List) object;
 
@@ -52,6 +53,7 @@ public class BarneyModule {
     };
 
     Sizer mapSizer = new Sizer() {
+      @Override
       public int size(Object object) {
         Map map = (Map) object;
 
@@ -67,12 +69,14 @@ 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;
       }
@@ -91,10 +95,12 @@ public class BarneyModule {
     return new DecoratorList() {
       private List<String> names = CollectionFactory.newList();
 
+      @Override
       public void add(String name) {
         names.add(name);
       }
 
+      @Override
       public List<String> getNames() {
         return names;
       }

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ContributeByClassModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ContributeByClassModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ContributeByClassModule.java
index a1700a0..3fd3ce5 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ContributeByClassModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ContributeByClassModule.java
@@ -26,6 +26,7 @@ public class ContributeByClassModule
     {
         return new StringTransformer()
         {
+            @Override
             public String transform(String input)
             {
                 String current = input;
@@ -59,6 +60,7 @@ public class ContributeByClassModule
     {
         return new StringTransformer()
         {
+            @Override
             public String transform(String input)
             {
                 return configuration.get("Default").transform(input);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CountingGreeterImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CountingGreeterImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CountingGreeterImpl.java
index 1df3097..8bd15b0 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CountingGreeterImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CountingGreeterImpl.java
@@ -21,6 +21,7 @@ public class CountingGreeterImpl implements Greeter
         IntegrationTestFixture.countingGreeterInstantiationCount++;
     }
 
+    @Override
     public String getGreeting()
     {
         return "Hello";

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CyclicMOPModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CyclicMOPModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CyclicMOPModule.java
index 0a95fd9..775fc75 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CyclicMOPModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CyclicMOPModule.java
@@ -34,6 +34,7 @@ public class CyclicMOPModule
     {
         return new Runnable()
         {
+            @Override
             public void run()
             {
             }

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FailInConstructorRunnable.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FailInConstructorRunnable.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FailInConstructorRunnable.java
index 1957999..1e5be21 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FailInConstructorRunnable.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FailInConstructorRunnable.java
@@ -21,6 +21,7 @@ public class FailInConstructorRunnable implements Runnable
         throw new RuntimeException("Failure in Runnable constructor.");
     }
 
+    @Override
     public void run()
     {
     }

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FieldResourceServiceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FieldResourceServiceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FieldResourceServiceImpl.java
index e9b2936..a60f4fe 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FieldResourceServiceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FieldResourceServiceImpl.java
@@ -29,11 +29,13 @@ public class FieldResourceServiceImpl implements FieldResourceService
     @InjectResource
     private Collection<String> configuration;
 
+    @Override
     public String getServiceId()
     {
         return resources.getServiceId();
     }
 
+    @Override
     public List<String> getLabels()
     {
         List<String> result = CollectionFactory.newList(configuration);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FredModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FredModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FredModule.java
index c61301c..7ec3cae 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FredModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FredModule.java
@@ -38,6 +38,7 @@ public class FredModule
     {
         return new Runnable()
         {
+            @Override
             public void run()
             {
             }
@@ -72,6 +73,7 @@ public class FredModule
         return new NameListHolder()
         {
 
+            @Override
             public List<String> getNames()
             {
                 return sorted;
@@ -84,6 +86,7 @@ public class FredModule
         return new NameListHolder()
         {
 
+            @Override
             public List<String> getNames()
             {
                 return configuration;
@@ -107,11 +110,13 @@ public class FredModule
     {
         return new StringLookup()
         {
+            @Override
             public String lookup(String key)
             {
                 return configuration.get(key);
             }
 
+            @Override
             public List<String> keys()
             {
                 return InternalUtils.sortedKeys(configuration);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule.java
index b3605c5..f30df5f 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule.java
@@ -29,6 +29,7 @@ public class GreeterModule
     {
         return new Greeter()
         {
+            @Override
             public String getGreeting()
             {
                 return "Hello";
@@ -40,6 +41,7 @@ public class GreeterModule
     {
         return new Greeter()
         {
+            @Override
             public String getGreeting()
             {
                 return "Goodbye";
@@ -52,6 +54,7 @@ public class GreeterModule
     {
         return new Greeter()
         {
+            @Override
             public String getGreeting()
             {
                 return "Blue";

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule2.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule2.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule2.java
index c226c9c..dc8cb50 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule2.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule2.java
@@ -22,6 +22,7 @@ public class GreeterModule2
     {
         return new Greeter()
         {
+            @Override
             public String getGreeting()
             {
                 return "Green";
@@ -34,6 +35,7 @@ public class GreeterModule2
     {
         return new Greeter()
         {
+            @Override
             public String getGreeting()
             {
                 return "Blue";

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterServiceOverrideModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterServiceOverrideModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterServiceOverrideModule.java
index 9bbede8..8eca5be 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterServiceOverrideModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterServiceOverrideModule.java
@@ -20,6 +20,7 @@ public class GreeterServiceOverrideModule
     {
         return new Greeter()
         {
+            @Override
             public String getGreeting()
             {
                 return "Hello";
@@ -31,6 +32,7 @@ public class GreeterServiceOverrideModule
     {
         configuration.add(Greeter.class, new Greeter()
         {
+            @Override
             public String getGreeting()
             {
                 return "Override Greeting";

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InjectionCheckImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InjectionCheckImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InjectionCheckImpl.java
index dec588a..c9f26e8 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InjectionCheckImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InjectionCheckImpl.java
@@ -31,11 +31,13 @@ public class InjectionCheckImpl implements InjectionCheck
         this.configuration = configuration;
     }
 
+    @Override
     public Logger getLogger()
     {
         return logger;
     }
 
+    @Override
     public Object getValue(String key)
     {
         return configuration.get(key);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/IntHolderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/IntHolderImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/IntHolderImpl.java
index c6a0274..8c3c9ef 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/IntHolderImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/IntHolderImpl.java
@@ -23,6 +23,7 @@ public class IntHolderImpl implements IntHolder
         this.value = value;
     }
 
+    @Override
     public int getValue()
     {
         return value;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InvalidContributeDefModule2.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InvalidContributeDefModule2.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InvalidContributeDefModule2.java
index 0fcb442..eb065d8 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InvalidContributeDefModule2.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InvalidContributeDefModule2.java
@@ -27,6 +27,7 @@ public class InvalidContributeDefModule2
 
         return new NameListHolder()
         {
+            @Override
             public List<String> getNames()
             {
                 return configuration;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InvalidContributeDefModule3.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InvalidContributeDefModule3.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InvalidContributeDefModule3.java
index 20e0556..9554ca3 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InvalidContributeDefModule3.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/InvalidContributeDefModule3.java
@@ -27,6 +27,7 @@ public class InvalidContributeDefModule3
 
         return new Runnable()
         {
+            @Override
             public void run()
             {
 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/LocalModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/LocalModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/LocalModule.java
index 7cc5340..7cab003 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/LocalModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/LocalModule.java
@@ -22,6 +22,7 @@ public class LocalModule
     {
         return new Greeter()
         {
+            @Override
             public String getGreeting()
             {
                 return "Hello, y'all!";
@@ -33,10 +34,12 @@ public class LocalModule
     {
         return new StringHolder()
         {
+            @Override
             public void setValue(String value)
             {
             }
 
+            @Override
             public String getValue()
             {
                 return greeter.getGreeting();

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/NoImplementationClassForSimpleIdModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/NoImplementationClassForSimpleIdModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/NoImplementationClassForSimpleIdModule.java
index f55bce4..1c5a289 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/NoImplementationClassForSimpleIdModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/NoImplementationClassForSimpleIdModule.java
@@ -20,6 +20,7 @@ public class NoImplementationClassForSimpleIdModule
     {
         binder.bind(Runnable.class, new ServiceBuilder<Runnable>()
         {
+            @Override
             public Runnable buildService(ServiceResources resources)
             {
                 return null;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RecursiveConstructorModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RecursiveConstructorModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RecursiveConstructorModule.java
index 5b99bbd..b06a993 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RecursiveConstructorModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RecursiveConstructorModule.java
@@ -32,6 +32,7 @@ public class RecursiveConstructorModule
     {
         return new Runnable()
         {
+            @Override
             public void run()
             {
             }

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RedGreeterImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RedGreeterImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RedGreeterImpl.java
index 80d274e..78e5db7 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RedGreeterImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RedGreeterImpl.java
@@ -20,6 +20,7 @@ import org.apache.tapestry5.ioc.annotations.Marker;
 public class RedGreeterImpl implements Greeter
 {
 
+    @Override
     public String getGreeting()
     {
         return null;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RegistryBuilderTestModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RegistryBuilderTestModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RegistryBuilderTestModule.java
index 9b8732f..719db46 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RegistryBuilderTestModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RegistryBuilderTestModule.java
@@ -23,6 +23,7 @@ public class RegistryBuilderTestModule
     {
         return new Square()
         {
+            @Override
             public long square(long input)
             {
                 return input * input;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RocketImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RocketImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RocketImpl.java
index 9384bc8..3d534e0 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RocketImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RocketImpl.java
@@ -19,6 +19,7 @@ import org.apache.tapestry5.ioc.annotations.PreventServiceDecoration;
 @PreventServiceDecoration
 public class RocketImpl implements Rocket
 {
+    @Override
     public String getCountdown()
     {
         return "3, 2, 1, Launch!";

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceBuilderModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceBuilderModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceBuilderModule.java
index fcb9b48..4e9b78f 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceBuilderModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceBuilderModule.java
@@ -24,10 +24,12 @@ public class ServiceBuilderModule
     {
         binder.bind(Greeter.class, new ServiceBuilder<Greeter>()
         {
+            @Override
             public Greeter buildService(ServiceResources resources)
             {
                 return new Greeter()
                 {
+                    @Override
                     public String getGreeting()
                     {
                         return "Greetings from service Greeter.";
@@ -38,6 +40,7 @@ public class ServiceBuilderModule
 
         binder.bind(Greeter.class, new ServiceBuilder<Greeter>()
         {
+            @Override
             public Greeter buildService(ServiceResources resources)
             {
                 throw new RuntimeException("Failure inside ServiceBuilder callback.");

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceIdGreeter.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceIdGreeter.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceIdGreeter.java
index 4fdc614..aa74783 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceIdGreeter.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceIdGreeter.java
@@ -20,6 +20,7 @@ public class ServiceIdGreeter implements Greeter
 {
     private String greeting;
 
+    @Override
     public String getGreeting()
     {
         return greeting;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SpecificDecoratorModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SpecificDecoratorModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SpecificDecoratorModule.java
index 45dfe66..1f5c7f1 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SpecificDecoratorModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SpecificDecoratorModule.java
@@ -20,6 +20,7 @@ public class SpecificDecoratorModule
     {
         return new Greeter()
         {
+            @Override
             public String getGreeting()
             {
                 return delegate.getGreeting().toUpperCase();

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StaticModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StaticModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StaticModule.java
index 50f3f2a..84b4a91 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StaticModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StaticModule.java
@@ -39,6 +39,7 @@ public class StaticModule {
 
   public static Runnable buildFred() {
     return new Runnable() {
+      @Override
       public void run() {
         setFredRan(true);
       }
@@ -47,6 +48,7 @@ public class StaticModule {
 
   public static Runnable buildBarney() {
     return new Runnable() {
+      @Override
       public void run() {
       }
     };
@@ -54,6 +56,7 @@ public class StaticModule {
 
   public static Runnable decorateBarney(final Object delegate, String serviseId) {
     return new Runnable() {
+      @Override
       public void run() {
         setDecoratorRan(true);
 
@@ -88,6 +91,7 @@ public class StaticModule {
 
   public static NameListHolder buildNames(final Collection<String> configuration) {
     return new NameListHolder() {
+      @Override
       public List<String> getNames() {
         List<String> result = CollectionFactory.newList(configuration);
 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StringHolderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StringHolderImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StringHolderImpl.java
index 495d980..f433ad4 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StringHolderImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StringHolderImpl.java
@@ -24,12 +24,14 @@ public class StringHolderImpl implements StringHolder
 {
     private String value;
 
+    @Override
     @SimpleAnnotation("StringHolderImpl#getValue()")
     public String getValue()
     {
         return value;
     }
 
+    @Override
     public void setValue(String value)
     {
         this.value = value;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SymbolExpandingTransformer.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SymbolExpandingTransformer.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SymbolExpandingTransformer.java
index 044e3a6..1526274 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SymbolExpandingTransformer.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SymbolExpandingTransformer.java
@@ -22,6 +22,7 @@ public class SymbolExpandingTransformer implements StringTransformer
 
     public SymbolExpandingTransformer(SymbolSource symbolSource) {this.symbolSource = symbolSource;}
 
+    @Override
     public String transform(String input)
     {
         return symbolSource.expandSymbols(input);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnbuildablePingable.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnbuildablePingable.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnbuildablePingable.java
index a1edc1a..76432c1 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnbuildablePingable.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnbuildablePingable.java
@@ -23,6 +23,7 @@ public class UnbuildablePingable implements Pingable
     {
     }
 
+    @Override
     public void ping()
     {
     }

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnknownColorGreeterImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnknownColorGreeterImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnknownColorGreeterImpl.java
index 2dfbd8e..3dee8d5 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnknownColorGreeterImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnknownColorGreeterImpl.java
@@ -17,6 +17,7 @@ package org.apache.tapestry5.ioc;
 public class UnknownColorGreeterImpl implements Greeter
 {
 
+    @Override
     public String getGreeting()
     {
         return null;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UppercaseStringTransformer.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UppercaseStringTransformer.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UppercaseStringTransformer.java
index 5cab33f..24637e7 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UppercaseStringTransformer.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UppercaseStringTransformer.java
@@ -16,6 +16,7 @@ package org.apache.tapestry5.ioc;
 
 public class UppercaseStringTransformer implements StringTransformer
 {
+    @Override
     public String transform(String input)
     {
         return input.toUpperCase();

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AdviseByMarkerModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AdviseByMarkerModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AdviseByMarkerModule.java
index 71f6751..e2905ef 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AdviseByMarkerModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AdviseByMarkerModule.java
@@ -56,6 +56,7 @@ public class AdviseByMarkerModule
         receiver.adviseAllMethods(new MethodAdvice()
         {
 
+            @Override
             public void advise(MethodInvocation invocation)
             {
                 invocation.proceed();
@@ -80,6 +81,7 @@ public class AdviseByMarkerModule
     {
         return new Greeter()
         {
+            @Override
             public String getGreeting()
             {
                 return "Red";

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AdviseByMarkerModule2.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AdviseByMarkerModule2.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AdviseByMarkerModule2.java
index 9865f98..f0b5e74 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AdviseByMarkerModule2.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AdviseByMarkerModule2.java
@@ -32,6 +32,7 @@ public class AdviseByMarkerModule2
         receiver.adviseAllMethods(new MethodAdvice()
         {
 
+            @Override
             public void advise(MethodInvocation invocation)
             {
                 invocation.proceed();
@@ -70,6 +71,7 @@ public class AdviseByMarkerModule2
     {
         return new Greeter()
         {
+            @Override
             public String getGreeting()
             {
                 return "Red";

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AlphabetModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AlphabetModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AlphabetModule.java
index c3b89dc..6fffeb1 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AlphabetModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AlphabetModule.java
@@ -32,6 +32,7 @@ public class AlphabetModule
 
         return new NameListHolder()
         {
+            @Override
             public List<String> getNames()
             {
                 return configuration;
@@ -61,6 +62,7 @@ public class AlphabetModule
     {
         return new NameListHolder2()
         {
+            @Override
             public List<String> getNames()
             {
                 return configuration;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AlphabetModule2.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AlphabetModule2.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AlphabetModule2.java
index d3d1d3c..852caca 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AlphabetModule2.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AlphabetModule2.java
@@ -33,6 +33,7 @@ public class AlphabetModule2
 
         return new NameListHolder()
         {
+            @Override
             public List<String> getNames()
             {
                 return configuration;
@@ -46,6 +47,7 @@ public class AlphabetModule2
 
         return new NameListHolder()
         {
+            @Override
             public List<String> getNames()
             {
                 return configuration;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AnnotatedServiceInterfaceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AnnotatedServiceInterfaceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AnnotatedServiceInterfaceImpl.java
index ad5ddca..09c549e 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AnnotatedServiceInterfaceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/AnnotatedServiceInterfaceImpl.java
@@ -16,6 +16,7 @@ package org.apache.tapestry5.ioc.internal;
 
 public class AnnotatedServiceInterfaceImpl implements AnnotatedServiceInterface {
 
+    @Override
     public String execute(int i) {
         return null;
     }

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DecorateByMarkerModule.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DecorateByMarkerModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DecorateByMarkerModule.java
index c722e54..3686a29 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DecorateByMarkerModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DecorateByMarkerModule.java
@@ -70,6 +70,7 @@ public class DecorateByMarkerModule
         builder.adviseAllMethods(new MethodAdvice()
         {
 
+            @Override
             public void advise(MethodInvocation invocation)
             {
                 invocation.proceed();
@@ -89,6 +90,7 @@ public class DecorateByMarkerModule
     {
         return new Greeter()
         {
+            @Override
             public String getGreeting()
             {
                 return "Red";

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DecorateByMarkerModule2.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DecorateByMarkerModule2.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DecorateByMarkerModule2.java
index 2335f89..e3d917a 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DecorateByMarkerModule2.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DecorateByMarkerModule2.java
@@ -63,6 +63,7 @@ public class DecorateByMarkerModule2
         builder.adviseAllMethods(new MethodAdvice()
         {
 
+            @Override
             public void advise(MethodInvocation invocation)
             {
                 invocation.proceed();
@@ -82,6 +83,7 @@ public class DecorateByMarkerModule2
     {
         return new Greeter()
         {
+            @Override
             public String getGreeting()
             {
                 return "Red";