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:04 UTC
[7/7] git commit: Required Java version is now 1.6,
this applies to building as well as to using Tapestry
Required Java version is now 1.6, this applies to building as well as to using Tapestry
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/b553edf0
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/b553edf0
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/b553edf0
Branch: refs/heads/master
Commit: b553edf0cd8538e4c8c8562a2bf4daca11a63482
Parents: 5f8deb1
Author: Jochen Kemnade <jo...@eddyson.de>
Authored: Fri May 23 16:25:40 2014 +0200
Committer: Jochen Kemnade <jo...@eddyson.de>
Committed: Fri May 23 16:26:26 2014 +0200
----------------------------------------------------------------------
54_RELEASE_NOTES.md | 4 +
build.gradle | 8 +-
.../plastic/AbstractAnnotationBuilder.java | 5 +
.../plastic/AbstractMethodInvocation.java | 10 ++
.../internal/plastic/AnnotationBuilder.java | 3 +
.../internal/plastic/ClassInstantiatorImpl.java | 5 +
.../plastic/DelegatingAnnotationAccess.java | 2 +
.../internal/plastic/EmptyAnnotationAccess.java | 2 +
.../plastic/FailureMethodInvocationResult.java | 4 +
.../internal/plastic/FieldHandleImpl.java | 2 +
.../plastic/InstructionBuilderImpl.java | 67 ++++++++
.../internal/plastic/LocalVariable.java | 1 +
.../internal/plastic/MethodAdviceManager.java | 9 ++
.../internal/plastic/MethodHandleImpl.java | 2 +
.../internal/plastic/MethodParameterImpl.java | 2 +
.../internal/plastic/NoopDelegate.java | 2 +
.../internal/plastic/PlasticClassImpl.java | 28 ++++
.../internal/plastic/PlasticClassPool.java | 13 ++
.../internal/plastic/PlasticFieldImpl.java | 21 +++
.../internal/plastic/PlasticMember.java | 2 +
.../internal/plastic/PlasticMethodImpl.java | 19 +++
.../plastic/SuccessMethodInvocationResult.java | 4 +
.../internal/plastic/SwitchBlockImpl.java | 3 +
.../internal/plastic/TryCatchBlockImpl.java | 3 +
.../tapestry5/plastic/MethodDescription.java | 1 +
.../tapestry5/plastic/PlasticManager.java | 2 +
.../tapestry5/plastic/test/NoopAdvice.java | 1 +
.../java/testsubjects/AccessMethodsSubject.java | 2 +
.../ProtectedFieldCollaborator.java | 1 +
.../testsubjects/TestInjectTransformer.java | 1 +
.../modules/BeanValidatorModule.java | 7 +
.../internal/beanvalidator/BaseCCD.java | 2 +
.../beanvalidator/BeanFieldValidator.java | 5 +
.../BeanFieldValidatorDefaultSource.java | 2 +
.../BeanValidationGroupSourceImpl.java | 1 +
.../beanvalidator/BeanValidatorSourceImpl.java | 2 +
.../ClientConstraintDescriptorImpl.java | 1 +
.../beanvalidator/MessageInterpolatorImpl.java | 2 +
.../org/example/testapp/services/AppModule.java | 1 +
.../internal/clojure/AnnotationMapper.java | 1 +
.../internal/clojure/ClojureBuilderImpl.java | 4 +
.../internal/clojure/DefaultMapper.java | 1 +
.../org/apache/tapestry5/func/AbstractFlow.java | 30 ++++
.../org/apache/tapestry5/func/ArrayFlow.java | 14 ++
.../org/apache/tapestry5/func/EmptyFlow.java | 18 +++
.../main/java/org/apache/tapestry5/func/F.java | 28 ++++
.../org/apache/tapestry5/func/Interleaver.java | 2 +
.../org/apache/tapestry5/func/LazyConcat.java | 1 +
.../org/apache/tapestry5/func/LazyDrop.java | 1 +
.../org/apache/tapestry5/func/LazyFilter.java | 1 +
.../org/apache/tapestry5/func/LazyFirst.java | 1 +
.../org/apache/tapestry5/func/LazyFlow.java | 3 +
.../org/apache/tapestry5/func/LazyIterator.java | 1 +
.../apache/tapestry5/func/LazyMapped2Value.java | 1 +
.../apache/tapestry5/func/LazyMappedValue.java | 1 +
.../org/apache/tapestry5/func/LazyMapper.java | 1 +
.../org/apache/tapestry5/func/LazyMapper2.java | 1 +
.../org/apache/tapestry5/func/LazyRange.java | 1 +
.../org/apache/tapestry5/func/LazyTake.java | 1 +
.../org/apache/tapestry5/func/LazyWalk.java | 1 +
.../java/org/apache/tapestry5/func/LazyZip.java | 1 +
.../org/apache/tapestry5/func/LazyZipValue.java | 1 +
.../org/apache/tapestry5/func/StaticValue.java | 1 +
.../apache/tapestry5/func/ZippedFlowImpl.java | 31 ++++
.../org/apache/tapestry5/func/BaseFuncTest.java | 3 +
.../org/apache/tapestry5/func/FuncTest.java | 14 ++
.../org/apache/tapestry5/func/MapperTest.java | 3 +
.../org/apache/tapestry5/func/RangeTests.java | 1 +
.../apache/tapestry5/func/ZippedFlowTests.java | 3 +
.../hibernate/modules/HibernateCoreModule.java | 2 +
.../hibernate/DefaultHibernateConfigurer.java | 1 +
.../hibernate/HibernateSessionManagerImpl.java | 4 +
.../hibernate/HibernateSessionSourceImpl.java | 4 +
.../HibernateTransactionAdvisorImpl.java | 2 +
.../HibernateTransactionDecoratorImpl.java | 1 +
.../PackageNameHibernateConfigurer.java | 1 +
.../HibernateSessionSourceImplTest.java | 1 +
.../HibernateTransactionDecoratorImplTest.java | 4 +
.../hibernate/HibernateGridDataSource.java | 4 +
.../hibernate/modules/HibernateModule.java | 1 +
.../internal/hibernate/CommitAfterWorker.java | 2 +
...tityApplicationStatePersistenceStrategy.java | 2 +
.../hibernate/HibernateEntityValueEncoder.java | 2 +
.../internal/hibernate/PersistedEntity.java | 1 +
.../hibernate/PersistedTransientEntity.java | 1 +
.../org/example/app0/services/AppModule.java | 1 +
.../org/example/app0/services/UserDAOImpl.java | 4 +
.../ioc/test/TapestryIOCJUnit4ClassRunner.java | 12 ++
.../apache/tapestry5/ioc/test/MapModuleDef.java | 13 ++
.../org/apache/tapestry5/ioc/BaseLocatable.java | 1 +
.../AbstractReloadableObjectCreator.java | 5 +
.../ioc/internal/AbstractServiceCreator.java | 1 +
.../tapestry5/ioc/internal/AdvisorDefImpl.java | 2 +
.../ioc/internal/AdvisorStackBuilder.java | 2 +
.../ioc/internal/AnnotationAccessImpl.java | 2 +
.../ioc/internal/ConstructorServiceCreator.java | 1 +
.../ioc/internal/ContributionDefImpl.java | 7 +
.../ioc/internal/DecoratorDefImpl.java | 2 +
.../ioc/internal/DefaultModuleDefImpl.java | 14 ++
.../tapestry5/ioc/internal/IdMatcherImpl.java | 1 +
.../ioc/internal/InterceptorStackBuilder.java | 2 +
.../LifecycleWrappedServiceCreator.java | 1 +
.../ioc/internal/LoggerSourceImpl.java | 2 +
.../tapestry5/ioc/internal/ModuleImpl.java | 21 +++
.../ioc/internal/NullAnnotationProvider.java | 1 +
.../ioc/internal/ObjectLocatorImpl.java | 7 +
.../ioc/internal/OperationTrackerImpl.java | 3 +
.../OperationTrackingObjectCreator.java | 2 +
.../tapestry5/ioc/internal/OrIdMatcher.java | 1 +
.../ioc/internal/PerThreadOperationTracker.java | 3 +
.../ioc/internal/QuietOperationTracker.java | 3 +
.../RecursiveServiceCreationCheckWrapper.java | 1 +
.../tapestry5/ioc/internal/RegistryImpl.java | 49 ++++++
.../tapestry5/ioc/internal/RegistryWrapper.java | 10 ++
.../internal/ReloadableObjectCreatorSource.java | 3 +
...dableServiceImplementationObjectCreator.java | 1 +
.../internal/ServiceActivityTrackerImpl.java | 8 +
.../ioc/internal/ServiceAdvisorImpl.java | 1 +
.../ioc/internal/ServiceBinderImpl.java | 15 ++
.../internal/ServiceBuilderMethodInvoker.java | 1 +
.../ioc/internal/ServiceDecoratorImpl.java | 1 +
.../tapestry5/ioc/internal/ServiceDefImpl.java | 11 ++
.../ioc/internal/ServiceResourcesImpl.java | 15 ++
.../ioc/internal/SingletonServiceLifecycle.java | 3 +
.../tapestry5/ioc/internal/StartupDefImpl.java | 2 +
.../ioc/internal/TypeCoercerProxyImpl.java | 1 +
.../ValidatingConfigurationWrapper.java | 2 +
.../ValidatingMappedConfigurationWrapper.java | 4 +
.../ValidatingOrderedConfigurationWrapper.java | 4 +
.../AbtractAspectInterceptorBuilder.java | 3 +
.../AccessableObjectAnnotationProvider.java | 1 +
.../services/AnnotationProviderChain.java | 1 +
.../internal/services/AspectDecoratorImpl.java | 6 +
.../services/AspectInterceptorBuilderImpl.java | 5 +
.../services/AutobuildObjectProvider.java | 1 +
.../ioc/internal/services/BridgeBuilder.java | 3 +
.../internal/services/CachingObjectCreator.java | 1 +
.../ioc/internal/services/ChainBuilderImpl.java | 6 +
.../internal/services/ClassNameLocatorImpl.java | 3 +
.../services/ClassPropertyAdapterImpl.java | 6 +
.../internal/services/ClasspathScannerImpl.java | 4 +
.../services/ClasspathURLConverterImpl.java | 1 +
.../ioc/internal/services/CompoundCoercion.java | 1 +
.../DefaultImplementationBuilderImpl.java | 2 +
.../services/ExceptionAnalysisImpl.java | 1 +
.../services/ExceptionAnalyzerImpl.java | 1 +
.../internal/services/ExceptionInfoImpl.java | 5 +
.../internal/services/ExceptionTrackerImpl.java | 1 +
.../services/JustInTimeObjectCreator.java | 4 +
.../ioc/internal/services/LazyAdvisorImpl.java | 3 +
.../ioc/internal/services/LoggingAdvice.java | 1 +
.../internal/services/LoggingAdvisorImpl.java | 1 +
.../internal/services/LoggingDecoratorImpl.java | 1 +
.../internal/services/MapSymbolProvider.java | 1 +
.../services/MasterObjectProviderImpl.java | 2 +
.../ioc/internal/services/MethodIterator.java | 1 +
.../internal/services/NonParallelExecutor.java | 7 +
.../internal/services/OperationAdvisorImpl.java | 5 +
.../internal/services/ParallelExecutorImpl.java | 4 +
.../services/PerThreadServiceCreator.java | 1 +
.../services/PerThreadServiceLifecycle.java | 2 +
.../internal/services/PerthreadManagerImpl.java | 12 ++
.../internal/services/PipelineBuilderImpl.java | 2 +
.../services/PlasticClassListenerLogger.java | 1 +
.../services/PlasticProxyFactoryImpl.java | 16 ++
.../internal/services/PropertyAccessImpl.java | 6 +
.../internal/services/PropertyAdapterImpl.java | 15 ++
.../services/PropertyShadowBuilderImpl.java | 4 +
.../services/RegistryShutdownHubImpl.java | 5 +
.../ioc/internal/services/RegistryStartup.java | 1 +
.../services/ResourceSymbolProvider.java | 1 +
.../internal/services/ServiceOverrideImpl.java | 2 +
.../internal/services/StaticObjectProvider.java | 1 +
.../internal/services/StrategyBuilderImpl.java | 4 +
.../ioc/internal/services/StringLocation.java | 3 +
.../internal/services/SymbolObjectProvider.java | 1 +
.../ioc/internal/services/SymbolSourceImpl.java | 2 +
.../services/SystemEnvSymbolProvider.java | 1 +
.../SystemPropertiesSymbolProvider.java | 1 +
.../ioc/internal/services/ThreadLocaleImpl.java | 2 +
.../ioc/internal/services/ThunkCreatorImpl.java | 4 +
.../ioc/internal/services/TypeCoercerImpl.java | 6 +
.../services/UpdateListenerHubImpl.java | 2 +
.../internal/services/ValueObjectProvider.java | 1 +
.../internal/services/cron/CronExpression.java | 1 +
.../services/cron/PeriodicExecutorImpl.java | 8 +
.../ioc/internal/util/AbstractResource.java | 8 +
.../ioc/internal/util/ClasspathResource.java | 1 +
.../ioc/internal/util/ConcurrentBarrier.java | 2 +
.../ioc/internal/util/ConstructionPlan.java | 2 +
.../ioc/internal/util/ConstructorInvoker.java | 1 +
.../util/DelegatingInjectionResources.java | 1 +
.../tapestry5/ioc/internal/util/DummyLock.java | 6 +
.../ioc/internal/util/GenericsUtils.java | 6 +
.../ioc/internal/util/IdToDependencyNode.java | 2 +
.../ioc/internal/util/InheritanceSearch.java | 4 +
.../ioc/internal/util/InternalUtils.java | 78 +++++++++
.../ioc/internal/util/LocationImpl.java | 3 +
.../internal/util/LoggingInvokableWrapper.java | 1 +
.../internal/util/MapInjectionResources.java | 1 +
.../ioc/internal/util/MessageFormatterImpl.java | 2 +
.../ioc/internal/util/MessagesImpl.java | 1 +
.../ioc/internal/util/MethodInvoker.java | 1 +
.../tapestry5/ioc/internal/util/Orderer.java | 2 +
.../ioc/internal/util/TapestryException.java | 1 +
.../util/WrongConfigurationTypeGuard.java | 1 +
.../ioc/modules/TapestryIOCModule.java | 32 ++++
.../tapestry5/ioc/services/CoercionTuple.java | 1 +
.../ioc/services/cron/CronSchedule.java | 2 +
.../ioc/services/cron/IntervalSchedule.java | 2 +
.../tapestry5/ioc/util/AbstractMessages.java | 4 +
.../tapestry5/ioc/util/CaseInsensitiveMap.java | 6 +
.../ioc/util/LocalizedNameGenerator.java | 4 +
.../tapestry5/util/StringToEnumCoercion.java | 1 +
.../src/test/java/com/example/CounterImpl.java | 2 +
.../java/com/example/ExtraRunnableModule.java | 3 +
.../apache/tapestry5/ioc/AdviceDemoModule.java | 2 +
.../org/apache/tapestry5/ioc/BarneyModule.java | 6 +
.../tapestry5/ioc/ContributeByClassModule.java | 2 +
.../tapestry5/ioc/CountingGreeterImpl.java | 1 +
.../apache/tapestry5/ioc/CyclicMOPModule.java | 1 +
.../ioc/FailInConstructorRunnable.java | 1 +
.../tapestry5/ioc/FieldResourceServiceImpl.java | 2 +
.../org/apache/tapestry5/ioc/FredModule.java | 5 +
.../org/apache/tapestry5/ioc/GreeterModule.java | 3 +
.../apache/tapestry5/ioc/GreeterModule2.java | 2 +
.../ioc/GreeterServiceOverrideModule.java | 2 +
.../tapestry5/ioc/InjectionCheckImpl.java | 2 +
.../org/apache/tapestry5/ioc/IntHolderImpl.java | 1 +
.../ioc/InvalidContributeDefModule2.java | 1 +
.../ioc/InvalidContributeDefModule3.java | 1 +
.../org/apache/tapestry5/ioc/LocalModule.java | 3 +
.../NoImplementationClassForSimpleIdModule.java | 1 +
.../ioc/RecursiveConstructorModule.java | 1 +
.../apache/tapestry5/ioc/RedGreeterImpl.java | 1 +
.../ioc/RegistryBuilderTestModule.java | 1 +
.../org/apache/tapestry5/ioc/RocketImpl.java | 1 +
.../tapestry5/ioc/ServiceBuilderModule.java | 3 +
.../apache/tapestry5/ioc/ServiceIdGreeter.java | 1 +
.../tapestry5/ioc/SpecificDecoratorModule.java | 1 +
.../org/apache/tapestry5/ioc/StaticModule.java | 4 +
.../apache/tapestry5/ioc/StringHolderImpl.java | 2 +
.../ioc/SymbolExpandingTransformer.java | 1 +
.../tapestry5/ioc/UnbuildablePingable.java | 1 +
.../tapestry5/ioc/UnknownColorGreeterImpl.java | 1 +
.../ioc/UppercaseStringTransformer.java | 1 +
.../ioc/internal/AdviseByMarkerModule.java | 2 +
.../ioc/internal/AdviseByMarkerModule2.java | 2 +
.../tapestry5/ioc/internal/AlphabetModule.java | 2 +
.../tapestry5/ioc/internal/AlphabetModule2.java | 2 +
.../internal/AnnotatedServiceInterfaceImpl.java | 1 +
.../ioc/internal/DecorateByMarkerModule.java | 2 +
.../ioc/internal/DecorateByMarkerModule2.java | 2 +
.../EagerLoadViaAnnotationServiceImpl.java | 1 +
.../ExceptionInConstructorServiceImpl.java | 1 +
.../internal/ExtraPublicConstructorsModule.java | 1 +
.../MultipleConstructorsAutobuildService.java | 2 +
.../internal/NamedViaAnnotationServiceImpl.java | 1 +
.../NonAnnotatedServiceInterfaceImpl.java | 1 +
.../ioc/internal/NoopClassLoaderDelegate.java | 2 +
.../ioc/internal/RunnableServiceImpl.java | 1 +
.../ServiceIdViaAnnotationServiceImpl.java | 1 +
...ServiceIdViaMethodAnnotationServiceImpl.java | 1 +
.../tapestry5/ioc/internal/TestAdvice.java | 1 +
.../tapestry5/ioc/internal/ToStringService.java | 1 +
.../ioc/internal/ToUpperCaseStringHolder.java | 2 +
.../ioc/internal/UpcaseServiceImpl.java | 1 +
.../ioc/internal/services/StartupModule.java | 1 +
.../ioc/internal/services/ToStringService.java | 1 +
.../ioc/internal/util/ConcurrentTarget.java | 11 ++
.../internal/util/ConcurrentTargetWrapper.java | 2 +
.../ioc/internal/util/DrivableImpl.java | 1 +
.../ioc/internal/util/PlayableImpl.java | 1 +
.../ioc/internal/util/ToyTruckImpl.java | 1 +
.../tapestry5/javadoc/TapestryDocTaglet.java | 11 ++
.../apache/tapestry5/javadoc/XDocStreamer.java | 21 +++
.../internal/jmx/MBeanSupportImpl.java | 4 +
.../example/testapp/services/SampleImpl.java | 1 +
.../internal/jpa/CommitAfterMethodAdvice.java | 1 +
.../internal/jpa/CommitAfterWorker.java | 1 +
.../internal/jpa/EntityManagerManagerImpl.java | 3 +
.../jpa/EntityManagerObjectProvider.java | 2 +
.../internal/jpa/EntityManagerSourceImpl.java | 8 +
.../internal/jpa/JpaTransactionAdvisorImpl.java | 1 +
.../tapestry5/internal/jpa/JpaValueEncoder.java | 2 +
.../PackageNamePersistenceUnitConfigurer.java | 1 +
.../internal/jpa/PersistenceContentHandler.java | 11 ++
.../internal/jpa/PersistenceContextWorker.java | 2 +
.../internal/jpa/PersistenceUnitInfoImpl.java | 32 ++++
.../apache/tapestry5/jpa/JpaGridDataSource.java | 4 +
.../apache/tapestry5/jpa/modules/JpaModule.java | 2 +
.../jpa/EntityManagerSourceImplTest.java | 1 +
.../jpa/JpaTransactionAdvisorImplTest.java | 4 +
.../integration/app5/DummyEntityManager.java | 40 +++++
.../app5/DummyEntityManagerFactory.java | 9 ++
.../app5/DummyPersistenceProvider.java | 3 +
.../org/example/app1/services/AppModule.java | 2 +
.../example/app1/services/impl/UserDAOImpl.java | 4 +
.../example/app2/services/impl/UserDAOImpl.java | 1 +
.../org/example/app3/services/AppModule.java | 1 +
.../org/example/app5/services/AppModule.java | 2 +
.../org/example/app6/services/AppModule.java | 2 +
.../example/app6/services/impl/UserDAOImpl.java | 4 +
.../internal/json/StringToJSONArray.java | 1 +
.../internal/json/StringToJSONObject.java | 1 +
.../apache/tapestry5/json/CompactSession.java | 6 +
.../org/apache/tapestry5/json/JSONArray.java | 2 +
.../org/apache/tapestry5/json/JSONLiteral.java | 1 +
.../org/apache/tapestry5/json/JSONObject.java | 2 +
.../tapestry5/json/PrettyPrintSession.java | 6 +
.../services/KaptchaDataTypeAnalyzer.java | 1 +
.../internal/services/KaptchaProducerImpl.java | 4 +
.../java/kaptcha/demo/services/AppModule.java | 4 +
.../org/apache/tapestry5/test/Jetty7Runner.java | 1 +
.../apache/tapestry5/test/Tomcat6Runner.java | 1 +
.../internal/spring/SpringBeanServiceDef.java | 8 +
.../internal/spring/SpringModuleDef.java | 20 +++
.../internal/spring/StaticObjectCreator.java | 1 +
.../internal/spring/TapestryBeanFactory.java | 1 +
.../tapestry5/spring/modules/SpringModule.java | 2 +
.../org/example/testapp/services/AppModule.java | 1 +
.../testapp/services/FlintstoneImpl.java | 1 +
.../services/SpringStatusProviderFactory.java | 3 +
.../example/testapp/services/UpcaseImpl.java | 1 +
.../services/UpcaseStringTransformerImpl.java | 1 +
.../testapp/services/ViaFactoryFactory.java | 4 +
.../tapestry5/test/ErrorReporterImpl.java | 1 +
.../test/ErrorReportingCommandProcessor.java | 13 ++
.../apache/tapestry5/test/SeleniumTestCase.java | 157 +++++++++++++++++++
.../test/integration/SanityCheckTestSuite.java | 1 +
.../internal/services/MultipartDecoderImpl.java | 4 +
.../services/MultipartServletRequestFilter.java | 1 +
.../services/UploadExceptionFilter.java | 1 +
.../internal/services/UploadedFileItem.java | 7 +
.../tapestry5/upload/modules/UploadModule.java | 1 +
.../upload/internal/services/StubFileItem.java | 17 ++
.../webresources/AbstractMinimizer.java | 2 +
.../webresources/CoffeeScriptCompiler.java | 2 +
.../webresources/ContentChangeTracker.java | 1 +
.../webresources/LessResourceTransformer.java | 3 +
.../ResourceDependenciesSplitter.java | 1 +
.../ResourceTransformerFactoryImpl.java | 10 ++
.../webresources/RhinoExecutorPool.java | 4 +
.../modules/WebResourcesModule.java | 1 +
344 files changed, 1648 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/54_RELEASE_NOTES.md
----------------------------------------------------------------------
diff --git a/54_RELEASE_NOTES.md b/54_RELEASE_NOTES.md
index 6a9ac4d..8044c85 100644
--- a/54_RELEASE_NOTES.md
+++ b/54_RELEASE_NOTES.md
@@ -384,3 +384,7 @@ look and feel.
The Grid component no longer emits CSS class names, instead it renders data attributes into Grid headers, rows, and cells,
such as `data-grid-row="first"`, `data-grid-property="title"`, etc. These attributes may still be referenced using CSS rules
where desired.
+
+## Java 1.6 required
+
+As of version 5.4, Tapestry requires Java 1.6 at least.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 2b7fd18..74b24bd 100755
--- a/build.gradle
+++ b/build.gradle
@@ -106,9 +106,7 @@ allprojects {
idea {
project {
- // 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.
- languageLevel = "1.5"
+ languageLevel = "1.6"
// But this is what most (all?) of the devs are actually using:
jdkName = "1.7"
}
@@ -150,8 +148,8 @@ subprojects {
apply plugin: "maven" // for deployment
apply plugin: "project-report"
- sourceCompatibility = "1.5"
- targetCompatibility = "1.5"
+ sourceCompatibility = "1.6"
+ targetCompatibility = "1.6"
// See http://jira.codehaus.org/browse/GRADLE-784
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractAnnotationBuilder.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractAnnotationBuilder.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractAnnotationBuilder.java
index f9f54c7..8421b30 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractAnnotationBuilder.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractAnnotationBuilder.java
@@ -42,6 +42,7 @@ public abstract class AbstractAnnotationBuilder extends AnnotationVisitor
throw new IllegalStateException("elementTypeForArrayAttribute() may not be invoked here.");
}
+ @Override
public void visit(String name, Object value)
{
if (value instanceof Type)
@@ -56,6 +57,7 @@ public abstract class AbstractAnnotationBuilder extends AnnotationVisitor
store(name, value);
}
+ @Override
public void visitEnum(String name, String desc, String value)
{
@@ -76,6 +78,7 @@ public abstract class AbstractAnnotationBuilder extends AnnotationVisitor
}
}
+ @Override
public AnnotationVisitor visitAnnotation(final String name, String desc)
{
final AbstractAnnotationBuilder outerBuilder = this;
@@ -101,6 +104,7 @@ public abstract class AbstractAnnotationBuilder extends AnnotationVisitor
* nested annotations. All the arrays of strings and primitives are handled by ASM and become
* a single call to {@link #visit(String, Object)}.
*/
+ @Override
public AnnotationVisitor visitArray(final String name)
{
final List<Object> values = new ArrayList<Object>();
@@ -134,6 +138,7 @@ public abstract class AbstractAnnotationBuilder extends AnnotationVisitor
};
}
+ @Override
public void visitEnd()
{
// Nothing to do here. Subclasses use this as a chance to store a value into an outer
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractMethodInvocation.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractMethodInvocation.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractMethodInvocation.java
index eb9c8cd..cf68617 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractMethodInvocation.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractMethodInvocation.java
@@ -47,17 +47,20 @@ public abstract class AbstractMethodInvocation implements MethodInvocation
checkedException = null;
}
+ @Override
public void rethrow()
{
if (checkedException != null)
throw new RuntimeException(checkedException);
}
+ @Override
public boolean didThrowCheckedException()
{
return checkedException != null;
}
+ @Override
public <T extends Throwable> T getCheckedException(Class<T> exceptionType)
{
assert exceptionType != null;
@@ -68,16 +71,19 @@ public abstract class AbstractMethodInvocation implements MethodInvocation
return null;
}
+ @Override
public Object getInstance()
{
return instance;
}
+ @Override
public InstanceContext getInstanceContext()
{
return instanceContext;
}
+ @Override
public MethodInvocation proceed()
{
if (adviceIndex == bundle.advice.length)
@@ -88,6 +94,7 @@ public abstract class AbstractMethodInvocation implements MethodInvocation
return this;
}
+ @Override
public MethodInvocation setCheckedException(Exception exception)
{
checkedException = exception;
@@ -95,16 +102,19 @@ public abstract class AbstractMethodInvocation implements MethodInvocation
return this;
}
+ @Override
public <T extends Annotation> boolean hasAnnotation(Class<T> annotationType)
{
return getAnnotation(annotationType) != null;
}
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationType)
{
return getMethod().getAnnotation(annotationType);
}
+ @Override
public Method getMethod()
{
return bundle.getMethod(getInstance());
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AnnotationBuilder.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AnnotationBuilder.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AnnotationBuilder.java
index 54e8358..a2101da 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AnnotationBuilder.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AnnotationBuilder.java
@@ -35,6 +35,7 @@ public class AnnotationBuilder extends AbstractAnnotationBuilder
this.attributes = attributes;
}
+ @Override
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
{
// args is null for no-arguments methods
@@ -86,11 +87,13 @@ public class AnnotationBuilder extends AbstractAnnotationBuilder
}
+ @Override
protected void store(String name, Object value)
{
attributes.put(name, value);
}
+ @Override
protected Class elementTypeForArrayAttribute(String name)
{
try
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/ClassInstantiatorImpl.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/ClassInstantiatorImpl.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/ClassInstantiatorImpl.java
index 72d5372..cc93824 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/ClassInstantiatorImpl.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/ClassInstantiatorImpl.java
@@ -53,6 +53,7 @@ public class ClassInstantiatorImpl<T> implements ClassInstantiator<T>, InstanceC
this.withValue = withValue;
}
+ @Override
public <V> ClassInstantiator<T> with(Class<V> valueType, V instanceContextValue)
{
assert valueType != null;
@@ -70,6 +71,7 @@ public class ClassInstantiatorImpl<T> implements ClassInstantiator<T>, InstanceC
instanceContextValue);
}
+ @Override
public <V> V get(Class<V> valueType)
{
V result = find(valueType);
@@ -95,6 +97,7 @@ public class ClassInstantiatorImpl<T> implements ClassInstantiator<T>, InstanceC
return null;
}
+ @Override
public T newInstance()
{
if (Modifier.isAbstract(clazz.getModifiers()))
@@ -112,11 +115,13 @@ public class ClassInstantiatorImpl<T> implements ClassInstantiator<T>, InstanceC
}
}
+ @Override
public Class<T> getInstanceType()
{
return clazz;
}
+ @Override
public String toString()
{
return String.format("ClassInstantiator[%s]", clazz.getName());
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/DelegatingAnnotationAccess.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/DelegatingAnnotationAccess.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/DelegatingAnnotationAccess.java
index 2d1e791..b114b18 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/DelegatingAnnotationAccess.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/DelegatingAnnotationAccess.java
@@ -27,6 +27,7 @@ public class DelegatingAnnotationAccess implements AnnotationAccess
return annotationType.getAnnotation(Inherited.class) != null;
}
+ @Override
public <T extends Annotation> boolean hasAnnotation(Class<T> annotationType)
{
if (primary.hasAnnotation(annotationType))
@@ -35,6 +36,7 @@ public class DelegatingAnnotationAccess implements AnnotationAccess
return isInherited(annotationType) && inherited.hasAnnotation(annotationType);
}
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationType)
{
T fromPrimary = primary.getAnnotation(annotationType);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/EmptyAnnotationAccess.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/EmptyAnnotationAccess.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/EmptyAnnotationAccess.java
index b6ec715..39510ec 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/EmptyAnnotationAccess.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/EmptyAnnotationAccess.java
@@ -26,11 +26,13 @@ public class EmptyAnnotationAccess implements AnnotationAccess
{
}
+ @Override
public <T extends Annotation> boolean hasAnnotation(Class<T> annotationType)
{
return false;
}
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationType)
{
return null;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/FailureMethodInvocationResult.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/FailureMethodInvocationResult.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/FailureMethodInvocationResult.java
index 0c69ae4..84d1b01 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/FailureMethodInvocationResult.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/FailureMethodInvocationResult.java
@@ -27,21 +27,25 @@ public class FailureMethodInvocationResult implements MethodInvocationResult
this.thrown = thrown;
}
+ @Override
public Object getReturnValue()
{
return null;
}
+ @Override
public void rethrow()
{
throw new RuntimeException(thrown);
}
+ @Override
public boolean didThrowCheckedException()
{
return true;
}
+ @Override
public <T extends Throwable> T getCheckedException(Class<T> exceptionType)
{
if (exceptionType.isInstance(thrown))
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/FieldHandleImpl.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/FieldHandleImpl.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/FieldHandleImpl.java
index a873fbb..19e3830 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/FieldHandleImpl.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/FieldHandleImpl.java
@@ -37,6 +37,7 @@ public class FieldHandleImpl implements FieldHandle
return String.format("FieldHandle[%s#%s]", className, fieldName);
}
+ @Override
public Object get(Object instance)
{
checkNullInstance(instance, "get");
@@ -52,6 +53,7 @@ public class FieldHandleImpl implements FieldHandle
className));
}
+ @Override
public void set(Object instance, Object newValue)
{
checkNullInstance(instance, "set");
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InstructionBuilderImpl.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InstructionBuilderImpl.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InstructionBuilderImpl.java
index 6823297..bbead43 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InstructionBuilderImpl.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InstructionBuilderImpl.java
@@ -106,6 +106,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
this.cache = state.nameCache;
}
+ @Override
public InstructionBuilder returnDefaultValue()
{
check();
@@ -146,6 +147,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder loadThis()
{
check();
@@ -155,6 +157,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder loadNull()
{
check();
@@ -164,6 +167,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder loadArgument(int index)
{
check();
@@ -177,6 +181,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder loadArguments()
{
check();
@@ -189,6 +194,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder invokeSpecial(String containingClassName, MethodDescription description)
{
check();
@@ -198,6 +204,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder invokeVirtual(PlasticMethod method)
{
check();
@@ -210,6 +217,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
description.argumentTypes);
}
+ @Override
public InstructionBuilder invokeVirtual(String className, String returnType, String methodName,
String... argumentTypes)
{
@@ -220,6 +228,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder invokeInterface(String interfaceName, String returnType, String methodName,
String... argumentTypes)
{
@@ -236,6 +245,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
cache.toMethodDescriptor(returnType, argumentTypes));
}
+ @Override
public InstructionBuilder invokeStatic(Class clazz, Class returnType, String methodName, Class... argumentTypes)
{
doInvoke(INVOKESTATIC, clazz, returnType, methodName, argumentTypes);
@@ -249,6 +259,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
PlasticUtils.toTypeNames(argumentTypes));
}
+ @Override
public InstructionBuilder invoke(Method method)
{
check();
@@ -256,6 +267,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return invoke(method.getDeclaringClass(), method.getReturnType(), method.getName(), method.getParameterTypes());
}
+ @Override
public InstructionBuilder invoke(Class clazz, Class returnType, String methodName, Class... argumentTypes)
{
check();
@@ -271,6 +283,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
cache.toDesc(description));
}
+ @Override
public InstructionBuilder returnResult()
{
check();
@@ -284,6 +297,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder boxPrimitive(String typeName)
{
check();
@@ -298,6 +312,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder unboxPrimitive(String typeName)
{
check();
@@ -317,6 +332,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
v.visitMethodInsn(INVOKEVIRTUAL, type.wrapperInternalName, type.toValueMethodName, type.toValueMethodDescriptor);
}
+ @Override
public InstructionBuilder getField(String className, String fieldName, String typeName)
{
check();
@@ -326,6 +342,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder getStaticField(String className, String fieldName, String typeName)
{
check();
@@ -335,6 +352,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder getStaticField(String className, String fieldName, Class fieldType)
{
check();
@@ -342,6 +360,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return getStaticField(className, fieldName, cache.toTypeName(fieldType));
}
+ @Override
public InstructionBuilder putStaticField(String className, String fieldName, Class fieldType)
{
check();
@@ -349,6 +368,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return putStaticField(className, fieldName, cache.toTypeName(fieldType));
}
+ @Override
public InstructionBuilder putStaticField(String className, String fieldName, String typeName)
{
check();
@@ -358,6 +378,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder getField(PlasticField field)
{
check();
@@ -365,6 +386,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return getField(field.getPlasticClass().getClassName(), field.getName(), field.getTypeName());
}
+ @Override
public InstructionBuilder putField(String className, String fieldName, String typeName)
{
check();
@@ -374,6 +396,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder putField(String className, String fieldName, Class fieldType)
{
check();
@@ -381,6 +404,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return putField(className, fieldName, cache.toTypeName(fieldType));
}
+ @Override
public InstructionBuilder getField(String className, String fieldName, Class fieldType)
{
check();
@@ -388,6 +412,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return getField(className, fieldName, cache.toTypeName(fieldType));
}
+ @Override
public InstructionBuilder loadArrayElement(int index, String elementType)
{
check();
@@ -407,6 +432,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder loadArrayElement()
{
check();
@@ -416,6 +442,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder checkcast(String className)
{
check();
@@ -430,6 +457,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder checkcast(Class clazz)
{
check();
@@ -437,6 +465,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return checkcast(cache.toTypeName(clazz));
}
+ @Override
public InstructionBuilder startTryCatch(TryCatchCallback callback)
{
check();
@@ -446,6 +475,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder newInstance(String className)
{
check();
@@ -455,6 +485,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder newInstance(Class clazz)
{
check();
@@ -462,6 +493,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return newInstance(clazz.getName());
}
+ @Override
public InstructionBuilder invokeConstructor(String className, String... argumentTypes)
{
check();
@@ -471,6 +503,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder invokeConstructor(Class clazz, Class... argumentTypes)
{
check();
@@ -478,6 +511,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return invokeConstructor(clazz.getName(), PlasticUtils.toTypeNames(argumentTypes));
}
+ @Override
public InstructionBuilder dupe(int depth)
{
check();
@@ -491,6 +525,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder dupe()
{
check();
@@ -500,6 +535,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder pop()
{
check();
@@ -509,6 +545,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder swap()
{
check();
@@ -518,6 +555,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder loadConstant(Object constant)
{
check();
@@ -532,6 +570,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder loadTypeConstant(String typeName)
{
check();
@@ -543,6 +582,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder loadTypeConstant(Class clazz)
{
check();
@@ -554,6 +594,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder castOrUnbox(String typeName)
{
check();
@@ -569,6 +610,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder throwException(String className, String message)
{
check();
@@ -582,6 +624,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder throwException(Class<? extends Throwable> exceptionType, String message)
{
check();
@@ -589,6 +632,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return throwException(cache.toTypeName(exceptionType), message);
}
+ @Override
public InstructionBuilder throwException()
{
check();
@@ -598,6 +642,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder startSwitch(int min, int max, SwitchCallback callback)
{
check();
@@ -609,6 +654,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder startVariable(String type, final LocalVariableCallback callback)
{
check();
@@ -617,6 +663,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
callback.doBuild(var, builder);
@@ -628,6 +675,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder storeVariable(LocalVariable var)
{
check();
@@ -637,6 +685,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder loadVariable(LocalVariable var)
{
check();
@@ -646,6 +695,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder when(Condition condition, final InstructionBuilderCallback ifTrue)
{
check();
@@ -657,17 +707,20 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return when(condition, new WhenCallback()
{
+ @Override
public void ifTrue(InstructionBuilder builder)
{
ifTrue.doBuild(builder);
}
+ @Override
public void ifFalse(InstructionBuilder builder)
{
}
});
}
+ @Override
public InstructionBuilder when(Condition condition, final WhenCallback callback)
{
check();
@@ -682,6 +735,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
callback.ifTrue(builder);
@@ -694,6 +748,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
callback.ifFalse(builder);
@@ -705,6 +760,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder doWhile(Condition condition, final WhileCallback callback)
{
check();
@@ -718,6 +774,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
callback.buildTest(builder);
@@ -728,6 +785,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
callback.buildBody(builder);
@@ -741,6 +799,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder increment(LocalVariable variable)
{
check();
@@ -752,6 +811,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder arrayLength()
{
check();
@@ -761,22 +821,26 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder iterateArray(final InstructionBuilderCallback callback)
{
startVariable("int", new LocalVariableCallback()
{
+ @Override
public void doBuild(final LocalVariable indexVariable, InstructionBuilder builder)
{
builder.loadConstant(0).storeVariable(indexVariable);
builder.doWhile(Condition.LESS_THAN, new WhileCallback()
{
+ @Override
public void buildTest(InstructionBuilder builder)
{
builder.dupe().arrayLength();
builder.loadVariable(indexVariable).swap();
}
+ @Override
public void buildBody(InstructionBuilder builder)
{
builder.dupe().loadVariable(indexVariable).loadArrayElement();
@@ -792,6 +856,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder dupeWide()
{
check();
@@ -801,6 +866,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder popWide()
{
check();
@@ -810,6 +876,7 @@ public class InstructionBuilderImpl extends Lockable implements Opcodes, Instruc
return this;
}
+ @Override
public InstructionBuilder compareSpecial(String typeName)
{
check();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/LocalVariable.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/LocalVariable.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/LocalVariable.java
index 9c1ac53..05ef7d5 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/LocalVariable.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/LocalVariable.java
@@ -25,6 +25,7 @@ class LocalVariableImpl implements LocalVariable
this.type = type;
}
+ @Override
public String getType()
{
return type;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodAdviceManager.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodAdviceManager.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodAdviceManager.java
index 92f4d84..870f0c2 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodAdviceManager.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodAdviceManager.java
@@ -206,6 +206,7 @@ class MethodAdviceManager
builder.startSwitch(0, description.argumentTypes.length - 1, new SwitchCallback()
{
+ @Override
public void doSwitch(SwitchBlock block)
{
for (int i = 0; i < description.argumentTypes.length; i++)
@@ -215,6 +216,7 @@ class MethodAdviceManager
block.addCase(i, false, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
String type = description.argumentTypes[index];
@@ -247,6 +249,7 @@ class MethodAdviceManager
builder.loadArgument(0).startSwitch(0, description.argumentTypes.length - 1, new SwitchCallback()
{
+ @Override
public void doSwitch(SwitchBlock block)
{
for (int i = 0; i < description.argumentTypes.length; i++)
@@ -256,6 +259,7 @@ class MethodAdviceManager
block.addCase(i, true, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
String type = description.argumentTypes[index];
@@ -316,11 +320,13 @@ class MethodAdviceManager
builder.startTryCatch(new TryCatchCallback()
{
+ @Override
public void doBlock(TryCatchBlock block)
{
block.addTry(new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.invokeVirtual(plasticClass.className, description.returnType, newMethodName,
@@ -337,6 +343,7 @@ class MethodAdviceManager
{
block.addCatch(exceptionName, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.loadThis().swap();
@@ -402,6 +409,7 @@ class MethodAdviceManager
builder.startVariable(invocationClassName, new LocalVariableCallback()
{
+ @Override
public void doBuild(final LocalVariable invocation, InstructionBuilder builder)
{
builder.dupe().storeVariable(invocation);
@@ -414,6 +422,7 @@ class MethodAdviceManager
builder.when(Condition.NON_ZERO, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.loadVariable(invocation).loadTypeConstant(Exception.class);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodHandleImpl.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodHandleImpl.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodHandleImpl.java
index 6f7e662..7bd3c41 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodHandleImpl.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodHandleImpl.java
@@ -32,11 +32,13 @@ public class MethodHandleImpl implements MethodHandle
this.methodIndex = methodIndex;
}
+ @Override
public String toString()
{
return String.format("MethodHandle[%s %s]", className, methodDescription);
}
+ @Override
public MethodInvocationResult invoke(Object instance, Object... arguments)
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodParameterImpl.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodParameterImpl.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodParameterImpl.java
index 77c8680..569a67e 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodParameterImpl.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodParameterImpl.java
@@ -19,6 +19,7 @@ class MethodParameterImpl extends PlasticMember implements MethodParameter
this.index = index;
}
+ @Override
public String getType()
{
plasticClass.check();
@@ -26,6 +27,7 @@ class MethodParameterImpl extends PlasticMember implements MethodParameter
return type;
}
+ @Override
public int getIndex()
{
plasticClass.check();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/NoopDelegate.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/NoopDelegate.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/NoopDelegate.java
index 21499d1..7f1a44d 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/NoopDelegate.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/NoopDelegate.java
@@ -20,10 +20,12 @@ import org.apache.tapestry5.plastic.PlasticManagerDelegate;
public class NoopDelegate implements PlasticManagerDelegate
{
+ @Override
public void transform(PlasticClass plasticClass)
{
}
+ @Override
public ClassInstantiator configureInstantiator(String className, ClassInstantiator instantiator)
{
return instantiator;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java
index eab2882..2b0fc15 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java
@@ -322,6 +322,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return String.format("Class %s has been transformed and may not be directly instantiated.", className);
}
+ @Override
public <T extends Annotation> boolean hasAnnotation(Class<T> annotationType)
{
check();
@@ -329,6 +330,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return annotationAccess.hasAnnotation(annotationType);
}
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationType)
{
check();
@@ -408,6 +410,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
}
+ @Override
public PlasticClass proxyInterface(Class interfaceType, PlasticField field)
{
check();
@@ -424,6 +427,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return this;
}
+ @Override
public ClassInstantiator createInstantiator()
{
lock();
@@ -588,6 +592,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
throw new AssertionError("Could not convert constructor to simple method.");
}
+ @Override
public <T extends Annotation> List<PlasticField> getFieldsWithAnnotation(Class<T> annotationType)
{
check();
@@ -607,6 +612,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return result;
}
+ @Override
public List<PlasticField> getAllFields()
{
check();
@@ -614,6 +620,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return new ArrayList<PlasticField>(fields);
}
+ @Override
public List<PlasticField> getUnclaimedFields()
{
check();
@@ -634,6 +641,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return unclaimedFields;
}
+ @Override
public PlasticMethod introducePrivateMethod(String typeName, String suggestedName, String[] argumentTypes,
String[] exceptionTypes)
{
@@ -650,6 +658,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return introduceMethod(description);
}
+ @Override
public PlasticField introduceField(String className, String suggestedName)
{
check();
@@ -672,6 +681,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return newField;
}
+ @Override
public PlasticField introduceField(Class fieldType, String suggestedName)
{
assert fieldType != null;
@@ -684,6 +694,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return values.contains(input) ? input + "$" + PlasticUtils.nextUID() : input;
}
+ @Override
public <T extends Annotation> List<PlasticMethod> getMethodsWithAnnotation(Class<T> annotationType)
{
check();
@@ -702,6 +713,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return result;
}
+ @Override
public List<PlasticMethod> getMethods()
{
check();
@@ -709,6 +721,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return new ArrayList<PlasticMethod>(methods);
}
+ @Override
public PlasticMethod introduceMethod(MethodDescription description)
{
check();
@@ -736,6 +749,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return result;
}
+ @Override
public PlasticMethod introduceMethod(MethodDescription description, InstructionBuilderCallback callback)
{
check();
@@ -745,6 +759,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return introduceMethod(description).changeImplementation(callback);
}
+ @Override
public PlasticMethod introduceMethod(Method method)
{
check();
@@ -923,6 +938,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
builder.startSwitch(0, nextFieldIndex - 1, new SwitchCallback()
{
+ @Override
public void doSwitch(SwitchBlock block)
{
for (PlasticFieldImpl f : shimFields)
@@ -952,6 +968,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
builder.startSwitch(0, nextFieldIndex - 1, new SwitchCallback()
{
+ @Override
public void doSwitch(SwitchBlock block)
{
for (PlasticFieldImpl f : shimFields)
@@ -983,6 +1000,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
builder.startSwitch(0, nextMethodIndex - 1, new SwitchCallback()
{
+ @Override
public void doSwitch(SwitchBlock block)
{
for (PlasticMethodImpl m : shimMethods)
@@ -1130,11 +1148,13 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
builder.loadThis().getField(className, getInstanceContextFieldName(), InstanceContext.class);
}
+ @Override
public PlasticClass getPlasticClass()
{
return this;
}
+ @Override
public Class<?> getTransformedClass()
{
if (transformedClass == null)
@@ -1150,6 +1170,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return (node.access & (ACC_ABSTRACT | ACC_PRIVATE)) == 0;
}
+ @Override
public String getClassName()
{
return className;
@@ -1165,6 +1186,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return new InstructionBuilderImpl(description, mn, nameCache);
}
+ @Override
public Set<PlasticMethod> introduceInterface(Class interfaceType)
{
check();
@@ -1211,6 +1233,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return introducedMethods;
}
+ @Override
public PlasticClass addToString(final String toStringValue)
{
check();
@@ -1219,6 +1242,7 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
{
introduceMethod(PlasticUtils.TO_STRING_DESCRIPTION, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.loadConstant(toStringValue).returnResult();
@@ -1229,11 +1253,13 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return this;
}
+ @Override
public boolean isMethodImplemented(MethodDescription description)
{
return inheritanceData.isImplemented(description.methodName, nameCache.toDesc(description));
}
+ @Override
public boolean isInterfaceImplemented(Class interfaceType)
{
assert interfaceType != null;
@@ -1244,11 +1270,13 @@ public class PlasticClassImpl extends Lockable implements PlasticClass, Internal
return inheritanceData.isInterfaceImplemented(interfaceName);
}
+ @Override
public String getSuperClassName()
{
return superClassName;
}
+ @Override
public PlasticClass onConstruct(ConstructorCallback callback)
{
check();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java
index ad9e096..5db10cd 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java
@@ -64,6 +64,7 @@ public class PlasticClassPool implements ClassLoaderDelegate, Opcodes, PlasticCl
private final Cache<String, TypeCategory> typeName2Category = new Cache<String, TypeCategory>()
{
+ @Override
protected TypeCategory convert(String typeName)
{
ClassNode cn = constructClassNodeFromBytecode(typeName);
@@ -159,21 +160,25 @@ public class PlasticClassPool implements ClassLoaderDelegate, Opcodes, PlasticCl
{
return new PlasticClassEvent()
{
+ @Override
public ClassType getType()
{
return classType;
}
+ @Override
public String getPrimaryClassName()
{
return primaryClassName;
}
+ @Override
public String getDissasembledBytecode()
{
return PlasticInternalUtils.dissasembleBytecode(classNode);
}
+ @Override
public String getClassName()
{
return PlasticInternalUtils.toClassName(classNode.name);
@@ -206,11 +211,13 @@ public class PlasticClassPool implements ClassLoaderDelegate, Opcodes, PlasticCl
return new AnnotationAccess()
{
+ @Override
public <T extends Annotation> boolean hasAnnotation(Class<T> annotationType)
{
return getAnnotation(annotationType) != null;
}
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationType)
{
return searchClass.getAnnotation(annotationType);
@@ -239,11 +246,13 @@ public class PlasticClassPool implements ClassLoaderDelegate, Opcodes, PlasticCl
return new AnnotationAccess()
{
+ @Override
public <T extends Annotation> boolean hasAnnotation(Class<T> annotationType)
{
return nameToNode.containsKey(annotationType.getName());
}
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationType)
{
String className = annotationType.getName();
@@ -294,6 +303,7 @@ public class PlasticClassPool implements ClassLoaderDelegate, Opcodes, PlasticCl
return builder.createAnnotation();
}
+ @Override
public boolean shouldInterceptClassLoading(String className)
{
int searchFromIndex = className.length() - 1;
@@ -318,6 +328,7 @@ public class PlasticClassPool implements ClassLoaderDelegate, Opcodes, PlasticCl
// Hopefully the synchronized will not cause a deadlock
+ @Override
public synchronized Class<?> loadAndTransformClass(String className) throws ClassNotFoundException
{
// Inner classes are not transformed, but they are loaded by the same class loader.
@@ -630,6 +641,7 @@ public class PlasticClassPool implements ClassLoaderDelegate, Opcodes, PlasticCl
}
}
+ @Override
public void addPlasticClassListener(PlasticClassListener listener)
{
assert listener != null;
@@ -637,6 +649,7 @@ public class PlasticClassPool implements ClassLoaderDelegate, Opcodes, PlasticCl
listeners.add(listener);
}
+ @Override
public void removePlasticClassListener(PlasticClassListener listener)
{
assert listener != null;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticFieldImpl.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticFieldImpl.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticFieldImpl.java
index 6ce434c..d490750 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticFieldImpl.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticFieldImpl.java
@@ -51,27 +51,32 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
this.typeName = Type.getType(node.desc).getClassName();
}
+ @Override
public String toString()
{
return String.format("PlasticField[%s %s %s (in class %s)]", Modifier.toString(node.access), typeName,
node.name, plasticClass.className);
}
+ @Override
public String getGenericSignature()
{
return node.signature;
}
+ @Override
public int getModifiers()
{
return node.access;
}
+ @Override
public int compareTo(PlasticFieldImpl o)
{
return this.node.name.compareTo(o.node.name);
}
+ @Override
public PlasticClass getPlasticClass()
{
plasticClass.check();
@@ -79,6 +84,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
return plasticClass;
}
+ @Override
public FieldHandle getHandle()
{
plasticClass.check();
@@ -97,6 +103,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
return handle;
}
+ @Override
public PlasticField claim(Object tag)
{
assert tag != null;
@@ -119,6 +126,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
return this;
}
+ @Override
public boolean isClaimed()
{
plasticClass.check();
@@ -126,6 +134,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
return tag != null;
}
+ @Override
public String getName()
{
plasticClass.check();
@@ -133,6 +142,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
return node.name;
}
+ @Override
public String getTypeName()
{
plasticClass.check();
@@ -157,6 +167,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
}
}
+ @Override
public PlasticField inject(Object value)
{
plasticClass.check();
@@ -174,6 +185,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
return this;
}
+ @Override
public PlasticField injectComputed(ComputedValue<?> computedValue)
{
plasticClass.check();
@@ -210,6 +222,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
plasticClass.constructorBuilder.putField(plasticClass.className, node.name, typeName);
}
+ @Override
public PlasticField injectFromInstanceContext()
{
plasticClass.check();
@@ -238,6 +251,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
return this;
}
+ @Override
public <F> PlasticField setConduit(FieldConduit<F> conduit)
{
assert conduit != null;
@@ -260,6 +274,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
return this;
}
+ @Override
public <F> PlasticField setComputedConduit(ComputedValue<FieldConduit<F>> computedConduit)
{
assert computedConduit != null;
@@ -282,6 +297,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
return this;
}
+ @Override
public PlasticField createAccessors(PropertyAccessType accessType)
{
plasticClass.check();
@@ -289,6 +305,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
return createAccessors(accessType, PlasticInternalUtils.toPropertyName(node.name));
}
+ @Override
public PlasticField createAccessors(PropertyAccessType accessType, String propertyName)
{
plasticClass.check();
@@ -305,6 +322,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
introduceAccessorMethod(getTypeName(), "get" + capitalized, null, signature,
new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.loadThis().getField(PlasticFieldImpl.this).returnResult();
@@ -319,6 +337,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
introduceAccessorMethod("void", "set" + capitalized, new String[]
{getTypeName()}, signature, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.loadThis().loadArgument(0);
@@ -554,6 +573,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
switchBlock.addCase(fieldIndex, false, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.invokeVirtual(plasticClass.className, typeName, methodToInvoke).boxPrimitive(typeName).returnResult();
@@ -581,6 +601,7 @@ class PlasticFieldImpl extends PlasticMember implements PlasticField, Comparable
switchBlock.addCase(fieldIndex, true, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.castOrUnbox(typeName);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMember.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMember.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMember.java
index 5513bc6..bf99bc9 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMember.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMember.java
@@ -32,6 +32,7 @@ class PlasticMember implements AnnotationAccess
annotationAccess = plasticClass.pool.createAnnotationAccess((List<AnnotationNode>) visibleAnnotations);
}
+ @Override
public <T extends Annotation> boolean hasAnnotation(Class<T> annotationType)
{
plasticClass.check();
@@ -39,6 +40,7 @@ class PlasticMember implements AnnotationAccess
return annotationAccess.hasAnnotation(annotationType);
}
+ @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationType)
{
plasticClass.check();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMethodImpl.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMethodImpl.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMethodImpl.java
index 74d0be4..980bd84 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMethodImpl.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMethodImpl.java
@@ -46,11 +46,13 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
this.description = PlasticInternalUtils.toMethodDescription(node);
}
+ @Override
public String toString()
{
return String.format("PlasticMethod[%s in class %s]", description, plasticClass.className);
}
+ @Override
public PlasticClass getPlasticClass()
{
plasticClass.check();
@@ -58,6 +60,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return plasticClass;
}
+ @Override
public MethodDescription getDescription()
{
plasticClass.check();
@@ -65,6 +68,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return description;
}
+ @Override
public int compareTo(PlasticMethodImpl o)
{
plasticClass.check();
@@ -72,6 +76,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return description.compareTo(o.description);
}
+ @Override
public boolean isOverride()
{
plasticClass.check();
@@ -79,6 +84,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return plasticClass.parentInheritanceData.isImplemented(node.name, node.desc);
}
+ @Override
public String getMethodIdentifier()
{
plasticClass.check();
@@ -93,6 +99,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return methodIdentifier;
}
+ @Override
public boolean isVoid()
{
plasticClass.check();
@@ -100,6 +107,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return description.returnType.equals("void");
}
+ @Override
public MethodHandle getHandle()
{
plasticClass.check();
@@ -114,6 +122,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return handle;
}
+ @Override
public PlasticMethod changeImplementation(InstructionBuilderCallback callback)
{
plasticClass.check();
@@ -138,6 +147,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return this;
}
+ @Override
public PlasticMethod addAdvice(MethodAdvice advice)
{
plasticClass.check();
@@ -155,6 +165,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return this;
}
+ @Override
public PlasticMethod delegateTo(final PlasticField field)
{
plasticClass.check();
@@ -169,6 +180,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
changeImplementation(new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
// Load the field
@@ -183,6 +195,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return this;
}
+ @Override
public PlasticMethod delegateTo(PlasticMethod delegateProvidingMethod)
{
plasticClass.check();
@@ -202,6 +215,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
changeImplementation(new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
// Load the field
@@ -225,6 +239,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
return this;
}
+ @Override
public List<MethodParameter> getParameters()
{
if (parameters == null)
@@ -301,14 +316,17 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
block.addCase(methodIndex, false, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.startTryCatch(new TryCatchCallback()
{
+ @Override
public void doBlock(TryCatchBlock block)
{
block.addTry(new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
// The third argument is an Object array; get each
@@ -341,6 +359,7 @@ class PlasticMethodImpl extends PlasticMember implements PlasticMethod, Comparab
{
block.addCatch(exceptionType, new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.newInstance(FailureMethodInvocationResult.class).dupe(1).swap();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SuccessMethodInvocationResult.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SuccessMethodInvocationResult.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SuccessMethodInvocationResult.java
index 66d4f95..81dd7d7 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SuccessMethodInvocationResult.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SuccessMethodInvocationResult.java
@@ -28,20 +28,24 @@ public class SuccessMethodInvocationResult implements MethodInvocationResult
this.returnValue = returnValue;
}
+ @Override
public Object getReturnValue()
{
return returnValue;
}
+ @Override
public void rethrow()
{
}
+ @Override
public boolean didThrowCheckedException()
{
return false;
}
+ @Override
public <T extends Throwable> T getCheckedException(Class<T> exceptionType)
{
return null;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SwitchBlockImpl.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SwitchBlockImpl.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SwitchBlockImpl.java
index ce9cd41..b6b28a7 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SwitchBlockImpl.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SwitchBlockImpl.java
@@ -67,6 +67,7 @@ public class SwitchBlockImpl extends Lockable implements SwitchBlock, Opcodes
{
addDefault(new InstructionBuilderCallback()
{
+ @Override
public void doBuild(InstructionBuilder builder)
{
builder.throwException(IllegalArgumentException.class,
@@ -80,6 +81,7 @@ public class SwitchBlockImpl extends Lockable implements SwitchBlock, Opcodes
lock();
}
+ @Override
public void addCase(int caseValue, boolean jumpToEnd, InstructionBuilderCallback callback)
{
assert caseValue >= min;
@@ -98,6 +100,7 @@ public class SwitchBlockImpl extends Lockable implements SwitchBlock, Opcodes
state.visitor.visitJumpInsn(GOTO, endSwitchLabel);
}
+ @Override
public void addDefault(InstructionBuilderCallback callback)
{
if (defaultAdded)
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b553edf0/plastic/src/main/java/org/apache/tapestry5/internal/plastic/TryCatchBlockImpl.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/TryCatchBlockImpl.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/TryCatchBlockImpl.java
index 2e369ec..77aad77 100644
--- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/TryCatchBlockImpl.java
+++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/TryCatchBlockImpl.java
@@ -37,6 +37,7 @@ public class TryCatchBlockImpl extends Lockable implements TryCatchBlock
this.endLabel = new Label();
}
+ @Override
public void addTry(InstructionBuilderCallback callback)
{
state.visitor.visitLabel(startLabel);
@@ -46,6 +47,7 @@ public class TryCatchBlockImpl extends Lockable implements TryCatchBlock
state.visitor.visitLabel(endLabel);
}
+ @Override
public void addCatch(String exceptionClassName, InstructionBuilderCallback callback)
{
assert exceptionClassName != null;
@@ -64,6 +66,7 @@ public class TryCatchBlockImpl extends Lockable implements TryCatchBlock
state.visitor.visitTryCatchBlock(startLabel, endLabel, handler, exceptionInternalName);
}
+ @Override
public void addFinally(InstructionBuilderCallback callback)
{
doCatch(null, callback);