Updated Branches: refs/heads/master baabe981c -> 629fa5a41
unbreak the build for non-IDEA users Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/629fa5a4 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/629fa5a4 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/629fa5a4 Branch: refs/heads/master Commit: 629fa5a41e6f5a4598055a551da07b02725fa572 Parents: baabe98 Author: Ulrich Staerk <u...@apache.org> Authored: Wed Jan 9 01:40:05 2013 +0100 Committer: Ulrich Staerk <u...@apache.org> Committed: Wed Jan 9 01:40:05 2013 +0100 ---------------------------------------------------------------------- build.gradle | 6 +++--- .../beanvalidator/BeanValidatorModule.java | 6 ------ .../tapestry5/internal/beanvalidator/BaseCCD.java | 2 -- tapestry-clojure/build.gradle | 2 +- .../internal/clojure/AnnotationMapper.java | 1 - .../internal/clojure/ClojureBuilderImpl.java | 4 ---- .../tapestry5/internal/clojure/DefaultMapper.java | 1 - .../tapestry5/corelib/base/BaseClientElement.java | 1 - .../tapestry5/corelib/components/AjaxFormLoop.java | 1 - .../tapestry5/corelib/components/Palette.java | 1 - .../apache/tapestry5/corelib/components/Tree.java | 1 - .../internal/event/InvalidationEventHubImpl.java | 5 ----- .../internal/model/MutableComponentModelImpl.java | 1 - .../services/AjaxPartialResponseRendererImpl.java | 1 - .../internal/services/AssetSourceImpl.java | 1 - .../services/ComponentClassResolverImpl.java | 2 -- .../tapestry5/internal/services/MapMessages.java | 1 - .../internal/services/PageNameMetaInjector.java | 1 - .../services/PartialMarkupDocumentLinker.java | 1 - .../internal/services/RequestOperationTracker.java | 4 ---- .../services/ResourceDigestManagerImpl.java | 3 --- .../internal/services/TranslatorSourceImpl.java | 1 - .../services/ajax/JavaScriptSupportImpl.java | 6 ------ .../internal/services/assets/DelegatingSRS.java | 2 -- .../services/assets/ResourceChangeTrackerImpl.java | 1 - .../assets/StreamableResourceSourceImpl.java | 1 - .../services/compatibility/CompatibilityImpl.java | 1 - .../compatibility/DeprecationWarningImpl.java | 3 --- .../javascript/ConfigureHTMLElementFilter.java | 1 - .../javascript/ModuleAssetRequestHandler.java | 1 - .../services/javascript/ModuleManagerImpl.java | 1 - .../ClientLocalizationMessageResource.java | 1 - .../tapestry5/internal/transform/ImportWorker.java | 1 - .../internal/util/DelegatingSymbolProvider.java | 1 - .../internal/util/MessageCatalogResource.java | 2 -- .../tapestry5/internal/util/VirtualResource.java | 8 -------- .../apache/tapestry5/services/TapestryModule.java | 1 - .../src/main/java/org/apache/tapestry5/func/F.java | 1 - .../internal/services/ClassNameLocatorImpl.java | 2 -- .../internal/services/ClasspathScannerImpl.java | 3 --- .../internal/services/PerthreadManagerImpl.java | 1 - .../tapestry5/ioc/internal/util/MessagesImpl.java | 1 - .../test/integration/SanityCheckTestSuite.java | 5 ++++- .../yuicompressor/JavaScriptResourceMinimizer.java | 1 - 44 files changed, 8 insertions(+), 84 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 37d8f43..fde0a27 100644 --- a/build.gradle +++ b/build.gradle @@ -85,9 +85,9 @@ allprojects { idea { project { - // Technically, Tapestry is built for JDK 1.5, but we're all using Eclipse or IntelliJ with - // JDK 1.6 at this point. - jdkName = "1.6" + // Leave at 1.5 to make sure that IDEA doesn't break the build for non-IDEA users by inserting + // @Override on implementations all over the place. + jdkName = "1.5" } } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/beanvalidator/BeanValidatorModule.java ---------------------------------------------------------------------- diff --git a/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/beanvalidator/BeanValidatorModule.java b/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/beanvalidator/BeanValidatorModule.java index d952b3d..0ce98a3 100644 --- a/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/beanvalidator/BeanValidatorModule.java +++ b/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/beanvalidator/BeanValidatorModule.java @@ -91,7 +91,6 @@ public class BeanValidatorModule { configuration.add(new BaseCCD(Max.class, "value") { - @Override public void applyClientValidation(MarkupWriter writer, String message, Map<String, Object> attributes) { javaScriptSupport.require("t5/core/validation"); @@ -105,7 +104,6 @@ public class BeanValidatorModule configuration.add(new BaseCCD(Min.class, "value") { - @Override public void applyClientValidation(MarkupWriter writer, String message, Map<String, Object> attributes) { javaScriptSupport.require("t5/core/validation"); @@ -119,7 +117,6 @@ public class BeanValidatorModule configuration.add(new BaseCCD(NotNull.class) { - @Override public void applyClientValidation(MarkupWriter writer, String message, Map<String, Object> attributes) { javaScriptSupport.require("t5/core/validation"); @@ -132,7 +129,6 @@ public class BeanValidatorModule configuration.add(new BaseCCD(Null.class) { - @Override public void applyClientValidation(MarkupWriter writer, String message, Map<String, Object> attributes) { javaScriptSupport.require("t5/beanvalidator/validation"); @@ -145,7 +141,6 @@ public class BeanValidatorModule configuration.add(new BaseCCD(Pattern.class, "regexp") { - @Override public void applyClientValidation(MarkupWriter writer, String message, Map<String, Object> attributes) { javaScriptSupport.require("t5/core/validation"); @@ -158,7 +153,6 @@ public class BeanValidatorModule configuration.add(new BaseCCD(Size.class, "min", "max") { - @Override public void applyClientValidation(MarkupWriter writer, String message, Map<String, Object> attributes) { javaScriptSupport.require("t5/beanvalidator/validation"); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/BaseCCD.java ---------------------------------------------------------------------- diff --git a/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/BaseCCD.java b/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/BaseCCD.java index 78ed0de..d313a0d 100644 --- a/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/BaseCCD.java +++ b/tapestry-beanvalidator/src/main/java/org/apache/tapestry5/internal/beanvalidator/BaseCCD.java @@ -47,7 +47,6 @@ public abstract class BaseCCD implements ClientConstraintDescriptor /** * Returns the annotation describing the constraint declaration. */ - @Override public Class getAnnotationClass() { return annotationClass; @@ -58,7 +57,6 @@ public abstract class BaseCCD implements ClientConstraintDescriptor * Attribute names of the constraint annotation to be passed (along with their values) to the JavaScript validator * function as an {@link JSONObject}. */ - @Override public Set<String> getAttributes() { return attributes; http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-clojure/build.gradle ---------------------------------------------------------------------- diff --git a/tapestry-clojure/build.gradle b/tapestry-clojure/build.gradle index bdb09d2..d1afd51 100644 --- a/tapestry-clojure/build.gradle +++ b/tapestry-clojure/build.gradle @@ -2,7 +2,7 @@ description = "Allows Clojure functions to be injected into Tapestry services an dependencies { compile project(':tapestry-ioc') - provided "org.clojure:clojure:1.4.0" + compile "org.clojure:clojure:1.4.0" // Added just to prove that it works (TAP5-1945) testCompile project(':tapestry-core') http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/AnnotationMapper.java ---------------------------------------------------------------------- diff --git a/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/AnnotationMapper.java b/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/AnnotationMapper.java index 8f99cfd..0734fae 100644 --- a/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/AnnotationMapper.java +++ b/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/AnnotationMapper.java @@ -22,7 +22,6 @@ import java.lang.reflect.Method; public class AnnotationMapper implements MethodToFunctionSymbolMapper { - @Override public Symbol mapMethod(String namespace, Method method) { FunctionName annotation = method.getAnnotation(FunctionName.class); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/ClojureBuilderImpl.java ---------------------------------------------------------------------- diff --git a/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/ClojureBuilderImpl.java b/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/ClojureBuilderImpl.java index b6c0fbb..f252770 100644 --- a/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/ClojureBuilderImpl.java +++ b/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/ClojureBuilderImpl.java @@ -46,7 +46,6 @@ public class ClojureBuilderImpl implements ClojureBuilder this.tracker = tracker; } - @Override public <T> T build(final Class<T> interfaceType) { assert interfaceType != null; @@ -64,7 +63,6 @@ public class ClojureBuilderImpl implements ClojureBuilder ClassInstantiator<T> instantiator = proxyFactory.createProxy(interfaceType, new PlasticClassTransformer() { - @Override public void transform(PlasticClass plasticClass) { for (final Method m : interfaceType.getMethods()) @@ -90,7 +88,6 @@ public class ClojureBuilderImpl implements ClojureBuilder desc.toShortString(), symbol.toString()), new Runnable() { - @Override public void run() { Symbol namespaceSymbol = Symbol.create(symbol.getNamespace()); @@ -103,7 +100,6 @@ public class ClojureBuilderImpl implements ClojureBuilder plasticClass.introduceMethod(desc).changeImplementation(new InstructionBuilderCallback() { - @Override public void doBuild(InstructionBuilder builder) { bridgeToClojure(builder, desc, varField); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/DefaultMapper.java ---------------------------------------------------------------------- diff --git a/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/DefaultMapper.java b/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/DefaultMapper.java index cfdf0cf..85f1fcf 100644 --- a/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/DefaultMapper.java +++ b/tapestry-clojure/src/main/java/org/apache/tapestry5/internal/clojure/DefaultMapper.java @@ -27,7 +27,6 @@ import java.util.regex.Pattern; */ public class DefaultMapper implements MethodToFunctionSymbolMapper { - @Override public Symbol mapMethod(String namespace, Method method) { return mapMethodName(namespace, method.getName()); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/BaseClientElement.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/BaseClientElement.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/BaseClientElement.java index e1000c7..04da976 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/BaseClientElement.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/BaseClientElement.java @@ -56,7 +56,6 @@ public abstract class BaseClientElement implements ClientElement * When invoked the first time (per request), a unique id is assigned and and id attribute added to the {@linkplain #element element} for * the component. */ - @Override public String getClientId() { http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/AjaxFormLoop.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/AjaxFormLoop.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/AjaxFormLoop.java index dd52451..f5f0a17 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/AjaxFormLoop.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/AjaxFormLoop.java @@ -162,7 +162,6 @@ public class AjaxFormLoop private final AjaxFormLoopContext formLoopContext = new AjaxFormLoopContext() { - @Override public String encodedRowValue() { return encoder.toClient(value); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Palette.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Palette.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Palette.java index daba133..d82dcad 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Palette.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Palette.java @@ -171,7 +171,6 @@ public class Palette extends AbstractField public final Renderable mainRenderer = new Renderable() { - @Override public void render(MarkupWriter writer) { SelectModelRenderer visitor = new SelectModelRenderer(writer, encoder); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Tree.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Tree.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Tree.java index 28394dc..6c5b360 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Tree.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Tree.java @@ -135,7 +135,6 @@ public class Tree private static RenderCommand MARK_SELECTED = new RenderCommand() { - @Override public void render(MarkupWriter writer, RenderQueue queue) { writer.getElement().attribute("class", "t-selected-leaf-node"); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-core/src/main/java/org/apache/tapestry5/internal/event/InvalidationEventHubImpl.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/event/InvalidationEventHubImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/event/InvalidationEventHubImpl.java index 7ae2741..de740ac 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/event/InvalidationEventHubImpl.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/event/InvalidationEventHubImpl.java @@ -56,7 +56,6 @@ public class InvalidationEventHubImpl implements InvalidationEventHub } } - @Override public final void addInvalidationCallback(Runnable callback) { assert callback != null; @@ -69,14 +68,12 @@ public class InvalidationEventHubImpl implements InvalidationEventHub } } - @Override public final void clearOnInvalidation(final Map<?, ?> map) { assert map != null; addInvalidationCallback(new Runnable() { - @Override public void run() { map.clear(); @@ -84,14 +81,12 @@ public class InvalidationEventHubImpl implements InvalidationEventHub }); } - @Override public final void addInvalidationListener(final InvalidationListener listener) { assert listener != null; addInvalidationCallback(new Runnable() { - @Override public void run() { listener.objectWasInvalidated(); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/MutableComponentModelImpl.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/MutableComponentModelImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/MutableComponentModelImpl.java index 9ef4579..12691f4 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/MutableComponentModelImpl.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/MutableComponentModelImpl.java @@ -90,7 +90,6 @@ public final class MutableComponentModelImpl implements MutableComponentModel } } - @Override public String getLibraryName() { return libraryName; http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AjaxPartialResponseRendererImpl.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AjaxPartialResponseRendererImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AjaxPartialResponseRendererImpl.java index 7cd0eda..d5f3d6a 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AjaxPartialResponseRendererImpl.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AjaxPartialResponseRendererImpl.java @@ -66,7 +66,6 @@ public class AjaxPartialResponseRendererImpl implements AjaxPartialResponseRende this.environment = environment; } - @Override public void renderPartialPageMarkup(JSONObject reply) throws IOException { assert reply != null; http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetSourceImpl.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetSourceImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetSourceImpl.java index a4ac408..b22cbbf 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetSourceImpl.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetSourceImpl.java @@ -107,7 +107,6 @@ public class AssetSourceImpl extends LockSupport implements AssetSource return getUnlocalizedAsset(symbolSource.expandSymbols(path)); } - @Override public Asset getComponentAsset(ComponentResources resources, String path) { assert resources != null; http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassResolverImpl.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassResolverImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassResolverImpl.java index a4ad45f..e8ff689 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassResolverImpl.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassResolverImpl.java @@ -628,13 +628,11 @@ public class ComponentClassResolverImpl implements ComponentClassResolver, Inval return DOT.split(packageName); } - @Override public List<String> getLibraryNames() { return F.flow(libraryNameToPackageNames.keySet()).remove(F.IS_BLANK).sort().toList(); } - @Override public String getLibraryNameForClass(String className) { assert className != null; http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MapMessages.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MapMessages.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MapMessages.java index 2dbef2d..b3c0221 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MapMessages.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MapMessages.java @@ -51,7 +51,6 @@ public class MapMessages 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/629fa5a4/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageNameMetaInjector.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageNameMetaInjector.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageNameMetaInjector.java index d46c589..889bfef 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageNameMetaInjector.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageNameMetaInjector.java @@ -36,7 +36,6 @@ public class PageNameMetaInjector implements MarkupRendererFilter this.globals = globals; } - @Override public void renderMarkup(MarkupWriter writer, MarkupRenderer delegate) { delegate.renderMarkup(writer); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PartialMarkupDocumentLinker.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PartialMarkupDocumentLinker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PartialMarkupDocumentLinker.java index 9c83d39..ddcde16 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PartialMarkupDocumentLinker.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PartialMarkupDocumentLinker.java @@ -52,7 +52,6 @@ public class PartialMarkupDocumentLinker implements DocumentLinker "DocumentLinker.addScript() is not implemented for partial page renders."); } - @Override public void addInitialization(InitializationPriority priority, String moduleName, String functionName, JSONArray arguments) { initsManager.addInitialization(priority, moduleName, functionName, arguments); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestOperationTracker.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestOperationTracker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestOperationTracker.java index c94401e..3e85aea 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestOperationTracker.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestOperationTracker.java @@ -37,7 +37,6 @@ public class RequestOperationTracker implements ComponentRequestFilter this.request = request; } - @Override public void handleComponentEvent(final ComponentEventRequestParameters parameters, final ComponentRequestHandler handler) throws IOException { String componentId = parameters.getNestedComponentId().equals("") @@ -52,7 +51,6 @@ public class RequestOperationTracker implements ComponentRequestFilter componentId), new Runnable() { - @Override public void run() { try @@ -71,7 +69,6 @@ public class RequestOperationTracker implements ComponentRequestFilter } } - @Override public void handlePageRender(final PageRenderRequestParameters parameters, final ComponentRequestHandler handler) throws IOException { final Holder<IOException> holder = Holder.create(); @@ -79,7 +76,6 @@ public class RequestOperationTracker implements ComponentRequestFilter tracker.run("Handling page render request for page " + parameters.getLogicalPageName(), new Runnable() { - @Override public void run() { try http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceDigestManagerImpl.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceDigestManagerImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceDigestManagerImpl.java index 0b2f167..a5ee8b1 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceDigestManagerImpl.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceDigestManagerImpl.java @@ -95,19 +95,16 @@ public class ResourceDigestManagerImpl implements ResourceDigestManager return get(resource).requiresDigest; } - @Override public void addInvalidationListener(InvalidationListener listener) { resourceChangeTracker.addInvalidationListener(listener); } - @Override public void addInvalidationCallback(Runnable callback) { resourceChangeTracker.addInvalidationCallback(callback); } - @Override public void clearOnInvalidation(Map<?, ?> map) { resourceChangeTracker.clearOnInvalidation(map); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/TranslatorSourceImpl.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/TranslatorSourceImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/TranslatorSourceImpl.java index b991fe3..d88a10a 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/TranslatorSourceImpl.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/TranslatorSourceImpl.java @@ -124,7 +124,6 @@ public Translator get(String name) /** * Invoked by InvalidationEventHub */ - @Override public void run() { registry.clearCache(); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ajax/JavaScriptSupportImpl.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ajax/JavaScriptSupportImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ajax/JavaScriptSupportImpl.java index ef9e9eb..847d5bf 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ajax/JavaScriptSupportImpl.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ajax/JavaScriptSupportImpl.java @@ -79,7 +79,6 @@ public class JavaScriptSupportImpl implements JavaScriptSupport this.moduleName = moduleName; } - @Override public Initialization invoke(String functionName) { assert InternalUtils.isNonBlank(functionName); @@ -89,7 +88,6 @@ public class JavaScriptSupportImpl implements JavaScriptSupport return this; } - @Override public Initialization priority(InitializationPriority priority) { assert priority != null; @@ -99,7 +97,6 @@ public class JavaScriptSupportImpl implements JavaScriptSupport return this; } - @Override public void with(Object... arguments) { this.arguments = new JSONArray(arguments); @@ -165,14 +162,12 @@ public class JavaScriptSupportImpl implements JavaScriptSupport F.flow(inits).sort(new Comparator<InitializationImpl>() { - @Override public int compare(InitializationImpl o1, InitializationImpl o2) { return o1.priority.compareTo(o2.priority); } }).each(new Worker<InitializationImpl>() { - @Override public void work(InitializationImpl element) { linker.addInitialization(element.priority, element.moduleName, element.functionName, element.arguments); @@ -385,7 +380,6 @@ public class JavaScriptSupportImpl implements JavaScriptSupport return this; } - @Override public Initialization require(String moduleName) { assert InternalUtils.isNonBlank(moduleName); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/DelegatingSRS.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/DelegatingSRS.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/DelegatingSRS.java index 025526b..a06752a 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/DelegatingSRS.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/DelegatingSRS.java @@ -37,13 +37,11 @@ public abstract class DelegatingSRS implements StreamableResourceSource this.delegate = delegate; } - @Override public Set<String> fileExtensionsForContentType(String contentType) { return delegate.fileExtensionsForContentType(contentType); } - @Override public StreamableResource getStreamableResource(Resource baseResource, StreamableResourceProcessing processing, ResourceDependencies dependencies) throws IOException { return delegate.getStreamableResource(baseResource, processing, dependencies); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/ResourceChangeTrackerImpl.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/ResourceChangeTrackerImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/ResourceChangeTrackerImpl.java index 810e96c..05ab3db 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/ResourceChangeTrackerImpl.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/ResourceChangeTrackerImpl.java @@ -69,7 +69,6 @@ public class ResourceChangeTrackerImpl extends InvalidationEventHubImpl implemen trackResource(dependency); } - @Override public void forceInvalidationEvent() { fireInvalidationEvent(); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/StreamableResourceSourceImpl.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/StreamableResourceSourceImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/StreamableResourceSourceImpl.java index c3c5d9f..dcef6bc 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/StreamableResourceSourceImpl.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/StreamableResourceSourceImpl.java @@ -45,7 +45,6 @@ public class StreamableResourceSourceImpl implements StreamableResourceSource this.resourceChangeTracker = resourceChangeTracker; } - @Override public Set<String> fileExtensionsForContentType(String contentType) { Set<String> result = CollectionFactory.newSet(); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/compatibility/CompatibilityImpl.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/compatibility/CompatibilityImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/compatibility/CompatibilityImpl.java index 63027cf..4154c2b 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/compatibility/CompatibilityImpl.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/compatibility/CompatibilityImpl.java @@ -39,7 +39,6 @@ public class CompatibilityImpl implements Compatibility } } - @Override public boolean enabled(Trait trait) { assert trait != null; http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/compatibility/DeprecationWarningImpl.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/compatibility/DeprecationWarningImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/compatibility/DeprecationWarningImpl.java index 996f912..c8a3228 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/compatibility/DeprecationWarningImpl.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/compatibility/DeprecationWarningImpl.java @@ -112,7 +112,6 @@ public class DeprecationWarningImpl implements DeprecationWarning this.alertManager = alertManager; } - @Override public void componentParameter(ComponentResources resources, String parameterName, String message) { assert resources != null; @@ -131,7 +130,6 @@ public class DeprecationWarningImpl implements DeprecationWarning logMessage(resources, parameterName, message); } - @Override public void ignoredComponentParameters(ComponentResources resources, String... parameterNames) { assert resources != null; @@ -146,7 +144,6 @@ public class DeprecationWarningImpl implements DeprecationWarning } } - @Override public void componentParameterValue(ComponentResources resources, String parameterName, Object parameterValue, String message) { assert resources != null; http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ConfigureHTMLElementFilter.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ConfigureHTMLElementFilter.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ConfigureHTMLElementFilter.java index 2ebd84e..5732ee5 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ConfigureHTMLElementFilter.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ConfigureHTMLElementFilter.java @@ -40,7 +40,6 @@ public class ConfigureHTMLElementFilter implements MarkupRendererFilter this.debugEnabled = !productionMode; } - @Override public void renderMarkup(MarkupWriter writer, MarkupRenderer renderer) { renderer.renderMarkup(writer); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleAssetRequestHandler.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleAssetRequestHandler.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleAssetRequestHandler.java index 68ce9f3..c0bdf79 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleAssetRequestHandler.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleAssetRequestHandler.java @@ -47,7 +47,6 @@ public class ModuleAssetRequestHandler implements AssetRequestHandler this.tracker = tracker; } - @Override public boolean handleAssetRequest(Request request, Response response, String extraPath) throws IOException { // Ensure request ends with '.js'. That's the extension tacked on by RequireJS because it expects there http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleManagerImpl.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleManagerImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleManagerImpl.java index dd31e18..f52cafa 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleManagerImpl.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleManagerImpl.java @@ -174,7 +174,6 @@ public class ModuleManagerImpl implements ModuleManager return new JSONArray().putAll(input).toString(compactJSON); } - @Override public Resource findResourceForModule(String moduleName) { Resource resource = cache.get(moduleName); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/messages/ClientLocalizationMessageResource.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/messages/ClientLocalizationMessageResource.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/messages/ClientLocalizationMessageResource.java index a0c1f16..cbd56bd 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/messages/ClientLocalizationMessageResource.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/messages/ClientLocalizationMessageResource.java @@ -76,7 +76,6 @@ public class ClientLocalizationMessageResource extends VirtualResource return new ClientLocalizationMessageResource(locale); } - @Override public InputStream openStream() throws IOException { DecimalFormatSymbols decimalSymbols = DecimalFormatSymbols.getInstance(locale); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ImportWorker.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ImportWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ImportWorker.java index 53410a9..debd1e4 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ImportWorker.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ImportWorker.java @@ -190,7 +190,6 @@ public class ImportWorker implements ComponentClassTransformWorker2 return new MethodAdvice() { - @Override public void advise(MethodInvocation invocation) { for (ModuleImport moduleImport : moduleImports) http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/DelegatingSymbolProvider.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/DelegatingSymbolProvider.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/DelegatingSymbolProvider.java index bca339c..d7d6c4e 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/DelegatingSymbolProvider.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/DelegatingSymbolProvider.java @@ -31,7 +31,6 @@ public class DelegatingSymbolProvider implements SymbolProvider this.secondary = secondary; } - @Override public String valueForSymbol(String symbolName) { String value = primary.valueForSymbol(symbolName); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/MessageCatalogResource.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/MessageCatalogResource.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/MessageCatalogResource.java index 23848b2..6c41fda 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/MessageCatalogResource.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/MessageCatalogResource.java @@ -42,7 +42,6 @@ public class MessageCatalogResource extends VirtualResource messagesSource.getInvalidationEventHub().addInvalidationCallback(new Runnable() { - @Override public void run() { bytes = null; @@ -84,7 +83,6 @@ public class MessageCatalogResource extends VirtualResource return null; } - @Override public InputStream openStream() throws IOException { return toInputStream(getBytes()); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/VirtualResource.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/VirtualResource.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/VirtualResource.java index 099acf9..82b3808 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/VirtualResource.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/VirtualResource.java @@ -42,50 +42,42 @@ public abstract class VirtualResource implements Resource throw new UnsupportedOperationException(String.format("Method %s() is not supported for a VirtualResource.", name)); } - @Override public boolean exists() { return true; } - @Override public URL toURL() { return unsupported("toURL"); } - @Override public Resource forLocale(Locale locale) { return unsupported("forLocale"); } - @Override public Resource forFile(String relativePath) { return this; } - @Override public Resource withExtension(String extension) { return unsupported("withExtension"); } - @Override public String getFolder() { return unsupported("getFolder"); } - @Override public String getFile() { return unsupported("getFile"); } - @Override public String getPath() { return unsupported("getPath"); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java index 6c8c310..2100a0b 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java @@ -1412,7 +1412,6 @@ public final class TapestryModule //As the registry will cache component classes, we need to clear the cache when we reload components to avoid memory leaks in permgen hub.addInvalidationCallback(new Runnable() { - @Override public void run() { registry.clearCache(); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-func/src/main/java/org/apache/tapestry5/func/F.java ---------------------------------------------------------------------- diff --git a/tapestry-func/src/main/java/org/apache/tapestry5/func/F.java b/tapestry-func/src/main/java/org/apache/tapestry5/func/F.java index c4f3a93..9d91391 100644 --- a/tapestry-func/src/main/java/org/apache/tapestry5/func/F.java +++ b/tapestry-func/src/main/java/org/apache/tapestry5/func/F.java @@ -66,7 +66,6 @@ public class F */ public static Predicate<String> IS_BLANK = new Predicate<String>() { - @Override public boolean accept(String element) { return element == null || element.trim().length() == 0; http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/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 18fb90d..0168515 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,7 +37,6 @@ 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()) @@ -61,7 +60,6 @@ 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('/', '.'); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/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 338f7a1..27e3777 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 @@ -199,7 +199,6 @@ public class ClasspathScannerImpl implements ClasspathScanner { queue.push(new IOWork() { - @Override public void run() throws IOException { scanDirStream(packagePath, url); @@ -236,7 +235,6 @@ public class ClasspathScannerImpl implements ClasspathScanner queue.push(new IOWork() { - @Override public void run() throws IOException { scanDir(nestedPackagePath, file); @@ -295,7 +293,6 @@ 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/629fa5a4/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 87a4131..8646a57 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImpl.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImpl.java @@ -64,7 +64,6 @@ public class PerthreadManagerImpl implements PerthreadManager { hub.addRegistryShutdownListener(new Runnable() { - @Override public void run() { cleanup(); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/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 c06ef90..9d7a5b4 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,7 +66,6 @@ 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/629fa5a4/tapestry-test/src/test/java/org/apache/tapestry5/test/integration/SanityCheckTestSuite.java ---------------------------------------------------------------------- diff --git a/tapestry-test/src/test/java/org/apache/tapestry5/test/integration/SanityCheckTestSuite.java b/tapestry-test/src/test/java/org/apache/tapestry5/test/integration/SanityCheckTestSuite.java index 1848222..6c4365f 100644 --- a/tapestry-test/src/test/java/org/apache/tapestry5/test/integration/SanityCheckTestSuite.java +++ b/tapestry-test/src/test/java/org/apache/tapestry5/test/integration/SanityCheckTestSuite.java @@ -12,8 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.apache.tapestry5.test; +package org.apache.tapestry5.test.integration; +import org.apache.tapestry5.test.SeleniumTestCase; +import org.apache.tapestry5.test.TapestryTestConfiguration; +import org.apache.tapestry5.test.TapestryTestConstants; import org.testng.ITestContext; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/629fa5a4/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/internal/yuicompressor/JavaScriptResourceMinimizer.java ---------------------------------------------------------------------- diff --git a/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/internal/yuicompressor/JavaScriptResourceMinimizer.java b/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/internal/yuicompressor/JavaScriptResourceMinimizer.java index cb4a130..c8d823a 100644 --- a/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/internal/yuicompressor/JavaScriptResourceMinimizer.java +++ b/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/internal/yuicompressor/JavaScriptResourceMinimizer.java @@ -78,7 +78,6 @@ public class JavaScriptResourceMinimizer extends AbstractMinimizer Runnable identifyWarnings = new Runnable() { - @Override public void run() { if (warningCount.get() > 0)
