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:01 UTC

[4/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/services/AspectDecoratorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectDecoratorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectDecoratorImpl.java
index 66b3685..18aa888 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectDecoratorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectDecoratorImpl.java
@@ -36,11 +36,13 @@ public class AspectDecoratorImpl implements AspectDecorator
         this.proxyFactory = proxyFactory;
     }
 
+    @Override
     public <T> AspectInterceptorBuilder<T> createBuilder(Class<T> serviceInterface, final T delegate, String description)
     {
         return createBuilder(serviceInterface, delegate, new AnnotationAccessImpl(delegate.getClass()), description);
     }
 
+    @Override
     public <T> AspectInterceptorBuilder<T> createBuilder(final Class<T> serviceInterface, final T delegate,
                                                          AnnotationAccess annotationAccess, final String description)
     {
@@ -55,21 +57,25 @@ public class AspectDecoratorImpl implements AspectDecorator
         {
             private AspectInterceptorBuilder<T> builder;
 
+            @Override
             public void adviseMethod(Method method, org.apache.tapestry5.plastic.MethodAdvice advice)
             {
                 getBuilder().adviseMethod(method, advice);
             }
 
+            @Override
             public void adviseAllMethods(org.apache.tapestry5.plastic.MethodAdvice advice)
             {
                 getBuilder().adviseAllMethods(advice);
             }
 
+            @Override
             public Class getInterface()
             {
                 return serviceInterface;
             }
 
+            @Override
             public T build()
             {
                 return builder == null ? delegate : builder.build();

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectInterceptorBuilderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectInterceptorBuilderImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectInterceptorBuilderImpl.java
index e93288d..95fb1f6 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectInterceptorBuilderImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectInterceptorBuilderImpl.java
@@ -67,6 +67,7 @@ public class AspectInterceptorBuilderImpl<T> extends AbtractAspectInterceptorBui
                 new MethodDescription(delegateTypeName, PlasticProxyFactoryImpl.INTERNAL_GET_DELEGATE);
         plasticClass.introduceMethod(getDelegateMethodDescription, new InstructionBuilderCallback()
         {
+            @Override
             public void doBuild(InstructionBuilder builder)
             {
                 builder.loadThis().getField(delegateField);
@@ -75,6 +76,7 @@ public class AspectInterceptorBuilderImpl<T> extends AbtractAspectInterceptorBui
         });
     }
 
+    @Override
     public void adviseMethod(Method method, org.apache.tapestry5.plastic.MethodAdvice advice)
     {
         assert method != null;
@@ -87,6 +89,7 @@ public class AspectInterceptorBuilderImpl<T> extends AbtractAspectInterceptorBui
         plasticClass.introduceMethod(method).addAdvice(advice);
     }
 
+    @Override
     public void adviseAllMethods(org.apache.tapestry5.plastic.MethodAdvice advice)
     {
         for (Method m : serviceInterface.getMethods())
@@ -95,11 +98,13 @@ public class AspectInterceptorBuilderImpl<T> extends AbtractAspectInterceptorBui
         }
     }
 
+    @Override
     public Class getInterface()
     {
         return serviceInterface;
     }
 
+    @Override
     public T build()
     {
         return (T) transformation.createInstantiator().newInstance();

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AutobuildObjectProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AutobuildObjectProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AutobuildObjectProvider.java
index 6f0dafd..a36657c 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AutobuildObjectProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AutobuildObjectProvider.java
@@ -25,6 +25,7 @@ import org.apache.tapestry5.ioc.annotations.Autobuild;
  */
 public class AutobuildObjectProvider implements ObjectProvider
 {
+    @Override
     public <T> T provide(Class<T> objectType, AnnotationProvider annotationProvider,
             ObjectLocator locator)
     {

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilder.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilder.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilder.java
index 8ff4762..64dc84b 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilder.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilder.java
@@ -72,6 +72,7 @@ public class BridgeBuilder<S, F>
     {
         instantiator = proxyFactory.createProxy(serviceInterface, new PlasticClassTransformer()
         {
+            @Override
             public void transform(PlasticClass plasticClass)
             {
                 PlasticField filterField = plasticClass.introduceField(filterInterface, "filter")
@@ -158,6 +159,7 @@ public class BridgeBuilder<S, F>
 
         method.changeImplementation(new InstructionBuilderCallback()
         {
+            @Override
             public void doBuild(InstructionBuilder builder)
             {
                 String message = String.format("Method %s has no match in filter interface %s.", ms, filterInterface.getName());
@@ -174,6 +176,7 @@ public class BridgeBuilder<S, F>
     {
         method.changeImplementation(new InstructionBuilderCallback()
         {
+            @Override
             public void doBuild(InstructionBuilder builder)
             {
                 builder.loadThis().getField(filterField);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CachingObjectCreator.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CachingObjectCreator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CachingObjectCreator.java
index 8a0cb22..b89ac09 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CachingObjectCreator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CachingObjectCreator.java
@@ -34,6 +34,7 @@ public class CachingObjectCreator<T> extends LockSupport implements ObjectCreato
         this.delegate = delegate;
     }
 
+    @Override
     public T createObject()
     {
         try

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ChainBuilderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ChainBuilderImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ChainBuilderImpl.java
index 8d7e9c7..07be24f 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ChainBuilderImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ChainBuilderImpl.java
@@ -40,6 +40,7 @@ public class ChainBuilderImpl implements ChainBuilder
         this.proxyFactory = proxyFactory;
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public <T> T build(final Class<T> commandInterface, List<T> commands)
     {
@@ -51,6 +52,7 @@ public class ChainBuilderImpl implements ChainBuilder
 
         ClassInstantiator<T> instantiator = proxyFactory.createProxy(commandInterface, new PlasticClassTransformer()
         {
+            @Override
             public void transform(PlasticClass plasticClass)
             {
                 PlasticField commandsField = plasticClass.introduceField(commandsArray.getClass(), "commands").inject(
@@ -72,10 +74,12 @@ public class ChainBuilderImpl implements ChainBuilder
     {
         plasticClass.introduceMethod(method).changeImplementation(new InstructionBuilderCallback()
         {
+            @Override
             public void doBuild(InstructionBuilder builder)
             {
                 builder.loadThis().getField(commandsField).iterateArray(new InstructionBuilderCallback()
                 {
+                    @Override
                     public void doBuild(InstructionBuilder builder)
                     {
                         // The command is on the stack; add the elements and invoke the method.
@@ -113,11 +117,13 @@ public class ChainBuilderImpl implements ChainBuilder
 
                         builder.when(condition, new WhenCallback()
                         {
+                            @Override
                             public void ifTrue(InstructionBuilder builder)
                             {
                                 builder.returnResult();
                             }
 
+                            @Override
                             public void ifFalse(InstructionBuilder builder)
                             {
                                 if (wide)

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java
index 0168515..19b00ee 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java
@@ -37,6 +37,7 @@ public class ClassNameLocatorImpl implements ClassNameLocator
      */
     private final ClasspathMatcher CLASS_NAME_MATCHER = new ClasspathMatcher()
     {
+        @Override
         public boolean matches(String packagePath, String fileName)
         {
             if (!CLASS_NAME_PATTERN.matcher(fileName).matches())
@@ -60,6 +61,7 @@ public class ClassNameLocatorImpl implements ClassNameLocator
      */
     private final Mapper<String, String> CLASS_NAME_MAPPER = new Mapper<String, String>()
     {
+        @Override
         public String map(String element)
         {
             return element.substring(0, element.length() - 6).replace('/', '.');
@@ -75,6 +77,7 @@ public class ClassNameLocatorImpl implements ClassNameLocator
     /**
      * Synchronization should not be necessary, but perhaps the underlying ClassLoader's are sensitive to threading.
      */
+    @Override
     public synchronized Collection<String> locateClassNames(String packageName)
     {
         String packagePath = packageName.replace('.', '/') + "/";

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java
index a7858cf..9e032e6 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java
@@ -73,6 +73,7 @@ public class ClassPropertyAdapterImpl implements ClassPropertyAdapter
         }
     }
 
+    @Override
     public Class getBeanType()
     {
         return beanType;
@@ -86,26 +87,31 @@ public class ClassPropertyAdapterImpl implements ClassPropertyAdapter
         return String.format("<ClassPropertyAdaptor %s: %s>", beanType.getName(), names);
     }
 
+    @Override
     public List<String> getPropertyNames()
     {
         return InternalUtils.sortedKeys(adapters);
     }
 
+    @Override
     public PropertyAdapter getPropertyAdapter(String name)
     {
         return adapters.get(name);
     }
 
+    @Override
     public Object get(Object instance, String propertyName)
     {
         return adaptorFor(propertyName).get(instance);
     }
 
+    @Override
     public void set(Object instance, String propertyName, Object value)
     {
         adaptorFor(propertyName).set(instance, value);
     }
 
+    @Override
     public Annotation getAnnotation(Object instance, String propertyName, Class<? extends Annotation> annotationClass) {
     return adaptorFor(propertyName).getAnnotation(annotationClass);
     }

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClasspathScannerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClasspathScannerImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClasspathScannerImpl.java
index 775bf97..55ac8cb 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClasspathScannerImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClasspathScannerImpl.java
@@ -56,6 +56,7 @@ public class ClasspathScannerImpl implements ClasspathScanner
      * @return collection of matching paths, in no specified order
      * @throws java.io.IOException
      */
+    @Override
     public Set<String> scan(String packagePath, ClasspathMatcher matcher) throws IOException
     {
         assert packagePath != null && packagePath.endsWith("/");
@@ -205,6 +206,7 @@ public class ClasspathScannerImpl implements ClasspathScanner
             {
                 queue.push(new IOWork()
                 {
+                    @Override
                     public void run() throws IOException
                     {
                         scanDirStream(packagePath, url);
@@ -241,6 +243,7 @@ public class ClasspathScannerImpl implements ClasspathScanner
 
                         queue.push(new IOWork()
                         {
+                            @Override
                             public void run() throws IOException
                             {
                                 scanDir(nestedPackagePath, file);
@@ -299,6 +302,7 @@ public class ClasspathScannerImpl implements ClasspathScanner
 
                             queue.push(new IOWork()
                             {
+                                @Override
                                 public void run() throws IOException
                                 {
                                     scanURL(nestedPackagePath, newURL);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClasspathURLConverterImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClasspathURLConverterImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClasspathURLConverterImpl.java
index a0336fe..9c710fa 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClasspathURLConverterImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClasspathURLConverterImpl.java
@@ -23,6 +23,7 @@ import java.net.URL;
  */
 public class ClasspathURLConverterImpl implements ClasspathURLConverter
 {
+    @Override
     public URL convert(URL url)
     {
         return url;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CompoundCoercion.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CompoundCoercion.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CompoundCoercion.java
index 071551e..4a5dece 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CompoundCoercion.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CompoundCoercion.java
@@ -35,6 +35,7 @@ public class CompoundCoercion<S, I, T> implements Coercion<S, T>
         this.op2 = op2;
     }
 
+    @Override
     public T coerce(S input)
     {
         // Run the input through the first operation (S --> I), then run the result of that through

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/DefaultImplementationBuilderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/DefaultImplementationBuilderImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/DefaultImplementationBuilderImpl.java
index 8512128..34c7bf2 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/DefaultImplementationBuilderImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/DefaultImplementationBuilderImpl.java
@@ -36,6 +36,7 @@ public class DefaultImplementationBuilderImpl implements DefaultImplementationBu
         this.proxyFactory = proxyFactory;
     }
 
+    @Override
     public <S> S createDefaultImplementation(Class<S> serviceInterface)
     {
         S instance = serviceInterface.cast(cache.get(serviceInterface));
@@ -56,6 +57,7 @@ public class DefaultImplementationBuilderImpl implements DefaultImplementationBu
     {
         ClassInstantiator instantiator = proxyFactory.createProxy(serviceInterface, new PlasticClassTransformer()
         {
+            @Override
             public void transform(PlasticClass plasticClass)
             {
                 plasticClass.addToString(String.format("<NoOp %s>", serviceInterface.getName()));

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalysisImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalysisImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalysisImpl.java
index 48a153a..928d3b9 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalysisImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalysisImpl.java
@@ -32,6 +32,7 @@ public class ExceptionAnalysisImpl implements ExceptionAnalysis
         this.infos = unmodifiableList(infos);
     }
 
+    @Override
     public List<ExceptionInfo> getExceptionInfos()
     {
         return infos;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalyzerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalyzerImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalyzerImpl.java
index 002d338..a0e1359 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalyzerImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalyzerImpl.java
@@ -49,6 +49,7 @@ public class ExceptionAnalyzerImpl implements ExceptionAnalyzer
                 .getPropertyNames());
     }
 
+    @Override
     public ExceptionAnalysis analyze(Throwable rootException)
     {
         List<ExceptionInfo> list = CollectionFactory.newList();

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionInfoImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionInfoImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionInfoImpl.java
index 51820c3..07b8996 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionInfoImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionInfoImpl.java
@@ -40,26 +40,31 @@ public class ExceptionInfoImpl implements ExceptionInfo
         this.stackTrace = unmodifiableList(stackTrace);
     }
 
+    @Override
     public String getClassName()
     {
         return className;
     }
 
+    @Override
     public String getMessage()
     {
         return message;
     }
 
+    @Override
     public Object getProperty(String name)
     {
         return properties.get(name);
     }
 
+    @Override
     public List<String> getPropertyNames()
     {
         return InternalUtils.sortedKeys(properties);
     }
 
+    @Override
     public List<StackTraceElement> getStackTrace()
     {
         return stackTrace;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionTrackerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionTrackerImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionTrackerImpl.java
index 43a1540..9b8f9b8 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionTrackerImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionTrackerImpl.java
@@ -28,6 +28,7 @@ public class ExceptionTrackerImpl implements ExceptionTracker
 {
     private final Set<Throwable> exceptions = CollectionFactory.newSet();
 
+    @Override
     public boolean exceptionLogged(Throwable exception)
     {
         boolean result = exceptions.contains(exception);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/JustInTimeObjectCreator.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/JustInTimeObjectCreator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/JustInTimeObjectCreator.java
index c61f450..25eeda6 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/JustInTimeObjectCreator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/JustInTimeObjectCreator.java
@@ -48,6 +48,7 @@ public class JustInTimeObjectCreator<T> implements ObjectCreator<T>, EagerLoadSe
      *
      * @throws IllegalStateException if the registry has been shutdown
      */
+    @Override
     public T createObject()
     {
         if (object == null)
@@ -79,6 +80,7 @@ public class JustInTimeObjectCreator<T> implements ObjectCreator<T>, EagerLoadSe
     /**
      * Invokes {@link #createObject()} to force the creation of the underlying service.
      */
+    @Override
     public void eagerLoadService()
     {
         // Force object creation now
@@ -90,10 +92,12 @@ public class JustInTimeObjectCreator<T> implements ObjectCreator<T>, EagerLoadSe
      * Invoked when the Registry is shutdown; deletes the instantiated object (if it exists) and replaces
      * the ObjectCreator with one that throws an IllegalStateException.
      */
+    @Override
     public synchronized void run()
     {
         creator = new ObjectCreator<T>()
         {
+            @Override
             public T createObject()
             {
                 throw new IllegalStateException(ServiceMessages.registryShutdown(serviceId));

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LazyAdvisorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LazyAdvisorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LazyAdvisorImpl.java
index 8a84d04..5f4514a 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LazyAdvisorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LazyAdvisorImpl.java
@@ -36,6 +36,7 @@ public class LazyAdvisorImpl implements LazyAdvisor
         this.thunkCreator = thunkCreator;
     }
 
+    @Override
     public void addLazyMethodInvocationAdvice(MethodAdviceReceiver methodAdviceReceiver)
     {
         for (Method m : methodAdviceReceiver.getInterface().getMethods())
@@ -58,10 +59,12 @@ public class LazyAdvisorImpl implements LazyAdvisor
              * When the method is invoked, we don't immediately proceed. Instead, we return a thunk instance
              * that defers its behavior to the lazily invoked invocation.
              */
+            @Override
             public void advise(final MethodInvocation invocation)
             {
                 ObjectCreator deferred = new ObjectCreator()
                 {
+                    @Override
                     public Object createObject()
                     {
                         invocation.proceed();

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvice.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvice.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvice.java
index f34ae1a..7a068f6 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvice.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvice.java
@@ -28,6 +28,7 @@ public class LoggingAdvice implements MethodAdvice
         methodLogger = new MethodLogger(logger, exceptionTracker);
     }
 
+    @Override
     public void advise(MethodInvocation invocation)
     {
         boolean debug = methodLogger.isDebugEnabled();

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvisorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvisorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvisorImpl.java
index 5fb6916..5fc0354 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvisorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvisorImpl.java
@@ -31,6 +31,7 @@ public class LoggingAdvisorImpl implements LoggingAdvisor
         this.exceptionTracker = exceptionTracker;
     }
 
+    @Override
     public void addLoggingAdvice(Logger logger, MethodAdviceReceiver receiver)
     {
         MethodAdvice advice = new LoggingAdvice(logger, exceptionTracker);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingDecoratorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingDecoratorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingDecoratorImpl.java
index f5cc903..f2f963a 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingDecoratorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingDecoratorImpl.java
@@ -34,6 +34,7 @@ public class LoggingDecoratorImpl implements LoggingDecorator
         this.advisor = advisor;
     }
 
+    @Override
     public <T> T build(Class<T> serviceInterface, T delegate, String serviceId, final Logger logger)
     {
         AspectInterceptorBuilder<T> builder = aspectDecorator.createBuilder(serviceInterface, delegate, String.format(

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MapSymbolProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MapSymbolProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MapSymbolProvider.java
index 749f3db..e5de367 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MapSymbolProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MapSymbolProvider.java
@@ -31,6 +31,7 @@ public class MapSymbolProvider implements SymbolProvider
         this.configuration = configuration;
     }
 
+    @Override
     public String valueForSymbol(String symbolName)
     {
         return configuration.get(symbolName);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MasterObjectProviderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MasterObjectProviderImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MasterObjectProviderImpl.java
index b7fc153..dadf5c8 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MasterObjectProviderImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MasterObjectProviderImpl.java
@@ -38,6 +38,7 @@ public class MasterObjectProviderImpl implements MasterObjectProvider
         this.configuration.add(0, new StaticObjectProvider(OperationTracker.class, tracker));
     }
 
+    @Override
     public <T> T provide(final Class<T> objectType, final AnnotationProvider annotationProvider,
                          final ObjectLocator locator,
                          final boolean required)
@@ -45,6 +46,7 @@ public class MasterObjectProviderImpl implements MasterObjectProvider
         return tracker.invoke(String.format("Resolving object of type %s using MasterObjectProvider",
                 PlasticUtils.toTypeName(objectType)), new Invokable<T>()
         {
+            @Override
             public T invoke()
             {
                 for (ObjectProvider provider : configuration)

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodIterator.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodIterator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodIterator.java
index 5dc4b3a..c67ba75 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodIterator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodIterator.java
@@ -39,6 +39,7 @@ public class MethodIterator
 
     private static final Comparator<MethodSignature> COMPARATOR = new Comparator<MethodSignature>()
     {
+        @Override
         public int compare(MethodSignature o1, MethodSignature o2)
         {
 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/NonParallelExecutor.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/NonParallelExecutor.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/NonParallelExecutor.java
index 7d685b2..4a8d7b8 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/NonParallelExecutor.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/NonParallelExecutor.java
@@ -30,32 +30,38 @@ import java.util.concurrent.TimeoutException;
  */
 public class NonParallelExecutor implements ParallelExecutor
 {
+    @Override
     public <T> Future<T> invoke(Invokable<T> invocable)
     {
         final T result = invocable.invoke();
 
         return new Future<T>()
         {
+            @Override
             public boolean cancel(boolean mayInterruptIfRunning)
             {
                 return false;
             }
 
+            @Override
             public boolean isCancelled()
             {
                 return false;
             }
 
+            @Override
             public boolean isDone()
             {
                 return true;
             }
 
+            @Override
             public T get() throws InterruptedException, ExecutionException
             {
                 return result;
             }
 
+            @Override
             public T get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException
             {
                 return result;
@@ -63,6 +69,7 @@ public class NonParallelExecutor implements ParallelExecutor
         };
     }
 
+    @Override
     public <T> T invoke(Class<T> proxyType, Invokable<T> invocable)
     {
         return invocable.invoke();

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/OperationAdvisorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/OperationAdvisorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/OperationAdvisorImpl.java
index 0045ec5..a97f3bf 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/OperationAdvisorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/OperationAdvisorImpl.java
@@ -39,6 +39,7 @@ public class OperationAdvisorImpl implements OperationAdvisor
     {
         return new Runnable()
         {
+            @Override
             public void run()
             {
                 invocation.proceed();
@@ -55,6 +56,7 @@ public class OperationAdvisorImpl implements OperationAdvisor
             this.description = description;
         }
 
+        @Override
         public void advise(MethodInvocation invocation)
         {
             tracker.run(description, toRunnable(invocation));
@@ -70,6 +72,7 @@ public class OperationAdvisorImpl implements OperationAdvisor
             this.format = format;
         }
 
+        @Override
         public void advise(MethodInvocation invocation)
         {
             Object[] parameters = extractParameters(invocation);
@@ -94,6 +97,7 @@ public class OperationAdvisorImpl implements OperationAdvisor
         }
     }
 
+    @Override
     public void addOperationAdvice(MethodAdviceReceiver receiver)
     {
         for (Method m : receiver.getInterface().getMethods())
@@ -110,6 +114,7 @@ public class OperationAdvisorImpl implements OperationAdvisor
         }
     }
 
+    @Override
     public MethodAdvice createAdvice(String description)
     {
         assert InternalUtils.isNonBlank(description);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ParallelExecutorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ParallelExecutorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ParallelExecutorImpl.java
index 06824fc..206d0fc 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ParallelExecutorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ParallelExecutorImpl.java
@@ -40,6 +40,7 @@ public class ParallelExecutorImpl implements ParallelExecutor
         this.perthreadManager = perthreadManager;
     }
 
+    @Override
     public <T> Future<T> invoke(Invokable<T> invocable)
     {
         assert invocable != null;
@@ -51,6 +52,7 @@ public class ParallelExecutorImpl implements ParallelExecutor
     {
         return new Callable<T>()
         {
+            @Override
             public T call() throws Exception
             {
                 try
@@ -65,12 +67,14 @@ public class ParallelExecutorImpl implements ParallelExecutor
         };
     }
 
+    @Override
     public <T> T invoke(Class<T> proxyType, Invokable<T> invocable)
     {
         final Future<T> future = invoke(invocable);
 
         ObjectCreator<T> creator = new ObjectCreator<T>()
         {
+            @Override
             public T createObject()
             {
                 try

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceCreator.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceCreator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceCreator.java
index ea0c530..44b0d0f 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceCreator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceCreator.java
@@ -39,6 +39,7 @@ public class PerThreadServiceCreator implements ObjectCreator
      * an instance, and later calls will reuse the same per-thread instance. The instance is stored in the
      * {@link org.apache.tapestry5.ioc.services.PerthreadManager} and will be released at the end of the request.
      */
+    @Override
     public Object createObject()
     {
         if (perThreadValue.exists())

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceLifecycle.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceLifecycle.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceLifecycle.java
index 5b17ce0..118cb44 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceLifecycle.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceLifecycle.java
@@ -49,11 +49,13 @@ public class PerThreadServiceLifecycle implements ServiceLifecycle
     /**
      * Returns false; this lifecycle represents a service that will be created many times (by each thread).
      */
+    @Override
     public boolean isSingleton()
     {
         return false;
     }
 
+    @Override
     public Object createService(ServiceResources resources, ObjectCreator creator)
     {
         ObjectCreator perThreadCreator = new PerThreadServiceCreator(perthreadManager, creator);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/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 382c9a3..1cad0dc 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,6 +64,7 @@ public class PerthreadManagerImpl implements PerthreadManager
     {
         hub.addRegistryShutdownListener(new Runnable()
         {
+            @Override
             public void run()
             {
                 cleanup();
@@ -106,12 +107,14 @@ public class PerthreadManagerImpl implements PerthreadManager
         return result;
     }
 
+    @Override
     public void addThreadCleanupListener(final ThreadCleanupListener listener)
     {
         assert listener != null;
 
         addThreadCleanupCallback(new Runnable()
         {
+            @Override
             public void run()
             {
                 listener.threadDidCleanup();
@@ -119,6 +122,7 @@ public class PerthreadManagerImpl implements PerthreadManager
         });
     }
 
+    @Override
     public void addThreadCleanupCallback(Runnable callback)
     {
         assert callback != null;
@@ -130,6 +134,7 @@ public class PerthreadManagerImpl implements PerthreadManager
      * Instructs the hub to notify all its listeners (for the current thread).
      * It also discards its list of listeners.
      */
+    @Override
     public void cleanup()
     {
         List<Runnable> callbacks = getCallbacks();
@@ -173,11 +178,13 @@ public class PerthreadManagerImpl implements PerthreadManager
     {
         return new PerThreadValue<T>()
         {
+            @Override
             public T get()
             {
                 return get(null);
             }
 
+            @Override
             public T get(T defaultValue)
             {
                 Map map = getPerthreadMap();
@@ -195,6 +202,7 @@ public class PerthreadManagerImpl implements PerthreadManager
                 return defaultValue;
             }
 
+            @Override
             public T set(T newValue)
             {
                 getPerthreadMap().put(key, newValue == null ? NULL_VALUE : newValue);
@@ -202,6 +210,7 @@ public class PerthreadManagerImpl implements PerthreadManager
                 return newValue;
             }
 
+            @Override
             public boolean exists()
             {
                 return getPerthreadMap().containsKey(key);
@@ -209,11 +218,13 @@ public class PerthreadManagerImpl implements PerthreadManager
         };
     }
 
+    @Override
     public <T> PerThreadValue<T> createValue()
     {
         return createValue(uuidGenerator.getAndIncrement());
     }
 
+    @Override
     public void run(Runnable runnable)
     {
         assert runnable != null;
@@ -227,6 +238,7 @@ public class PerthreadManagerImpl implements PerthreadManager
         }
     }
 
+    @Override
     public <T> T invoke(Invokable<T> invokable)
     {
         try

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PipelineBuilderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PipelineBuilderImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PipelineBuilderImpl.java
index a64815f..562043c 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PipelineBuilderImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PipelineBuilderImpl.java
@@ -38,6 +38,7 @@ public class PipelineBuilderImpl implements PipelineBuilder
         this.defaultImplementationBuilder = defaultImplementationBuilder;
     }
 
+    @Override
     public <S, F> S build(Logger logger, Class<S> serviceInterface, Class<F> filterInterface, List<F> filters)
     {
         S terminator = defaultImplementationBuilder.createDefaultImplementation(serviceInterface);
@@ -45,6 +46,7 @@ public class PipelineBuilderImpl implements PipelineBuilder
         return build(logger, serviceInterface, filterInterface, filters, terminator);
     }
 
+    @Override
     public <S, F> S build(Logger logger, Class<S> serviceInterface, Class<F> filterInterface, List<F> filters,
             S terminator)
     {

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticClassListenerLogger.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticClassListenerLogger.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticClassListenerLogger.java
index ac3fccf..8ebdede 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticClassListenerLogger.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticClassListenerLogger.java
@@ -30,6 +30,7 @@ public class PlasticClassListenerLogger implements PlasticClassListener
         this.logger = logger;
     }
 
+    @Override
     public void classWillLoad(PlasticClassEvent event)
     {
         if (logger.isDebugEnabled())

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/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 a18bfba..112e29d 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
@@ -57,37 +57,44 @@ public class PlasticProxyFactoryImpl implements PlasticProxyFactory
         }
     }
 
+    @Override
     public ClassLoader getClassLoader()
     {
         return manager.getClassLoader();
     }
 
+    @Override
     public <T> ClassInstantiator<T> createProxy(Class<T> interfaceType, Class<? extends T> implementationType, PlasticClassTransformer callback)
     {
         return manager.createProxy(interfaceType, implementationType, callback);
     }
     
+    @Override
     public <T> ClassInstantiator<T> createProxy(Class<T> interfaceType, PlasticClassTransformer callback)
     {
         return manager.createProxy(interfaceType, callback);
     }
     
     
+    @Override
     public <T> PlasticClassTransformation<T> createProxyTransformation(Class<T> interfaceType,
             Class<? extends T> implementationType)
     {
         return manager.createProxyTransformation(interfaceType, implementationType);
     }
 
+    @Override
     public <T> PlasticClassTransformation<T> createProxyTransformation(Class<T> interfaceType)
     {
         return createProxyTransformation(interfaceType, null);
     }
 
+    @Override
     public <T> T createProxy(final Class<T> interfaceType, final ObjectCreator<T> creator, final String description)
     {   return createProxy(interfaceType, null, creator, description);
     }
     
+    @Override
     public <T> T createProxy(final Class<T> interfaceType, final Class<? extends T> implementationType,
             final ObjectCreator<T> creator, final String description)
     {
@@ -96,6 +103,7 @@ public class PlasticProxyFactoryImpl implements PlasticProxyFactory
 
         ClassInstantiator<T> instantiator = createProxy(interfaceType, implementationType, new PlasticClassTransformer()
         {
+            @Override
             public void transform(PlasticClass plasticClass)
             {
                 final PlasticField objectCreatorField = plasticClass.introduceField(ObjectCreator.class, "creator")
@@ -107,6 +115,7 @@ public class PlasticProxyFactoryImpl implements PlasticProxyFactory
 
                 final InstructionBuilderCallback returnCreateObject = new InstructionBuilderCallback()
                 {
+                    @Override
                     public void doBuild(InstructionBuilder builder)
                     {
                         builder.loadThis().getField(objectCreatorField);
@@ -142,10 +151,12 @@ public class PlasticProxyFactoryImpl implements PlasticProxyFactory
         return bytecode == null ? null : PlasticInternalUtils.convertBytecodeToClassNode(bytecode);
     }
 
+    @Override
     public Location getMethodLocation(final Method method)
     {
         ObjectCreator<String> descriptionCreator = new ObjectCreator<String>()
         {
+            @Override
             public String createObject()
             {
                 return InternalUtils.asString(method);
@@ -156,10 +167,12 @@ public class PlasticProxyFactoryImpl implements PlasticProxyFactory
                 descriptionCreator);
     }
 
+    @Override
     public Location getConstructorLocation(final Constructor constructor)
     {
         ObjectCreator<String> descriptionCreator = new ObjectCreator<String>()
         {
+            @Override
             public String createObject()
             {
                 StringBuilder builder = new StringBuilder(constructor.getDeclaringClass().getName()).append("(");
@@ -183,6 +196,7 @@ public class PlasticProxyFactoryImpl implements PlasticProxyFactory
                 descriptionCreator);
     }
 
+    @Override
     public void clearCache()
     {
         memberToLocation.clear();
@@ -257,11 +271,13 @@ public class PlasticProxyFactoryImpl implements PlasticProxyFactory
         return -1;
     }
 
+    @Override
     public void addPlasticClassListener(PlasticClassListener listener)
     {
         manager.addPlasticClassListener(listener);
     }
 
+    @Override
     public void removePlasticClassListener(PlasticClassListener listener)
     {
         manager.removePlasticClassListener(listener);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java
index 8a4a202..8dd1e02 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java
@@ -35,16 +35,19 @@ public class PropertyAccessImpl implements PropertyAccess
 {
     private final Map<Class, ClassPropertyAdapter> adapters = CollectionFactory.newConcurrentMap();
 
+    @Override
     public Object get(Object instance, String propertyName)
     {
         return getAdapter(instance).get(instance, propertyName);
     }
 
+    @Override
     public void set(Object instance, String propertyName, Object value)
     {
         getAdapter(instance).set(instance, propertyName, value);
     }
 
+    @Override
     public Annotation getAnnotation(Object instance, String propertyName, Class<? extends Annotation> annotationClass) {
     return getAdapter(instance).getAnnotation(instance, propertyName, annotationClass);
     }
@@ -53,6 +56,7 @@ public class PropertyAccessImpl implements PropertyAccess
     /**
      * Clears the cache of adapters and asks the {@link Introspector} to clear its cache.
      */
+    @Override
     public synchronized void clearCache()
     {
         adapters.clear();
@@ -60,11 +64,13 @@ public class PropertyAccessImpl implements PropertyAccess
         Introspector.flushCaches();
     }
 
+    @Override
     public ClassPropertyAdapter getAdapter(Object instance)
     {
         return getAdapter(instance.getClass());
     }
 
+    @Override
     public ClassPropertyAdapter getAdapter(Class forClass)
     {
         ClassPropertyAdapter result = adapters.get(forClass);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAdapterImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAdapterImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAdapterImpl.java
index 5845cc6..97685ef 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAdapterImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAdapterImpl.java
@@ -78,31 +78,37 @@ public class PropertyAdapterImpl implements PropertyAdapter
         writeMethod = null;
     }
 
+    @Override
     public String getName()
     {
         return name;
     }
 
+    @Override
     public Method getReadMethod()
     {
         return readMethod;
     }
 
+    @Override
     public Class getType()
     {
         return type;
     }
 
+    @Override
     public Method getWriteMethod()
     {
         return writeMethod;
     }
 
+    @Override
     public boolean isRead()
     {
         return field != null || readMethod != null;
     }
 
+    @Override
     public boolean isUpdate()
     {
         return writeMethod != null || (field != null && !isFinal(field));
@@ -113,6 +119,7 @@ public class PropertyAdapterImpl implements PropertyAdapter
         return Modifier.isFinal(member.getModifiers());
     }
 
+    @Override
     public Object get(Object instance)
     {
         if (field == null && readMethod == null)
@@ -139,6 +146,7 @@ public class PropertyAdapterImpl implements PropertyAdapter
         throw new RuntimeException(ServiceMessages.readFailure(name, instance, fail), fail);
     }
 
+    @Override
     public void set(Object instance, Object value)
     {
         if (field == null && writeMethod == null)
@@ -177,6 +185,7 @@ public class PropertyAdapterImpl implements PropertyAdapter
         return instance == null ? "<null>" : instance.getClass().getName();
     }
 
+    @Override
     public <T extends Annotation> T getAnnotation(Class<T> annotationClass)
     {
         return getAnnnotationProvider().getAnnotation(annotationClass);
@@ -226,31 +235,37 @@ public class PropertyAdapterImpl implements PropertyAdapter
         return annotationProvider;
     }
 
+    @Override
     public boolean isCastRequired()
     {
         return castRequired;
     }
 
+    @Override
     public ClassPropertyAdapter getClassAdapter()
     {
         return classAdapter;
     }
 
+    @Override
     public Class getBeanType()
     {
         return classAdapter.getBeanType();
     }
 
+    @Override
     public boolean isField()
     {
         return field != null;
     }
 
+    @Override
     public Field getField()
     {
         return field;
     }
 
+    @Override
     public Class getDeclaringClass()
     {
         return declaringClass;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyShadowBuilderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyShadowBuilderImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyShadowBuilderImpl.java
index 187f25f..9011b6e 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyShadowBuilderImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyShadowBuilderImpl.java
@@ -34,6 +34,7 @@ public class PropertyShadowBuilderImpl implements PropertyShadowBuilder
         this.propertyAccess = propertyAccess;
     }
 
+    @Override
     public <T> T build(final Object source, final String propertyName, final Class<T> propertyType)
     {
         final Class sourceClass = source.getClass();
@@ -57,6 +58,7 @@ public class PropertyShadowBuilderImpl implements PropertyShadowBuilder
 
         ClassInstantiator instantiator = proxyFactory.createProxy(propertyType, new PlasticClassTransformer()
         {
+            @Override
             public void transform(PlasticClass plasticClass)
             {
                 final PlasticField sourceField = plasticClass.introduceField(sourceClass, "source").inject(source);
@@ -69,6 +71,7 @@ public class PropertyShadowBuilderImpl implements PropertyShadowBuilder
 
                 delegateMethod.changeImplementation(new InstructionBuilderCallback()
                 {
+                    @Override
                     public void doBuild(InstructionBuilder builder)
                     {
                         builder.loadThis().getField(sourceField);
@@ -78,6 +81,7 @@ public class PropertyShadowBuilderImpl implements PropertyShadowBuilder
 
                         builder.dupe().when(Condition.NULL, new InstructionBuilderCallback()
                         {
+                            @Override
                             public void doBuild(InstructionBuilder builder)
                             {
                                 builder.throwException(

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryShutdownHubImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryShutdownHubImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryShutdownHubImpl.java
index 912918e..338976d 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryShutdownHubImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryShutdownHubImpl.java
@@ -40,12 +40,14 @@ public class RegistryShutdownHubImpl implements RegistryShutdownHub
         this.logger = logger;
     }
 
+    @Override
     public void addRegistryShutdownListener(final RegistryShutdownListener listener)
     {
         assert listener != null;
 
         addRegistryShutdownListener(new Runnable()
         {
+            @Override
             public void run()
             {
                 listener.registryDidShutdown();
@@ -53,6 +55,7 @@ public class RegistryShutdownHubImpl implements RegistryShutdownHub
         });
     }
 
+    @Override
     public void addRegistryShutdownListener(Runnable listener)
     {
         assert listener != null;
@@ -62,6 +65,7 @@ public class RegistryShutdownHubImpl implements RegistryShutdownHub
         listeners.add(listener);
     }
 
+    @Override
     public void addRegistryWillShutdownListener(Runnable listener)
     {
         assert listener != null;
@@ -81,6 +85,7 @@ public class RegistryShutdownHubImpl implements RegistryShutdownHub
 
         F.flow(preListeners).concat(listeners).each(new Worker<Runnable>()
         {
+            @Override
             public void work(Runnable element)
             {
                 try

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryStartup.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryStartup.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryStartup.java
index 13f0c1a..8988d74 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryStartup.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryStartup.java
@@ -43,6 +43,7 @@ public class RegistryStartup implements Runnable
      * Invokes run() on each contributed object. If the object throws a runtime exception, it is logged but startup
      * continues anyway. This method may only be {@linkplain OneShotLock invoked once}.
      */
+    @Override
     public void run()
     {
         lock.lock();

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ResourceSymbolProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ResourceSymbolProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ResourceSymbolProvider.java
index 0222ab7..cd9c1e6 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ResourceSymbolProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ResourceSymbolProvider.java
@@ -75,6 +75,7 @@ public class ResourceSymbolProvider implements SymbolProvider
         }
     }
 
+    @Override
     public String valueForSymbol(String symbolName)
     {
         return properties.get(symbolName);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ServiceOverrideImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ServiceOverrideImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ServiceOverrideImpl.java
index cf29dad..a9d3e9e 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ServiceOverrideImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ServiceOverrideImpl.java
@@ -32,10 +32,12 @@ public class ServiceOverrideImpl implements ServiceOverride
         this.configuration = configuration;
     }
 
+    @Override
     public ObjectProvider getServiceOverrideProvider()
     {
         return new ObjectProvider()
         {
+            @Override
             public <T> T provide(Class<T> objectType, AnnotationProvider annotationProvider, ObjectLocator locator)
             {
                 return objectType.cast(configuration.get(objectType));

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StaticObjectProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StaticObjectProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StaticObjectProvider.java
index 0aa0bcf..b8d454c 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StaticObjectProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StaticObjectProvider.java
@@ -39,6 +39,7 @@ public class StaticObjectProvider<S> implements ObjectProvider
     }
 
 
+    @Override
     public <T> T provide(Class<T> objectType, AnnotationProvider annotationProvider, ObjectLocator locator)
     {
         if (objectType == valueType)

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StrategyBuilderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StrategyBuilderImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StrategyBuilderImpl.java
index 5a333f4..e7f65a6 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StrategyBuilderImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StrategyBuilderImpl.java
@@ -39,11 +39,13 @@ public class StrategyBuilderImpl implements StrategyBuilder
         this.proxyFactory = proxyFactory;
     }
 
+    @Override
     public <S> S build(StrategyRegistry<S> registry)
     {
         return createProxy(registry.getAdapterType(), registry);
     }
 
+    @Override
     public <S> S build(Class<S> adapterType, Map<Class, S> registrations)
     {
         StrategyRegistry<S> registry = StrategyRegistry.newInstance(adapterType, registrations);
@@ -55,6 +57,7 @@ public class StrategyBuilderImpl implements StrategyBuilder
     {
         ClassInstantiator instantiator = proxyFactory.createProxy(interfaceType, new PlasticClassTransformer()
         {
+            @Override
             public void transform(PlasticClass plasticClass)
             {
                 final PlasticField registryField = plasticClass.introduceField(StrategyRegistry.class, "registry")
@@ -64,6 +67,7 @@ public class StrategyBuilderImpl implements StrategyBuilder
                 {
                     plasticClass.introduceMethod(new MethodDescription(method), new InstructionBuilderCallback()
                     {
+                        @Override
                         public void doBuild(InstructionBuilder builder)
                         {
                             Class returnType = method.getReturnType();

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StringLocation.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StringLocation.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StringLocation.java
index 3a94d04..0769b7e 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StringLocation.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StringLocation.java
@@ -41,11 +41,13 @@ public final class StringLocation implements Location
     /**
      * Returns 0.
      */
+    @Override
     public int getColumn()
     {
         return 0;
     }
 
+    @Override
     public int getLine()
     {
         return line;
@@ -54,6 +56,7 @@ public final class StringLocation implements Location
     /**
      * Returns null; we don't know where the file really is (it's probably a class on the class path).
      */
+    @Override
     public Resource getResource()
     {
         return null;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolObjectProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolObjectProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolObjectProvider.java
index 5c5a847..ceba5b8 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolObjectProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolObjectProvider.java
@@ -40,6 +40,7 @@ public class SymbolObjectProvider implements ObjectProvider
         this.typeCoercer = typeCoercer;
     }
 
+    @Override
     public <T> T provide(Class<T> objectType, AnnotationProvider annotationProvider, ObjectLocator locator)
     {
         Symbol annotation = annotationProvider.getAnnotation(Symbol.class);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolSourceImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolSourceImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolSourceImpl.java
index c69af03..13830ee 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolSourceImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolSourceImpl.java
@@ -199,11 +199,13 @@ public class SymbolSourceImpl implements SymbolSource
         this.providers = providers;
     }
 
+    @Override
     public String expandSymbols(String input)
     {
         return new SymbolExpansion().expandSymbols(input);
     }
 
+    @Override
     public String valueForSymbol(String symbolName)
     {
         String value = cache.get(symbolName);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemEnvSymbolProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemEnvSymbolProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemEnvSymbolProvider.java
index a064538..f2c7bcf 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemEnvSymbolProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemEnvSymbolProvider.java
@@ -29,6 +29,7 @@ public class SystemEnvSymbolProvider implements SymbolProvider
 {
     private final Map<String, String> symbols = CollectionFactory.newCaseInsensitiveMap();
 
+    @Override
     public synchronized String valueForSymbol(String symbolName)
     {
         if (symbols.isEmpty())

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemPropertiesSymbolProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemPropertiesSymbolProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemPropertiesSymbolProvider.java
index 023f785..7de1254 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemPropertiesSymbolProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemPropertiesSymbolProvider.java
@@ -22,6 +22,7 @@ import org.apache.tapestry5.ioc.services.SymbolProvider;
  */
 public class SystemPropertiesSymbolProvider implements SymbolProvider
 {
+    @Override
     public String valueForSymbol(String symbolName)
     {
         return System.getProperty(symbolName);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThreadLocaleImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThreadLocaleImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThreadLocaleImpl.java
index 1c16ae3..3191517 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThreadLocaleImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThreadLocaleImpl.java
@@ -25,11 +25,13 @@ public class ThreadLocaleImpl implements ThreadLocale
 {
     private Locale locale = Locale.getDefault();
 
+    @Override
     public Locale getLocale()
     {
         return locale;
     }
 
+    @Override
     public void setLocale(Locale locale)
     {
         assert locale != null;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThunkCreatorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThunkCreatorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThunkCreatorImpl.java
index 24577ce..eafb2cd 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThunkCreatorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThunkCreatorImpl.java
@@ -47,6 +47,7 @@ public class ThunkCreatorImpl implements ThunkCreator
         this.proxyFactory = proxyFactory;
     }
 
+    @Override
     public <T> T createThunk(Class<T> proxyType, ObjectCreator objectCreator, String description)
     {
         assert proxyType != null;
@@ -80,6 +81,7 @@ public class ThunkCreatorImpl implements ThunkCreator
     {
         return proxyFactory.createProxy(interfaceType, new PlasticClassTransformer()
         {
+            @Override
             public void transform(PlasticClass plasticClass)
             {
                 final PlasticField objectCreatorField = plasticClass.introduceField(ObjectCreator.class, "creator")
@@ -90,6 +92,7 @@ public class ThunkCreatorImpl implements ThunkCreator
 
                 delegateMethod.changeImplementation(new InstructionBuilderCallback()
                 {
+                    @Override
                     public void doBuild(InstructionBuilder builder)
                     {
                         builder.loadThis().getField(objectCreatorField);
@@ -110,6 +113,7 @@ public class ThunkCreatorImpl implements ThunkCreator
 
                     plasticClass.introduceMethod(PlasticUtils.TO_STRING_DESCRIPTION, new InstructionBuilderCallback()
                     {
+                        @Override
                         public void doBuild(InstructionBuilder builder)
                         {
                             builder.loadThis().getField(descriptionField).returnResult();

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImpl.java
index 170ca52..46f1c0a 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImpl.java
@@ -101,6 +101,7 @@ public class TypeCoercerImpl extends LockSupport implements TypeCoercer
 
     private static final Coercion NO_COERCION = new Coercion<Object, Object>()
     {
+        @Override
         public Object coerce(Object input)
         {
             return input;
@@ -109,6 +110,7 @@ public class TypeCoercerImpl extends LockSupport implements TypeCoercer
 
     private static final Coercion COERCION_NULL_TO_OBJECT = new Coercion<Void, Object>()
     {
+        @Override
         public Object coerce(Void input)
         {
             return null;
@@ -131,6 +133,7 @@ public class TypeCoercerImpl extends LockSupport implements TypeCoercer
         }
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public Object coerce(Object input, Class targetType)
     {
@@ -147,6 +150,7 @@ public class TypeCoercerImpl extends LockSupport implements TypeCoercer
         return getTargetCoercion(effectiveTargetType).coerce(input);
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public <S, T> Coercion<S, T> getCoercion(Class<S> sourceType, Class<T> targetType)
     {
@@ -164,6 +168,7 @@ public class TypeCoercerImpl extends LockSupport implements TypeCoercer
         return getTargetCoercion(effectiveTargetType).getCoercion(effectiveSourceType);
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public <S, T> String explain(Class<S> sourceType, Class<T> targetType)
     {
@@ -222,6 +227,7 @@ public class TypeCoercerImpl extends LockSupport implements TypeCoercer
         }
     }
 
+    @Override
     public void clearCache()
     {
         try

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/UpdateListenerHubImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/UpdateListenerHubImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/UpdateListenerHubImpl.java
index 9fde2ae..1f33196 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/UpdateListenerHubImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/UpdateListenerHubImpl.java
@@ -28,6 +28,7 @@ public class UpdateListenerHubImpl implements UpdateListenerHub
 {
     private final List<WeakReference<UpdateListener>> listeners = CollectionFactory.newThreadSafeList();
 
+    @Override
     public void addUpdateListener(UpdateListener listener)
     {
         assert listener != null;
@@ -37,6 +38,7 @@ public class UpdateListenerHubImpl implements UpdateListenerHub
     /**
      * Notifies all {@link UpdateListener}s.
      */
+    @Override
     public void fireCheckForUpdates()
     {
         List<WeakReference<UpdateListener>> deadReferences = CollectionFactory.newList();

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ValueObjectProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ValueObjectProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ValueObjectProvider.java
index 828c669..4766fcf 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ValueObjectProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ValueObjectProvider.java
@@ -42,6 +42,7 @@ public class ValueObjectProvider implements ObjectProvider
         this.typeCoercer = typeCoercer;
     }
 
+    @Override
     public <T> T provide(Class<T> objectType, AnnotationProvider annotationProvider, ObjectLocator locator)
     {
         Value annotation = annotationProvider.getAnnotation(Value.class);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/CronExpression.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/CronExpression.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/CronExpression.java
index 864c61a..e2a3c75 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/CronExpression.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/CronExpression.java
@@ -386,6 +386,7 @@ public class CronExpression implements Serializable
      *
      * @return a string representation of the <CODE>CronExpression</CODE>
      */
+    @Override
     public String toString()
     {
         return cronExpression;

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/PeriodicExecutorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/PeriodicExecutorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/PeriodicExecutorImpl.java
index 0177c56..abfcde9 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/PeriodicExecutorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/PeriodicExecutorImpl.java
@@ -68,6 +68,7 @@ public class PeriodicExecutorImpl implements PeriodicExecutor, Runnable
             nextExecution = schedule.firstExecution();
         }
 
+        @Override
         public String getName()
         {
             return name;
@@ -79,16 +80,19 @@ public class PeriodicExecutorImpl implements PeriodicExecutor, Runnable
         }
 
 
+        @Override
         public synchronized boolean isExecuting()
         {
             return executing;
         }
 
+        @Override
         public synchronized boolean isCanceled()
         {
             return canceled;
         }
 
+        @Override
         public synchronized void cancel()
         {
             canceled = true;
@@ -166,6 +170,7 @@ public class PeriodicExecutorImpl implements PeriodicExecutor, Runnable
             }
         }
 
+        @Override
         public Void invoke()
         {
             if (logger.isDebugEnabled())
@@ -196,6 +201,7 @@ public class PeriodicExecutorImpl implements PeriodicExecutor, Runnable
     {
         hub.addRegistryShutdownListener(new Runnable()
         {
+            @Override
             public void run()
             {
                 registryDidShutdown();
@@ -217,6 +223,7 @@ public class PeriodicExecutorImpl implements PeriodicExecutor, Runnable
     }
 
 
+    @Override
     public synchronized PeriodicJob addJob(Schedule schedule, String name, Runnable job)
     {
         assert schedule != null;
@@ -242,6 +249,7 @@ public class PeriodicExecutorImpl implements PeriodicExecutor, Runnable
         return periodicJob;
     }
 
+    @Override
     public void run()
     {
         while (!isShutdown())

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/AbstractResource.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/AbstractResource.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/AbstractResource.java
index 7020cb9..f85cf02 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/AbstractResource.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/AbstractResource.java
@@ -64,11 +64,13 @@ public abstract class AbstractResource extends LockSupport implements Resource
         this.path = path.startsWith("/") ? path.substring(1) : path;
     }
 
+    @Override
     public final String getPath()
     {
         return path;
     }
 
+    @Override
     public final String getFile()
     {
         return extractFile(path);
@@ -81,6 +83,7 @@ public abstract class AbstractResource extends LockSupport implements Resource
         return path.substring(slashx + 1);
     }
 
+    @Override
     public final String getFolder()
     {
         int slashx = path.lastIndexOf('/');
@@ -88,6 +91,7 @@ public abstract class AbstractResource extends LockSupport implements Resource
         return (slashx < 0) ? "" : path.substring(0, slashx);
     }
 
+    @Override
     public final Resource forFile(String relativePath)
     {
         assert relativePath != null;
@@ -140,6 +144,7 @@ public abstract class AbstractResource extends LockSupport implements Resource
         return createResource(path.toString());
     }
 
+    @Override
     public final Resource forLocale(Locale locale)
     {
         try
@@ -202,6 +207,7 @@ public abstract class AbstractResource extends LockSupport implements Resource
         return null;
     }
 
+    @Override
     public final Resource withExtension(String extension)
     {
         assert InternalUtils.isNonBlank(extension);
@@ -228,6 +234,7 @@ public abstract class AbstractResource extends LockSupport implements Resource
     /**
      * Simple check for whether {@link #toURL()} returns null or not.
      */
+    @Override
     public boolean exists()
     {
         try
@@ -266,6 +273,7 @@ public abstract class AbstractResource extends LockSupport implements Resource
     /**
      * Obtains the URL for the Resource and opens the stream, wrapped by a BufferedInputStream.
      */
+    @Override
     public InputStream openStream() throws IOException
     {
         URL url = toURL();

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ClasspathResource.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ClasspathResource.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ClasspathResource.java
index 84e44f6..c49c88a 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ClasspathResource.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ClasspathResource.java
@@ -50,6 +50,7 @@ public final class ClasspathResource extends AbstractResource
         return new ClasspathResource(classLoader, path);
     }
 
+    @Override
     public URL toURL()
     {
         try

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConcurrentBarrier.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConcurrentBarrier.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConcurrentBarrier.java
index fd33d1f..f861e8d 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConcurrentBarrier.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConcurrentBarrier.java
@@ -105,6 +105,7 @@ public class ConcurrentBarrier
     {
         Invokable<Void> invokable = new Invokable<Void>()
         {
+            @Override
             public Void invoke()
             {
                 runnable.run();
@@ -195,6 +196,7 @@ public class ConcurrentBarrier
     {
         Invokable<Void> invokable = new Invokable<Void>()
         {
+            @Override
             public Void invoke()
             {
                 runnable.run();

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConstructionPlan.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConstructionPlan.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConstructionPlan.java
index 9b702fc..e87ac39 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConstructionPlan.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConstructionPlan.java
@@ -55,6 +55,7 @@ public class ConstructionPlan<T> implements ObjectCreator<T>
         return this;
     }
 
+    @Override
     public T createObject()
     {
         T result = tracker.invoke(description, instanceConstructor);
@@ -73,6 +74,7 @@ public class ConstructionPlan<T> implements ObjectCreator<T>
         {
             tracker.run(plan.getDescription(), new Runnable()
             {
+                @Override
                 public void run()
                 {
                     plan.initialize(newInstance);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConstructorInvoker.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConstructorInvoker.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConstructorInvoker.java
index 17bd6da..3eea5ab 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConstructorInvoker.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConstructorInvoker.java
@@ -38,6 +38,7 @@ public class ConstructorInvoker<T> implements Invokable<T>
         this.constructorParameters = constructorParameters;
     }
 
+    @Override
     public T invoke()
     {
         Throwable fail;