Clean up markup inside JavaDoc to confirm to JDK 1.8's stricter rules
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/84053397 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/84053397 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/84053397 Branch: refs/heads/master Commit: 840533975a33d9094789bc09e40557a5c3ec7ba8 Parents: 99600b9 Author: Howard M. Lewis Ship <hls...@apache.org> Authored: Mon Apr 6 12:18:21 2015 -0700 Committer: Howard M. Lewis Ship <hls...@apache.org> Committed: Mon Apr 6 12:18:25 2015 -0700 ---------------------------------------------------------------------- .../apache/tapestry5/beaneditor/BeanModel.java | 8 +-- .../beaneditor/BeanModelSourceBuilder.java | 16 ++--- .../tapestry5/beaneditor/PropertyModel.java | 6 +- .../tapestry5/services/BeanModelSource.java | 6 +- .../services/PropertyConduitSource.java | 4 +- .../org/apache/tapestry5/ioc/Configuration.java | 8 +-- .../tapestry5/ioc/MappedConfiguration.java | 6 +- .../org/apache/tapestry5/ioc/ObjectLocator.java | 13 ++-- .../tapestry5/ioc/OrderedConfiguration.java | 10 ++- .../java/org/apache/tapestry5/ioc/Resource.java | 10 +-- .../ioc/internal/services/TypeCoercerImpl.java | 8 +-- .../ioc/internal/util/CollectionFactory.java | 10 ++- .../ioc/internal/util/GenericsUtils.java | 28 ++++---- .../ioc/internal/util/InheritanceSearch.java | 14 ++-- .../ioc/services/ClassPropertyAdapter.java | 6 +- .../tapestry5/ioc/services/PropertyAccess.java | 6 +- .../tapestry5/ioc/services/PropertyAdapter.java | 4 +- .../tapestry5/ioc/services/TypeCoercer.java | 6 +- .../apache/tapestry5/ioc/util/TimeInterval.java | 14 ++-- .../tapestry5/services/DataTypeAnalyzer.java | 8 +-- .../services/InvalidationEventHub.java | 4 +- .../tapestry5/util/StringToEnumCoercion.java | 8 +-- .../internal/plastic/asm/MethodWriter.java | 4 +- .../plastic/asm/commons/AdviceAdapter.java | 10 +-- .../internal/plastic/asm/util/ASMifier.java | 12 +--- .../plastic/asm/util/CheckClassAdapter.java | 32 +++------- .../internal/plastic/asm/util/Textifier.java | 15 ++--- .../plastic/asm/util/TraceClassVisitor.java | 16 ++--- .../internal/plastic/asm/xml/Processor.java | 48 +++++--------- .../internal/plastic/PlasticInternalUtils.java | 38 +++-------- .../apache/tapestry5/plastic/FieldConduit.java | 6 +- .../tapestry5/plastic/InstructionBuilder.java | 8 +-- .../tapestry5/plastic/MethodDescription.java | 12 ++-- .../tapestry5/plastic/MethodInvocation.java | 4 +- .../apache/tapestry5/plastic/PlasticClass.java | 16 ++--- .../plastic/PlasticClassTransformation.java | 4 +- .../apache/tapestry5/plastic/PlasticField.java | 6 +- .../tapestry5/plastic/PlasticManager.java | 12 ++-- .../apache/tapestry5/plastic/PlasticMethod.java | 10 +-- .../apache/tapestry5/plastic/PlasticUtils.java | 4 +- .../apache/tapestry5/plastic/TryCatchBlock.java | 4 +- .../src/main/java/services/AppModule.java | 8 +-- .../ClientConstraintDescriptor.java | 4 +- .../main/java/org/apache/tapestry5/Asset.java | 12 ++-- .../BaseOptimizedSessionPersistedObject.java | 6 +- .../main/java/org/apache/tapestry5/Binding.java | 4 +- .../main/java/org/apache/tapestry5/Block.java | 4 +- .../org/apache/tapestry5/ClientElement.java | 4 +- .../org/apache/tapestry5/ComponentAction.java | 6 +- .../tapestry5/ComponentEventCallback.java | 4 +- .../apache/tapestry5/ComponentResources.java | 4 +- .../tapestry5/ComponentResourcesCommon.java | 4 +- .../java/org/apache/tapestry5/ContentType.java | 2 +- .../main/java/org/apache/tapestry5/Field.java | 4 +- .../main/java/org/apache/tapestry5/Field2.java | 8 +-- .../main/java/org/apache/tapestry5/Link.java | 14 ++-- .../java/org/apache/tapestry5/MarkupWriter.java | 4 +- .../OptimizedSessionPersistedObject.java | 4 +- .../java/org/apache/tapestry5/PageCallback.java | 8 +-- .../java/org/apache/tapestry5/SelectModel.java | 4 +- .../org/apache/tapestry5/SymbolConstants.java | 38 +++++------ .../org/apache/tapestry5/TapestryConstants.java | 4 +- .../org/apache/tapestry5/TapestryFilter.java | 8 +-- .../TrackableComponentEventCallback.java | 8 +-- .../apache/tapestry5/ValidationDecorator.java | 6 +- .../org/apache/tapestry5/ValidationTracker.java | 10 ++- .../java/org/apache/tapestry5/Validator.java | 4 +- .../java/org/apache/tapestry5/ValueEncoder.java | 10 ++- .../java/org/apache/tapestry5/VersionUtils.java | 4 +- .../apache/tapestry5/ajax/MultiZoneUpdate.java | 4 +- .../annotations/ActivationRequestParameter.java | 24 +++---- .../tapestry5/annotations/BeforeRenderBody.java | 13 ++-- .../tapestry5/annotations/BeginRender.java | 13 ++-- .../tapestry5/annotations/BindParameter.java | 12 ++-- .../apache/tapestry5/annotations/Cached.java | 11 ++-- .../tapestry5/annotations/Environmental.java | 16 ++--- .../annotations/HeartbeatDeferred.java | 18 ++---- .../apache/tapestry5/annotations/Import.java | 8 +-- .../apache/tapestry5/annotations/OnEvent.java | 17 +++-- .../annotations/PageActivationContext.java | 11 ++-- .../tapestry5/annotations/PageAttached.java | 4 +- .../tapestry5/annotations/PageDetached.java | 4 +- .../tapestry5/annotations/PageLoaded.java | 11 ++-- .../apache/tapestry5/annotations/PageReset.java | 18 ++---- .../apache/tapestry5/annotations/Persist.java | 12 ++-- .../apache/tapestry5/annotations/Property.java | 11 ++-- .../tapestry5/annotations/RequestParameter.java | 19 ++---- .../apache/tapestry5/annotations/Retain.java | 13 ++-- .../apache/tapestry5/annotations/Secure.java | 11 ++-- .../tapestry5/annotations/SessionState.java | 13 ++-- .../annotations/WhitelistAccessOnly.java | 4 +- .../tapestry5/corelib/base/AbstractField.java | 6 +- .../corelib/base/AbstractPropertyOutput.java | 2 +- .../corelib/base/AbstractTextField.java | 10 ++- .../corelib/components/AjaxFormLoop.java | 8 +-- .../tapestry5/corelib/components/Alerts.java | 2 +- .../tapestry5/corelib/components/Any.java | 11 ++-- .../corelib/components/BeanDisplay.java | 6 +- .../corelib/components/BeanEditForm.java | 6 +- .../tapestry5/corelib/components/Checklist.java | 4 +- .../tapestry5/corelib/components/DateField.java | 6 +- .../tapestry5/corelib/components/Delegate.java | 6 +- .../tapestry5/corelib/components/DevTool.java | 6 +- .../tapestry5/corelib/components/Dynamic.java | 6 +- .../tapestry5/corelib/components/Error.java | 6 +- .../tapestry5/corelib/components/EventLink.java | 8 +-- .../tapestry5/corelib/components/Form.java | 40 ++++++------ .../corelib/components/FormFragment.java | 4 +- .../tapestry5/corelib/components/Grid.java | 4 +- .../tapestry5/corelib/components/GridRows.java | 6 +- .../tapestry5/corelib/components/Hidden.java | 4 +- .../tapestry5/corelib/components/Label.java | 4 +- .../tapestry5/corelib/components/LocalDate.java | 6 +- .../tapestry5/corelib/components/Loop.java | 28 ++------ .../tapestry5/corelib/components/PageLink.java | 4 +- .../tapestry5/corelib/components/Palette.java | 22 +++---- .../corelib/components/PasswordField.java | 4 +- .../corelib/components/ProgressiveDisplay.java | 4 +- .../tapestry5/corelib/components/Radio.java | 4 +- .../tapestry5/corelib/components/Select.java | 2 +- .../tapestry5/corelib/components/TextArea.java | 4 +- .../tapestry5/corelib/components/TextField.java | 4 +- .../corelib/components/TimeInterval.java | 6 +- .../tapestry5/corelib/components/Tree.java | 4 +- .../tapestry5/corelib/components/Zone.java | 12 ++-- .../tapestry5/corelib/data/SecureOption.java | 7 +- .../corelib/internal/FormSupportImpl.java | 4 +- .../tapestry5/corelib/mixins/Autocomplete.java | 4 +- .../tapestry5/corelib/mixins/Confirm.java | 2 +- .../corelib/mixins/FormFieldFocus.java | 5 +- .../tapestry5/corelib/mixins/FormGroup.java | 14 ++-- .../tapestry5/corelib/mixins/NotEmpty.java | 4 +- .../corelib/mixins/OverrideFieldFocus.java | 7 +- .../corelib/mixins/RenderClientId.java | 8 +-- .../corelib/mixins/RenderInformals.java | 14 ++-- .../tapestry5/corelib/mixins/ZoneRefresh.java | 16 ++--- .../tapestry5/corelib/pages/ServiceStatus.java | 4 +- .../java/org/apache/tapestry5/dom/Element.java | 4 +- .../InternalComponentResourcesCommon.java | 4 +- .../tapestry5/internal/InternalSymbols.java | 2 +- .../internal/TapestryAppInitializer.java | 6 +- .../internal/TapestryInternalUtils.java | 2 +- .../internal/bindings/LiteralBinding.java | 6 +- .../internal/bindings/PropBindingFactory.java | 4 +- .../pageload/EmbeddedComponentAssembler.java | 6 +- .../internal/pageload/PageLoaderImpl.java | 4 +- .../services/BlockInjectionProvider.java | 4 +- .../services/ComponentInstantiatorSource.java | 8 +-- .../internal/services/ComponentModelSource.java | 4 +- .../services/ComponentResourcesOperation.java | 4 +- .../services/ComponentTemplateSource.java | 6 +- .../services/ComponentTemplateSourceImpl.java | 2 +- .../DefaultRequestExceptionHandler.java | 9 ++- .../internal/services/DocumentLinker.java | 4 +- .../services/FormControlNameManager.java | 2 - .../tapestry5/internal/services/LinkSource.java | 2 +- .../internal/services/MessagesSourceImpl.java | 6 +- .../internal/services/PageRenderQueue.java | 6 +- .../internal/services/RequestPageCache.java | 6 +- .../services/ResourceDigestManager.java | 8 +-- .../internal/services/SaxTemplateParser.java | 24 +++---- .../SessionPersistentFieldStrategy.java | 4 +- .../UnknownActivationContextHandler.java | 4 +- .../services/assets/CSSURLRewriter.java | 4 +- .../assets/JavaScriptStackAssembler.java | 2 +- .../structure/ComponentPageElementImpl.java | 4 +- .../tapestry5/internal/structure/Page.java | 12 ++-- .../EventHandlerMethodParameterProvider.java | 4 +- .../internal/transform/InjectWorker.java | 4 +- .../internal/transform/ParameterConduit.java | 6 +- .../tapestry5/internal/util/LocaleUtils.java | 12 ++-- .../tapestry5/internal/util/NamedSet.java | 2 +- .../apache/tapestry5/model/ComponentModel.java | 25 ++++---- .../tapestry5/model/MutableComponentModel.java | 4 +- .../apache/tapestry5/modules/AssetsModule.java | 1 + .../tapestry5/modules/InternalModule.java | 3 +- .../tapestry5/modules/JavaScriptModule.java | 2 +- .../tapestry5/modules/TapestryModule.java | 13 ++-- .../org/apache/tapestry5/runtime/Component.java | 6 +- .../apache/tapestry5/runtime/RenderCommand.java | 4 +- .../services/ApplicationStateManager.java | 6 +- .../apache/tapestry5/services/AssetFactory.java | 10 ++- .../tapestry5/services/AssetPathConverter.java | 4 +- .../apache/tapestry5/services/AssetSource.java | 8 +-- .../services/BeanBlockOverrideSource.java | 6 +- .../tapestry5/services/BeanBlockSource.java | 6 +- .../tapestry5/services/BindingFactory.java | 4 +- .../tapestry5/services/BindingSource.java | 4 +- .../services/ClasspathAssetAliasManager.java | 10 ++- .../services/ClientBehaviorSupport.java | 8 +-- .../tapestry5/services/ClientDataEncoder.java | 4 +- .../services/ComponentClassResolver.java | 10 ++- .../services/ComponentEventLinkEncoder.java | 12 ++-- .../services/ComponentEventRequestHandler.java | 6 +- .../services/ComponentEventResultProcessor.java | 6 +- .../tapestry5/services/ComponentOverride.java | 2 +- .../apache/tapestry5/services/Environment.java | 4 +- .../tapestry5/services/ExceptionReporter.java | 6 +- .../services/FieldValidatorSource.java | 8 +-- .../apache/tapestry5/services/Heartbeat.java | 4 +- .../services/HiddenFieldLocationRules.java | 4 +- .../tapestry5/services/LibraryMapping.java | 14 ++-- .../tapestry5/services/LocalizationSetter.java | 12 ++-- .../tapestry5/services/MarkupRenderer.java | 4 +- .../tapestry5/services/MetaDataLocator.java | 4 +- .../tapestry5/services/ObjectRenderer.java | 4 +- .../services/PageRenderRequestHandler.java | 4 +- .../services/PartialMarkupRenderer.java | 6 +- .../services/PartialTemplateRenderer.java | 24 +++---- .../org/apache/tapestry5/services/Request.java | 8 +-- .../services/RequestExceptionHandler.java | 8 +-- .../services/ResourceDigestGenerator.java | 8 +-- .../org/apache/tapestry5/services/Response.java | 8 +-- .../SessionPersistedObjectAnalyzer.java | 8 +-- .../tapestry5/services/StreamPageContent.java | 6 +- .../tapestry5/services/TransformConstants.java | 4 +- .../services/TranslatorAlternatesSource.java | 8 +-- .../tapestry5/services/TranslatorSource.java | 8 +-- .../services/ajax/AjaxResponseRenderer.java | 2 +- .../services/assets/AssetRequestHandler.java | 6 +- .../services/assets/CompressionAnalyzer.java | 4 +- .../services/assets/ContentTypeAnalyzer.java | 4 +- .../services/assets/ResourceMinimizer.java | 8 +-- .../tapestry5/services/assets/package-info.java | 4 +- .../services/compatibility/Compatibility.java | 4 +- .../tapestry5/services/compatibility/Trait.java | 10 +-- .../services/javascript/AMDWrapper.java | 24 ++++--- .../javascript/ExtensibleJavaScriptStack.java | 2 +- .../services/javascript/Initialization.java | 4 +- .../javascript/InitializationPriority.java | 4 +- .../JavaScriptModuleConfiguration.java | 8 +-- .../services/javascript/JavaScriptStack.java | 6 +- .../services/javascript/JavaScriptSupport.java | 18 +++--- .../javascript/ModuleConfigurationCallback.java | 6 +- .../services/javascript/ModuleManager.java | 4 +- .../services/javascript/StackExtensionType.java | 4 +- .../ComponentEventLinkTransformer.java | 6 +- .../PageRenderLinkTransformer.java | 6 +- .../services/pageload/PagePreloader.java | 4 +- .../templates/ComponentTemplateLocator.java | 4 +- .../ComponentClassTransformWorker2.java | 4 +- .../services/transform/InjectionProvider2.java | 4 +- .../org/apache/tapestry5/test/PageTester.java | 4 +- .../apache/tapestry5/tree/DefaultTreeModel.java | 4 +- .../tapestry5/tree/TreeSelectionModel.java | 4 +- .../org/apache/tapestry5/validator/Email.java | 2 +- .../org/apache/tapestry5/validator/Regexp.java | 2 +- .../integration/app1/CoreBehaviorsTests.java | 2 +- .../integration/app1/components/Count.java | 4 +- .../tapestry5/services/SyncCostBench.java | 11 ++-- .../main/java/org/apache/tapestry5/func/F.java | 6 +- .../java/org/apache/tapestry5/func/Flow.java | 16 ++--- .../apache/tapestry5/func/FlowOperations.java | 14 ++-- .../java/org/apache/tapestry5/func/Mapper.java | 4 +- .../java/org/apache/tapestry5/func/Mapper2.java | 4 +- .../org/apache/tapestry5/func/Predicate.java | 6 +- .../java/org/apache/tapestry5/func/Reducer.java | 7 +- .../HibernateEntityPackageManager.java | 4 +- .../hibernate/HibernateSessionManager.java | 6 +- .../hibernate/HibernateSessionSource.java | 4 +- .../HibernateTransactionDecorator.java | 4 +- .../hibernate/HibernateGridDataSource.java | 10 ++- .../jcache/internal/AbstractTestExcluder.java | 4 +- .../ioc/junit/TapestryIOCJUnit4ClassRunner.java | 14 ++-- .../org/apache/tapestry5/ioc/AdvisorDef.java | 4 +- .../org/apache/tapestry5/ioc/IOCSymbols.java | 4 +- .../org/apache/tapestry5/ioc/IdMatcher.java | 6 +- .../tapestry5/ioc/ModuleBuilderSource.java | 6 +- .../apache/tapestry5/ioc/ObjectProvider.java | 6 +- .../org/apache/tapestry5/ioc/ReloadAware.java | 4 +- .../apache/tapestry5/ioc/ScopeConstants.java | 6 +- .../tapestry5/ioc/ServiceBindingOptions.java | 3 - .../tapestry5/ioc/annotations/EagerLoad.java | 4 +- .../tapestry5/ioc/annotations/Marker.java | 4 +- .../apache/tapestry5/ioc/annotations/Match.java | 11 ++-- .../annotations/PreventServiceDecoration.java | 10 ++- .../apache/tapestry5/ioc/annotations/Scope.java | 9 ++- .../tapestry5/ioc/def/ContributionDef.java | 4 +- .../apache/tapestry5/ioc/def/DecoratorDef.java | 10 ++- .../org/apache/tapestry5/ioc/def/ModuleDef.java | 4 +- .../apache/tapestry5/ioc/def/ServiceDef.java | 4 +- .../ValidatingMappedConfigurationWrapper.java | 10 ++- .../ioc/internal/services/BridgeBuilder.java | 4 +- .../ioc/internal/services/MethodSignature.java | 4 +- .../services/PerThreadServiceLifecycle.java | 2 +- .../internal/services/cron/CronExpression.java | 67 ++++++++------------ .../ioc/internal/util/ConcurrentBarrier.java | 6 +- .../tapestry5/ioc/services/ChainBuilder.java | 8 +-- .../ioc/services/ExceptionAnalysis.java | 4 +- .../tapestry5/ioc/services/LazyAdvisor.java | 8 +-- .../ioc/services/LoggingDecorator.java | 4 +- .../ioc/services/MasterObjectProvider.java | 8 +-- .../ioc/services/PerthreadManager.java | 8 +-- .../tapestry5/ioc/services/PipelineBuilder.java | 8 +-- .../ioc/services/PropertyShadowBuilder.java | 4 +- .../ioc/services/ServiceLifecycleSource.java | 4 +- .../tapestry5/ioc/services/ServiceOverride.java | 4 +- .../tapestry5/ioc/services/StrategyBuilder.java | 8 +-- .../tapestry5/ioc/services/SymbolProvider.java | 4 +- .../tapestry5/ioc/services/SymbolSource.java | 4 +- .../ioc/services/ThreadCleanupListener.java | 4 +- .../tapestry5/ioc/services/cron/Schedule.java | 4 +- .../apache/tapestry5/ioc/util/IdAllocator.java | 10 ++- .../ioc/util/LocalizedNameGenerator.java | 10 ++- .../tapestry5/services/UpdateListener.java | 4 +- .../tapestry5/services/UpdateListenerHub.java | 8 +-- .../tapestry5/jpa/EntityManagerManager.java | 13 ++-- .../tapestry5/jpa/EntityManagerSource.java | 15 ++--- .../tapestry5/jpa/JpaEntityPackageManager.java | 8 +-- .../apache/tapestry5/jpa/JpaGridDataSource.java | 13 ++-- .../org/apache/tapestry5/json/JSONArray.java | 12 ++-- .../apache/tapestry5/json/JSONCollection.java | 6 +- .../org/apache/tapestry5/json/JSONObject.java | 29 ++++----- .../org/apache/tapestry5/json/package-info.java | 4 +- .../kaptcha/components/KaptchaImage.java | 2 +- .../apache/tapestry5/ioc/test/MockTester.java | 4 +- .../org/apache/tapestry5/ioc/test/TestBase.java | 12 ++-- .../apache/tapestry5/ioc/test/TestUtils.java | 4 +- .../apache/tapestry5/test/SeleniumTestCase.java | 13 ++-- .../ResourceTransformerFactory.java | 5 +- .../apache/tapestry5/beaneditor/Translate.java | 13 ++-- .../apache/tapestry5/beaneditor/Validate.java | 13 ++-- .../org/apache/tapestry5/beaneditor/Width.java | 9 ++- .../tapestry5/ioc/annotations/Inject.java | 18 +++--- .../ioc/annotations/InjectResource.java | 4 +- .../ioc/annotations/InjectService.java | 9 ++- .../ioc/annotations/PostInjection.java | 4 +- .../tapestry5/ioc/annotations/Symbol.java | 6 +- .../annotations/UsesMappedConfiguration.java | 6 +- 329 files changed, 985 insertions(+), 1629 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/beanmodel/src/main/java/org/apache/tapestry5/beaneditor/BeanModel.java ---------------------------------------------------------------------- diff --git a/beanmodel/src/main/java/org/apache/tapestry5/beaneditor/BeanModel.java b/beanmodel/src/main/java/org/apache/tapestry5/beaneditor/BeanModel.java index 0a60fd7..cf47276 100644 --- a/beanmodel/src/main/java/org/apache/tapestry5/beaneditor/BeanModel.java +++ b/beanmodel/src/main/java/org/apache/tapestry5/beaneditor/BeanModel.java @@ -1,5 +1,3 @@ -// Copyright 2007, 2008, 2009, 2010, 2011 The Apache Software Foundation -// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at @@ -21,9 +19,9 @@ import java.util.List; /** * Provides the information necessary to build a user interface to view, create or edit an instance of a particular * type. - * <p/> + * * BeanModels are not thread-safe, they are also not serializable. - * <p/> + * * Here, and in {@link org.apache.tapestry5.beaneditor.PropertyModel}, the term "propertyName" is used for simplicitly. * However, a full {@linkplain org.apache.tapestry5.services.PropertyConduitSource#create(Class, String) property * expression} may be utilized when {@linkplain #add(String) adding new properties to an existing BeanModel}. @@ -160,7 +158,7 @@ public interface BeanModel<T> /** * Re-orders the properties of the model into the specified order. Existing properties that are not indicated are - * <<removed>>. + * removed. * * @param propertyNames the names of properties to be retained * @return the model for further modifications http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/beanmodel/src/main/java/org/apache/tapestry5/beaneditor/BeanModelSourceBuilder.java ---------------------------------------------------------------------- diff --git a/beanmodel/src/main/java/org/apache/tapestry5/beaneditor/BeanModelSourceBuilder.java b/beanmodel/src/main/java/org/apache/tapestry5/beaneditor/BeanModelSourceBuilder.java index ac543d9..20a23cb 100644 --- a/beanmodel/src/main/java/org/apache/tapestry5/beaneditor/BeanModelSourceBuilder.java +++ b/beanmodel/src/main/java/org/apache/tapestry5/beaneditor/BeanModelSourceBuilder.java @@ -1,5 +1,3 @@ -// Copyright 2014 The Apache Software Foundation -// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at @@ -13,10 +11,6 @@ // limitations under the License. package org.apache.tapestry5.beaneditor; -import java.lang.annotation.Annotation; -import java.util.ArrayList; -import java.util.Collection; - import org.apache.tapestry5.internal.services.BeanModelSourceImpl; import org.apache.tapestry5.internal.services.PropertyConduitSourceImpl; import org.apache.tapestry5.internal.services.StringInterner; @@ -39,11 +33,15 @@ import org.apache.tapestry5.services.DataTypeAnalyzer; import org.apache.tapestry5.services.PropertyConduitSource; import org.slf4j.LoggerFactory; +import java.lang.annotation.Annotation; +import java.util.ArrayList; +import java.util.Collection; + /** - * <p>Utility class for creating {@link BeanModelSource} instances without + * Utility class for creating {@link BeanModelSource} instances without * Tapestry-IoC. Usage of Tapestry-IoC is still recommended. - * </p> - * <p>The setter methods can be used to customize the BeanModelSource to be created and can be + * + * The setter methods can be used to customize the BeanModelSource to be created and can be * (and usually are) skipped so <code>BeanModelSource beanModelSource = new BeanModelSourceBuilder().build();</code> * is all you need to do. */ http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/beanmodel/src/main/java/org/apache/tapestry5/beaneditor/PropertyModel.java ---------------------------------------------------------------------- diff --git a/beanmodel/src/main/java/org/apache/tapestry5/beaneditor/PropertyModel.java b/beanmodel/src/main/java/org/apache/tapestry5/beaneditor/PropertyModel.java index 6095fb9..a0c5467 100644 --- a/beanmodel/src/main/java/org/apache/tapestry5/beaneditor/PropertyModel.java +++ b/beanmodel/src/main/java/org/apache/tapestry5/beaneditor/PropertyModel.java @@ -1,5 +1,3 @@ -// Copyright 2007, 2008 The Apache Software Foundation -// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at @@ -20,8 +18,8 @@ import org.apache.tapestry5.ioc.AnnotationProvider; /** * Part of a {@link org.apache.tapestry5.beaneditor.BeanModel} that defines the attributes of a single property of a * bean. - * <p/> - * <p/> + * + * * A PropertyModel is also an {@link AnnotationProvider}, as long as the {@link org.apache.tapestry5.PropertyConduit} is * non-null. When there is no property conduit, then {@link org.apache.tapestry5.ioc.AnnotationProvider#getAnnotation(Class)} * will return null. http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/beanmodel/src/main/java/org/apache/tapestry5/services/BeanModelSource.java ---------------------------------------------------------------------- diff --git a/beanmodel/src/main/java/org/apache/tapestry5/services/BeanModelSource.java b/beanmodel/src/main/java/org/apache/tapestry5/services/BeanModelSource.java index 16b4fca..b98fa60 100644 --- a/beanmodel/src/main/java/org/apache/tapestry5/services/BeanModelSource.java +++ b/beanmodel/src/main/java/org/apache/tapestry5/services/BeanModelSource.java @@ -1,5 +1,3 @@ -// Copyright 2007, 2008 The Apache Software Foundation -// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at @@ -20,7 +18,7 @@ import org.apache.tapestry5.ioc.Messages; /** * Used by a component to create a default {@link org.apache.tapestry5.beaneditor.BeanModel} for a particular bean * class. Also provides support to the model by generating validation information for individual fields. - * <p/> + * * BeanModels are the basis for the {@link org.apache.tapestry5.corelib.components.BeanEditor} and {@link * org.apache.tapestry5.corelib.components.Grid} comopnents. * @@ -34,7 +32,7 @@ public interface BeanModelSource * overridden with the {@link org.apache.tapestry5.beaneditor.ReorderProperties} annotation. The labels for the * properties are derived from the property names, but if the component's message catalog has keys of the form * <code>propertyName-label</code>, then those will be used instead. - * <p/> + * * Models are <em>mutable</em>, so they are not cached, a fresh instance is created each time. * * @param beanClass class of object to be edited http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/beanmodel/src/main/java/org/apache/tapestry5/services/PropertyConduitSource.java ---------------------------------------------------------------------- diff --git a/beanmodel/src/main/java/org/apache/tapestry5/services/PropertyConduitSource.java b/beanmodel/src/main/java/org/apache/tapestry5/services/PropertyConduitSource.java index 312cd60..83d8d33 100644 --- a/beanmodel/src/main/java/org/apache/tapestry5/services/PropertyConduitSource.java +++ b/beanmodel/src/main/java/org/apache/tapestry5/services/PropertyConduitSource.java @@ -1,5 +1,3 @@ -// Copyright 2007, 2008, 2009 The Apache Software Foundation -// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at @@ -27,7 +25,7 @@ public interface PropertyConduitSource * Returns a property conduit instance for the given expression. PropertyConduitSource caches the conduits it * returns, so despite the name, this method does not always create a <em>new</em> conduit. The cache is cleared if * a change to component classes is observed. - * <p/> + * * Callers of this method should observe notifications from the {@link org.apache.tapestry5.services.InvalidationEventHub} * for {@link org.apache.tapestry5.services.ComponentClasses} and discard any aquired conduits; failure to do so * will create memory leaks whenever component classes change (the conduits will keep references to the old classes http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/commons/src/main/java/org/apache/tapestry5/ioc/Configuration.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/tapestry5/ioc/Configuration.java b/commons/src/main/java/org/apache/tapestry5/ioc/Configuration.java index 03814f5..c489463 100644 --- a/commons/src/main/java/org/apache/tapestry5/ioc/Configuration.java +++ b/commons/src/main/java/org/apache/tapestry5/ioc/Configuration.java @@ -1,5 +1,3 @@ -// Copyright 2006, 2008, 2009 The Apache Software Foundation -// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at @@ -17,16 +15,16 @@ package org.apache.tapestry5.ioc; /** * Object passed into a service contributor method that allows the method provide contributed values to the service's * configuration. - * <p/> + * * A service can <em>collect</em> contributions in three different ways: * <ul> * <li>As an un-ordered collection of values</li> * <li>As an ordered list of values (where each value has a unique id, pre-requisites and post-requisites)</li> * <li>As a map of keys and values * </ul> - * <p/> + * * This implementation is used for un-ordered configuration data. - * <p/> + * * The service defines the <em>type</em> of contribution, in terms of a base class or service interface. Contributions * must be compatible with the type. */ http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/commons/src/main/java/org/apache/tapestry5/ioc/MappedConfiguration.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/tapestry5/ioc/MappedConfiguration.java b/commons/src/main/java/org/apache/tapestry5/ioc/MappedConfiguration.java index 47c6026..9139bd3 100644 --- a/commons/src/main/java/org/apache/tapestry5/ioc/MappedConfiguration.java +++ b/commons/src/main/java/org/apache/tapestry5/ioc/MappedConfiguration.java @@ -1,5 +1,3 @@ -// Copyright 2006, 2008, 2009, 2010 The Apache Software Foundation -// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at @@ -17,14 +15,14 @@ package org.apache.tapestry5.ioc; /** * Object passed into a service contributor method that allows the method provide contributed values to the service's * configuration. - * <p/> + * * A service can <em>collect</em> contributions in three different ways: * <ul> * <li>As an un-ordered collection of values</li> * <li>As an ordered list of values (where each value has a unique id, pre-requisites and post-requisites)</li> * <li>As a map of keys and values * </ul> - * <p/> + * * The service defines the <em>type</em> of contribution, in terms of a base class or service interface. Contributions * must be compatible with the type. */ http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/commons/src/main/java/org/apache/tapestry5/ioc/ObjectLocator.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/tapestry5/ioc/ObjectLocator.java b/commons/src/main/java/org/apache/tapestry5/ioc/ObjectLocator.java index e60c0d9..75bc81f 100644 --- a/commons/src/main/java/org/apache/tapestry5/ioc/ObjectLocator.java +++ b/commons/src/main/java/org/apache/tapestry5/ioc/ObjectLocator.java @@ -1,5 +1,3 @@ -// Copyright 2006, 2007, 2010, 2011, 2014 The Apache Software Foundation -// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at @@ -96,27 +94,24 @@ public interface ObjectLocator * dependencies will be injected into the parameters of the constructor and into private fields marked with the * {@link Inject} annotation. There are two cases: constructing a service implementation, and constructing * an arbitrary object. In the former case, many <em>service resources</em> are also available for injection, not - * just dependencies or objects provided via - * {@link MasterObjectProvider#provide(Class, AnnotationProvider, ObjectLocator, boolean)}. + * just dependencies or objects provided via the MasterObjectProvider service. * * @param <T> * @param clazz the type of object to instantiate * @return the instantiated instance * @throws RuntimeException if the autobuild fails - * @see MasterObjectProvider */ <T> T autobuild(Class<T> clazz); /** * Preferred version of {@link #autobuild(Class)} that tracks the operation using - * {@link OperationTracker#invoke(String, Invokable)}. + * {@link org.apache.tapestry5.ioc.OperationTracker#invoke(String, org.apache.tapestry5.ioc.Invokable)}. * * @param <T> - * @param description description used with {@link OperationTracker} + * @param description description used with {@link org.apache.tapestry5.ioc.OperationTracker} * @param clazz the type of object to instantiate * @return the instantiated instance * @throws RuntimeException if the autobuild fails - * @see MasterObjectProvider * @since 5.2.0 */ <T> T autobuild(String description, Class<T> clazz); @@ -127,7 +122,7 @@ public interface ObjectLocator * proxy to prevent service construction cycles, particularly when contributing (directly or indirectly) to the * {@link org.apache.tapestry5.ioc.services.MasterObjectProvider} (which is itself at the heart * of autobuilding). - * <p/> + * * If the class file for the class is a file on the file system (not a file packaged in a JAR), then the proxy will * <em>autoreload</em>: changing the class file will result in the new class being reloaded and re-instantiated * (with dependencies). http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/commons/src/main/java/org/apache/tapestry5/ioc/OrderedConfiguration.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/tapestry5/ioc/OrderedConfiguration.java b/commons/src/main/java/org/apache/tapestry5/ioc/OrderedConfiguration.java index 9151381..4c6958c 100644 --- a/commons/src/main/java/org/apache/tapestry5/ioc/OrderedConfiguration.java +++ b/commons/src/main/java/org/apache/tapestry5/ioc/OrderedConfiguration.java @@ -1,5 +1,3 @@ -// Copyright 2006, 2008, 2009, 2010, 2011 The Apache Software Foundation -// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at @@ -17,14 +15,14 @@ package org.apache.tapestry5.ioc; /** * Object passed into a service contributor method that allows the method provide contributed values to the service's * configuration. - * <p/> + * * A service can <em>collect</em> contributions in three different ways: * <ul> * <li>As an un-ordered collection of values</li> * <li>As an ordered list of values (where each value has a unique id, pre-requisites and post-requisites)</li> * <li>As a map of keys and values * </ul> - * <p/> + * * The service defines the <em>type</em> of contribution, in terms of a base class or service interface. Contributions * must be compatible with the type, or be {@linkplain org.apache.tapestry5.ioc.services.TypeCoercer coercable} to the type. * @@ -37,8 +35,8 @@ public interface OrderedConfiguration<T> * Adds an ordered object to a service's contribution. Each object has an id (which must be unique). Optionally, * pre-requisites (a list of ids that must precede this object) and post-requisites (ids that must follow) can be * provided. - * <p/> - * <p>If no constraints are supplied, then an implicit constraint is supplied: after the previously + * + * If no constraints are supplied, then an implicit constraint is supplied: after the previously * contributed id <em>within the same contribution method</em>. * * @param id a unique id for the object; the id will be fully qualified with the contributing module's id http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/commons/src/main/java/org/apache/tapestry5/ioc/Resource.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/tapestry5/ioc/Resource.java b/commons/src/main/java/org/apache/tapestry5/ioc/Resource.java index b81c1c5..08cad2a 100644 --- a/commons/src/main/java/org/apache/tapestry5/ioc/Resource.java +++ b/commons/src/main/java/org/apache/tapestry5/ioc/Resource.java @@ -21,7 +21,7 @@ import java.util.Locale; * Represents a resource on the server that may be used for server side processing, or may be exposed to the client * side. Generally, this represents an abstraction on top of files on the class path and files stored in the web * application context. - * <p/> + * * Resources are often used as map keys; they should be immutable and should implement hashCode() and equals(). */ public interface Resource @@ -30,7 +30,7 @@ public interface Resource /** * Returns true if the resource exists; if a stream to the content of the file may be opened. A resource exists * if {@link #toURL()} returns a non-null value. Starting in release 5.3.4, the result of this is cached. - * <p/> + * * Starting in 5.4, some "virtual resources", may return true even though {@link #toURL()} returns null. * * @return true if the resource exists, false if it does not @@ -71,7 +71,7 @@ public interface Resource /** * Returns a Resource based on a relative path, relative to the folder containing the resource. Understands the "." * (current folder) and ".." (parent folder) conventions, and treats multiple sequential slashes as a single slash. - * <p/> + * * Virtual resources (resources fabricated at runtime) return themselves. */ Resource forFile(String relativePath); @@ -94,14 +94,14 @@ public interface Resource /** * Returns the file portion of the Resource path, everything that follows the final forward slash. - * <p/> + * * Starting in 5.4, certain kinds of "virtual resources" may return null here. */ String getFile(); /** * Return the path (the combination of folder and file). - * <p/> + * * Starting in 5.4, certain "virtual resources", may return an arbitrary value here. */ String getPath(); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/commons/src/main/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImpl.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImpl.java b/commons/src/main/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImpl.java index 6481384..2b157b7 100644 --- a/commons/src/main/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImpl.java +++ b/commons/src/main/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImpl.java @@ -1,5 +1,3 @@ -// Copyright 2006, 2007, 2008, 2010, 2012 The Apache Software Foundation -// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at @@ -255,11 +253,11 @@ public class TypeCoercerImpl extends LockSupport implements TypeCoercer * Here's the real meat; we do a search of the space to find coercions, or a system of * coercions, that accomplish * the desired coercion. - * <p/> + * * There's <strong>TREMENDOUS</strong> room to improve this algorithm. For example, inheritance lists could be * cached. Further, there's probably more ways to early prune the search. However, even with dozens or perhaps * hundreds of tuples, I suspect the search will still grind to a conclusion quickly. - * <p/> + * * The order of operations should help ensure that the most efficient tuple chain is located. If you think about how * tuples are added to the queue, there are two factors: size (the number of steps in the coercion) and * "class distance" (that is, number of steps up the inheritance hiearchy). All the appropriate 1 step coercions @@ -267,7 +265,7 @@ public class TypeCoercerImpl extends LockSupport implements TypeCoercer * in class distance order. By the time we reach some of those, we'll have begun queueing up the 3 step coercions, and * so forth, until we run out of input tuples we can use to fabricate multi-step compound coercions, or reach a * final response. - * <p/> + * * This does create a good number of short lived temporary objects (the compound tuples), but that's what the GC is * really good at. * http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/commons/src/main/java/org/apache/tapestry5/ioc/internal/util/CollectionFactory.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/tapestry5/ioc/internal/util/CollectionFactory.java b/commons/src/main/java/org/apache/tapestry5/ioc/internal/util/CollectionFactory.java index 6711b1a..f2da320 100644 --- a/commons/src/main/java/org/apache/tapestry5/ioc/internal/util/CollectionFactory.java +++ b/commons/src/main/java/org/apache/tapestry5/ioc/internal/util/CollectionFactory.java @@ -1,5 +1,3 @@ -// Copyright 2006, 2007, 2012 The Apache Software Foundation -// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at @@ -25,14 +23,14 @@ import java.util.concurrent.CopyOnWriteArrayList; /** * Static factory methods to ease the creation of new collection types (when using generics). Most of these method * leverage the compiler's ability to match generic types by return value. Typical usage (with a static import): - * <p/> + * * <pre> * Map<Foo, Bar> map = newMap(); * </pre> - * <p/> - * <p/> + * + * * This is a replacement for: - * <p/> + * * <pre> * Map<Foo, Bar> map = new HashMap<Foo, Bar>(); * </pre> http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/commons/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java b/commons/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java index 1a6dd80..bd834a5 100644 --- a/commons/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java +++ b/commons/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java @@ -1,5 +1,3 @@ -// Copyright 2008, 2010 The Apache Software Foundation -// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at @@ -90,12 +88,12 @@ public class GenericsUtils /** * Resolves the type parameter based on the context of the containingType. - * <p/> + * * {@link java.lang.reflect.TypeVariable} will be unwrapped to the type argument resolved form the class * hierarchy. This may be something other than a simple Class if the type argument is a ParameterizedType for - * instance (e.g. List<E>; List<Map<Long, String>>, E would be returned as a ParameterizedType with the raw + * instance (e.g. {@code List<E>; List<Map<Long, String>>}, E would be returned as a ParameterizedType with the raw * type Map and type arguments Long and String. - * <p/> + * * * @param type * the generic type (ParameterizedType, GenericArrayType, WildcardType, TypeVariable) to be resolved @@ -136,9 +134,9 @@ public class GenericsUtils * Determines if the suspected super type is assignable from the suspected sub type. * * @param suspectedSuperType - * e.g. GenericDAO<Pet, String> + * e.g. {@code GenericDAO<Pet, String>} * @param suspectedSubType - * e.g. PetDAO extends GenericDAO<Pet,String> + * e.g. {@code PetDAO extends GenericDAO<Pet,String>} * @return * true if (sourceType)targetClass is a valid cast */ @@ -241,10 +239,10 @@ public class GenericsUtils /** * Get the class represented by the reflected type. * This method is lossy; You cannot recover the type information from the class that is returned. - * <p/> + * * {@code TypeVariable} the first bound is returned. If your type variable extends multiple interfaces that information * is lost. - * <p/> + * * {@code WildcardType} the first lower bound is returned. If the wildcard is defined with upper bounds * then {@code Object} is returned. * @@ -316,24 +314,24 @@ public class GenericsUtils /** * Method to resolve a TypeVariable to its most * <a href="http://java.sun.com/docs/books/jls/third_edition/html/typesValues.html#112582">reifiable</a> form. - * <p/> - * <p/> + * + * * How to resolve a TypeVariable:<br/> * All of the TypeVariables defined by a generic class will be given a Type by any class that extends it. The Type * given may or may not be reifiable; it may be another TypeVariable for instance. - * <p/> + * * Consider <br/> * <i>class Pair>A,B> { A getA(){...}; ...}</i><br/> * <i>class StringLongPair extends Pair>String, Long> { }</i><br/> - * <p/> + * * To resolve the actual return type of Pair.getA() you must first resolve the TypeVariable "A". * We can do that by first finding the index of "A" in the Pair.class.getTypeParameters() array of TypeVariables. - * <p/> + * * To get to the Type provided by StringLongPair you access the generics information by calling * StringLongPair.class.getGenericSuperclass; this will be a ParameterizedType. ParameterizedType gives you access * to the actual type arguments provided to Pair by StringLongPair. The array is in the same order as the array in * Pair.class.getTypeParameters so you can use the index we discovered earlier to extract the Type; String.class. - * <p/> + * * When extracting Types we only have to consider the superclass hierarchy and not the interfaces implemented by * the class. When a class implements a generic interface it must provide types for the interface and any generic * methods implemented from the interface will be re-defined by the class with its generic type variables. http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/commons/src/main/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearch.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearch.java b/commons/src/main/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearch.java index f1830a7..2e57ea6 100644 --- a/commons/src/main/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearch.java +++ b/commons/src/main/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearch.java @@ -1,5 +1,3 @@ -// Copyright 2006 The Apache Software Foundation -// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at @@ -22,23 +20,23 @@ import java.util.Set; /** * Used to search from a particular class up the inheritance hierarchy of extended classes and implemented interfaces. - * <p/> + * * The search starts with the initial class (provided in the constructor). It progresses up the inheritance chain, but * skips java.lang.Object. - * <p/> + * * Once classes are exhausted, the inheritance hierarchy is searched. This is a breadth-first search, rooted in the * interfaces implemented by the initial class at its super classes. - * <p/> + * * Once all interfaces are exhausted, java.lang.Object is returned (it is always returned last). - * <p/> + * * Two minor tweak to normal inheritance rules: <ul> <li> Normally, the parent class of an <em>object</em> array is * java.lang.Object, which is odd because FooService[] is assignable to Object[]. Thus, we tweak the search so that the * effective super class of FooService[] is Object[]. <li> The "super class" of a primtive type is its <em>wrapper type</em>, * with the exception of void, whose "super class" is left at its normal value (Object.class) </ul> - * <p/> + * * This class implements the {@link Iterable} interface, so it can be used directly in a for loop: <code> for (Class * search : new InheritanceSearch(startClass)) { ... } </code> - * <p/> + * * This class is not thread-safe. */ public class InheritanceSearch implements Iterator<Class>, Iterable<Class> http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/commons/src/main/java/org/apache/tapestry5/ioc/services/ClassPropertyAdapter.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/tapestry5/ioc/services/ClassPropertyAdapter.java b/commons/src/main/java/org/apache/tapestry5/ioc/services/ClassPropertyAdapter.java index 6159ed3..c085957 100644 --- a/commons/src/main/java/org/apache/tapestry5/ioc/services/ClassPropertyAdapter.java +++ b/commons/src/main/java/org/apache/tapestry5/ioc/services/ClassPropertyAdapter.java @@ -1,5 +1,3 @@ -// Copyright 2006, 2007, 2011 The Apache Software Foundation -// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at @@ -19,9 +17,9 @@ import java.util.List; /** * Organizes all {@link org.apache.tapestry5.ioc.services.PropertyAdapter}s for a particular class. - * <p/> + * * Only provides access to <em>simple</em> properties. Indexed properties are ignored. - * <p/> + * * When accessing properties by name, the case of the name is ignored. */ public interface ClassPropertyAdapter http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/commons/src/main/java/org/apache/tapestry5/ioc/services/PropertyAccess.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/tapestry5/ioc/services/PropertyAccess.java b/commons/src/main/java/org/apache/tapestry5/ioc/services/PropertyAccess.java index ae542c5..05a6005 100644 --- a/commons/src/main/java/org/apache/tapestry5/ioc/services/PropertyAccess.java +++ b/commons/src/main/java/org/apache/tapestry5/ioc/services/PropertyAccess.java @@ -1,5 +1,3 @@ -// Copyright 2006, 2010, 2013 The Apache Software Foundation -// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at @@ -18,9 +16,9 @@ import java.lang.annotation.Annotation; /** * A wrapper around the JavaBean Introspector that allows more manageable access to JavaBean properties of objects. - * <p/> + * * Only provides access to <em>simple</em> properties. Indexed properties are ignored. - * <p> + * * Starting in Tapestry 5.2, public fields can now be accessed as if they were properly JavaBean properties. Where there * is a name conflict, the true property will be favored over the field access. */ http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/commons/src/main/java/org/apache/tapestry5/ioc/services/PropertyAdapter.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/tapestry5/ioc/services/PropertyAdapter.java b/commons/src/main/java/org/apache/tapestry5/ioc/services/PropertyAdapter.java index 947535e..0e068c4 100644 --- a/commons/src/main/java/org/apache/tapestry5/ioc/services/PropertyAdapter.java +++ b/commons/src/main/java/org/apache/tapestry5/ioc/services/PropertyAdapter.java @@ -1,5 +1,3 @@ -// Copyright 2006, 2008, 2010, 2011 The Apache Software Foundation -// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at @@ -23,7 +21,7 @@ import java.lang.reflect.Method; * Provides access to a single property within a class. Acts as an {@link org.apache.tapestry5.ioc.AnnotationProvider}; * when searching for annotations, the read method (if present) is checked first, followed by the write method, followed * by the underlying field (when the property name matches the field name). - * <p/> + * * Starting in release 5.2, this property may actually be a public field. In 5.3, it may be a public static field. * * @see org.apache.tapestry5.ioc.services.ClassPropertyAdapter http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/commons/src/main/java/org/apache/tapestry5/ioc/services/TypeCoercer.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/tapestry5/ioc/services/TypeCoercer.java b/commons/src/main/java/org/apache/tapestry5/ioc/services/TypeCoercer.java index ec8eaad..b41c18c 100644 --- a/commons/src/main/java/org/apache/tapestry5/ioc/services/TypeCoercer.java +++ b/commons/src/main/java/org/apache/tapestry5/ioc/services/TypeCoercer.java @@ -1,5 +1,3 @@ -// Copyright 2006, 2007, 2008, 2010, 2011 The Apache Software Foundation -// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at @@ -29,7 +27,7 @@ public interface TypeCoercer * conversion will be to the equivalent wrapper type. In some cases, the TypeCoercer will need to search for an * appropriate coercion, and may even combine existing coercions to form new ones; in those cases, the results of * the search are cached. - * <p/> + * * The TypeCoercer also caches the results of a coercion search. * * @param <S> @@ -47,7 +45,7 @@ public interface TypeCoercer /** * Given a source and target type, computes the coercion that will be used. - * <p> + * * Note: holding the returned coercion past the time when {@linkplain #clearCache() the cache is cleared} can cause * a memory leak, especially in the context of live reloading (wherein holding a reference to a single class make * keep an entire ClassLoader from being reclaimed). http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/commons/src/main/java/org/apache/tapestry5/ioc/util/TimeInterval.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/tapestry5/ioc/util/TimeInterval.java b/commons/src/main/java/org/apache/tapestry5/ioc/util/TimeInterval.java index 01ef99e..dbb1cff 100644 --- a/commons/src/main/java/org/apache/tapestry5/ioc/util/TimeInterval.java +++ b/commons/src/main/java/org/apache/tapestry5/ioc/util/TimeInterval.java @@ -1,5 +1,3 @@ -// Copyright 2007, 2008, 2010, 2011 The Apache Software Foundation -// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at @@ -14,21 +12,21 @@ package org.apache.tapestry5.ioc.util; +import org.apache.tapestry5.ioc.internal.util.CollectionFactory; +import org.apache.tapestry5.ioc.internal.util.InternalCommonsUtils; + import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.tapestry5.ioc.internal.util.CollectionFactory; -import org.apache.tapestry5.ioc.internal.util.InternalCommonsUtils; - /** * Used to represent a period of time, specifically as a configuration value. This is often used to specify timeouts. - * <p/> + * * TimePeriods are parsed from strings. - * <p/> + * * The string specifys a number of terms. The values of all the terms are summed together to form the total time period. * Each term consists of a number followed by a unit. Units (from largest to smallest) are: <dl> <dt>y <dd>year <dt>d - * <dd>day <dt>h <dd>hour <dt>m <dd>minute <dt>s <dd>second <dt>ms <dd>millisecond </dl> <p> Example: "2 h 30 m". By + * <dd>day <dt>h <dd>hour <dt>m <dd>minute <dt>s <dd>second <dt>ms <dd>millisecond </dl> Example: "2 h 30 m". By * convention, terms are specified largest to smallest. A term without a unit is assumed to be milliseconds. Units are * case insensitive ("h" or "H" are treated the same). */ http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/commons/src/main/java/org/apache/tapestry5/services/DataTypeAnalyzer.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/tapestry5/services/DataTypeAnalyzer.java b/commons/src/main/java/org/apache/tapestry5/services/DataTypeAnalyzer.java index ba7e995..39f6ee6 100644 --- a/commons/src/main/java/org/apache/tapestry5/services/DataTypeAnalyzer.java +++ b/commons/src/main/java/org/apache/tapestry5/services/DataTypeAnalyzer.java @@ -1,5 +1,3 @@ -// Copyright 2007, 2008, 2011 The Apache Software Foundation -// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at @@ -23,12 +21,12 @@ import org.apache.tapestry5.ioc.services.PropertyAdapter; * {@link PropertyAdapter}). The data type is a string used to determine what kind of interface to use for displaying * the value of the property, or what kind of interface to use for editing the value of the property. Common property * types are "text", "enum", "checkbox", but the list is extensible. - * <p/> + * * Different strategies for identifying the data type are encapsulated in the DataTypeAnalyzer service, forming a * chain of command. - * <p/> + * * The DefaultDataTypeAnalyzer service maps property types to data type names. - * <p/> + * * The DataTypeAnalyzer service is an extensible {@linkplain org.apache.tapestry5.ioc.services.ChainBuilder chain of * command}), that (by default) includes {@link org.apache.tapestry5.internal.services.AnnotationDataTypeAnalyzer} and * the {@link org.apache.tapestry5.internal.services.DefaultDataTypeAnalyzer} service (ordered last). It uses an ordered configuration. http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/commons/src/main/java/org/apache/tapestry5/services/InvalidationEventHub.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/tapestry5/services/InvalidationEventHub.java b/commons/src/main/java/org/apache/tapestry5/services/InvalidationEventHub.java index 77b028e..3bea4f5 100644 --- a/commons/src/main/java/org/apache/tapestry5/services/InvalidationEventHub.java +++ b/commons/src/main/java/org/apache/tapestry5/services/InvalidationEventHub.java @@ -1,5 +1,3 @@ -// Copyright 2006, 2007, 2008, 2011, 2012 The Apache Software Foundation -// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at @@ -29,7 +27,7 @@ import java.util.Map; * <dt>component classes * <dd>{@link org.apache.tapestry5.services.ComponentClasses} marker annotation * </dl> - * <p/> + * * Starting in Tapestry 5.3, these services are disabled in production (it does nothing). * * @since 5.1.0.0 http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/commons/src/main/java/org/apache/tapestry5/util/StringToEnumCoercion.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/tapestry5/util/StringToEnumCoercion.java b/commons/src/main/java/org/apache/tapestry5/util/StringToEnumCoercion.java index e2a4eb1..9a1a37f 100644 --- a/commons/src/main/java/org/apache/tapestry5/util/StringToEnumCoercion.java +++ b/commons/src/main/java/org/apache/tapestry5/util/StringToEnumCoercion.java @@ -1,5 +1,3 @@ -// Copyright 2007, 2008, 2010, 2011 The Apache Software Foundation -// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at @@ -14,19 +12,19 @@ package org.apache.tapestry5.util; -import java.util.Map; - import org.apache.tapestry5.ioc.internal.util.CollectionFactory; import org.apache.tapestry5.ioc.internal.util.InternalCommonsUtils; import org.apache.tapestry5.ioc.services.Coercion; import org.apache.tapestry5.ioc.util.AvailableValues; import org.apache.tapestry5.ioc.util.UnknownValueException; +import java.util.Map; + /** * A {@link org.apache.tapestry5.ioc.services.Coercion} for converting strings into an instance of a particular * enumerated type. The {@link Enum#name() name} is used as the key to identify the enum instance, in a case-insensitive * fashion. - * <p> + * * Moved from tapestry-core to tapestry-ioc in release 5.3, but kept in same package for compatibility. * Moved tapestry-ioc to commons in release 5.4, but kept in same package for compatibility. * http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/MethodWriter.java ---------------------------------------------------------------------- diff --git a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/MethodWriter.java b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/MethodWriter.java index 3128ff6..7b9a62a 100644 --- a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/MethodWriter.java +++ b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/MethodWriter.java @@ -2363,7 +2363,7 @@ class MethodWriter extends MethodVisitor { * 32765. This, in turn, may require to increase the size of another jump * instruction, and so on... All these operations are handled automatically * by this method. - * <p> + * * <i>This method must be called after all the method that is being built * has been visited</i>. In particular, the {@link Label Label} objects used * to construct the method are no longer valid after this method has been @@ -2843,7 +2843,7 @@ class MethodWriter extends MethodVisitor { /** * Computes the future value of a bytecode offset. - * <p> + * * Note: it is possible to have several entries for the same instruction in * the <tt>indexes</tt> and <tt>sizes</tt>: two entries (index=a,size=b) and * (index=a,size=b') are equivalent to a single entry (index=a,size=b+b'). http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/commons/AdviceAdapter.java ---------------------------------------------------------------------- diff --git a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/commons/AdviceAdapter.java b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/commons/AdviceAdapter.java index a53995b..8fa6bbd 100644 --- a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/commons/AdviceAdapter.java +++ b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/commons/AdviceAdapter.java @@ -29,21 +29,17 @@ */ package org.apache.tapestry5.internal.plastic.asm.commons; +import org.apache.tapestry5.internal.plastic.asm.*; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.tapestry5.internal.plastic.asm.Handle; -import org.apache.tapestry5.internal.plastic.asm.Label; -import org.apache.tapestry5.internal.plastic.asm.MethodVisitor; -import org.apache.tapestry5.internal.plastic.asm.Opcodes; -import org.apache.tapestry5.internal.plastic.asm.Type; - /** * A {@link org.apache.tapestry5.internal.plastic.asm.MethodVisitor} to insert before, after and around * advices in methods and constructors. - * <p> + * * The behavior for constructors is like this: * <ol> * http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/util/ASMifier.java ---------------------------------------------------------------------- diff --git a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/util/ASMifier.java b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/util/ASMifier.java index 34829b0..5b37a29 100644 --- a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/util/ASMifier.java +++ b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/util/ASMifier.java @@ -29,19 +29,13 @@ */ package org.apache.tapestry5.internal.plastic.asm.util; +import org.apache.tapestry5.internal.plastic.asm.*; + import java.io.FileInputStream; import java.io.PrintWriter; import java.util.HashMap; import java.util.Map; -import org.apache.tapestry5.internal.plastic.asm.Attribute; -import org.apache.tapestry5.internal.plastic.asm.ClassReader; -import org.apache.tapestry5.internal.plastic.asm.Handle; -import org.apache.tapestry5.internal.plastic.asm.Label; -import org.apache.tapestry5.internal.plastic.asm.Opcodes; -import org.apache.tapestry5.internal.plastic.asm.Type; -import org.apache.tapestry5.internal.plastic.asm.TypePath; - /** * A {@link Printer} that prints the ASM code to generate the classes if visits. * @@ -116,7 +110,7 @@ public class ASMifier extends Printer { /** * Prints the ASM source code to generate the given class to the standard * output. - * <p> + * * Usage: ASMifier [-debug] <binary class name or class file name> * * @param args http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/util/CheckClassAdapter.java ---------------------------------------------------------------------- diff --git a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/util/CheckClassAdapter.java b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/util/CheckClassAdapter.java index 294fd46..680f8a9 100644 --- a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/util/CheckClassAdapter.java +++ b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/util/CheckClassAdapter.java @@ -29,25 +29,7 @@ */ package org.apache.tapestry5.internal.plastic.asm.util; -import java.io.FileInputStream; -import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import org.apache.tapestry5.internal.plastic.asm.AnnotationVisitor; -import org.apache.tapestry5.internal.plastic.asm.Attribute; -import org.apache.tapestry5.internal.plastic.asm.ClassReader; -import org.apache.tapestry5.internal.plastic.asm.ClassVisitor; -import org.apache.tapestry5.internal.plastic.asm.FieldVisitor; -import org.apache.tapestry5.internal.plastic.asm.Label; -import org.apache.tapestry5.internal.plastic.asm.MethodVisitor; -import org.apache.tapestry5.internal.plastic.asm.Opcodes; -import org.apache.tapestry5.internal.plastic.asm.Type; -import org.apache.tapestry5.internal.plastic.asm.TypePath; -import org.apache.tapestry5.internal.plastic.asm.TypeReference; +import org.apache.tapestry5.internal.plastic.asm.*; import org.apache.tapestry5.internal.plastic.asm.tree.ClassNode; import org.apache.tapestry5.internal.plastic.asm.tree.MethodNode; import org.apache.tapestry5.internal.plastic.asm.tree.analysis.Analyzer; @@ -55,6 +37,10 @@ import org.apache.tapestry5.internal.plastic.asm.tree.analysis.BasicValue; import org.apache.tapestry5.internal.plastic.asm.tree.analysis.Frame; import org.apache.tapestry5.internal.plastic.asm.tree.analysis.SimpleVerifier; +import java.io.FileInputStream; +import java.io.PrintWriter; +import java.util.*; + /** * A {@link ClassVisitor} that checks that its methods are properly used. More * precisely this class adapter checks each method call individually, based @@ -63,7 +49,7 @@ import org.apache.tapestry5.internal.plastic.asm.tree.analysis.SimpleVerifier; * <tt>visitField(ACC_PUBLIC, "i", "I", null)</tt> <tt>visitField(ACC_PUBLIC, * "i", "D", null)</tt> will <i>not</i> be detected by this class adapter. * - * <p> + * * <code>CheckClassAdapter</code> can be also used to verify bytecode * transformations in order to make sure transformed bytecode is sane. For * example: @@ -86,7 +72,7 @@ import org.apache.tapestry5.internal.plastic.asm.tree.analysis.SimpleVerifier; * JVM does, but it run data flow analysis for the code of each method and * checks that expectations are met for each method instruction. * - * <p> + * * If method bytecode has errors, assertion text will show the erroneous * instruction number and dump of the failed method with information about * locals and stack slot for each instruction. For example (format is - @@ -117,7 +103,7 @@ import org.apache.tapestry5.internal.plastic.asm.tree.analysis.SimpleVerifier; * initialized. You can also see that at the beginning of the method (code * inserted by the transformation) variable 2 is initialized. * - * <p> + * * Note that when used like that, <code>CheckClassAdapter.verify()</code> can * trigger additional class loading, because it is using * <code>SimpleVerifier</code>. @@ -164,7 +150,7 @@ public class CheckClassAdapter extends ClassVisitor { /** * Checks a given class. - * <p> + * * Usage: CheckClassAdapter <binary class name or class file name> * * @param args http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/util/Textifier.java ---------------------------------------------------------------------- diff --git a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/util/Textifier.java b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/util/Textifier.java index 854fe7c..feae92d 100644 --- a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/util/Textifier.java +++ b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/util/Textifier.java @@ -29,21 +29,14 @@ */ package org.apache.tapestry5.internal.plastic.asm.util; +import org.apache.tapestry5.internal.plastic.asm.*; +import org.apache.tapestry5.internal.plastic.asm.signature.SignatureReader; + import java.io.FileInputStream; import java.io.PrintWriter; import java.util.HashMap; import java.util.Map; -import org.apache.tapestry5.internal.plastic.asm.Attribute; -import org.apache.tapestry5.internal.plastic.asm.ClassReader; -import org.apache.tapestry5.internal.plastic.asm.Handle; -import org.apache.tapestry5.internal.plastic.asm.Label; -import org.apache.tapestry5.internal.plastic.asm.Opcodes; -import org.apache.tapestry5.internal.plastic.asm.Type; -import org.apache.tapestry5.internal.plastic.asm.TypePath; -import org.apache.tapestry5.internal.plastic.asm.TypeReference; -import org.apache.tapestry5.internal.plastic.asm.signature.SignatureReader; - /** * A {@link Printer} that prints a disassembled view of the classes it visits. * @@ -172,7 +165,7 @@ public class Textifier extends Printer { /** * Prints a disassembled view of the given class to the standard output. - * <p> + * * Usage: Textifier [-debug] <binary class name or class file name > * * @param args http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/util/TraceClassVisitor.java ---------------------------------------------------------------------- diff --git a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/util/TraceClassVisitor.java b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/util/TraceClassVisitor.java index 7c6a775..c6f79ac 100644 --- a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/util/TraceClassVisitor.java +++ b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/util/TraceClassVisitor.java @@ -29,24 +29,18 @@ */ package org.apache.tapestry5.internal.plastic.asm.util; -import java.io.PrintWriter; +import org.apache.tapestry5.internal.plastic.asm.*; -import org.apache.tapestry5.internal.plastic.asm.AnnotationVisitor; -import org.apache.tapestry5.internal.plastic.asm.Attribute; -import org.apache.tapestry5.internal.plastic.asm.ClassVisitor; -import org.apache.tapestry5.internal.plastic.asm.FieldVisitor; -import org.apache.tapestry5.internal.plastic.asm.MethodVisitor; -import org.apache.tapestry5.internal.plastic.asm.Opcodes; -import org.apache.tapestry5.internal.plastic.asm.TypePath; +import java.io.PrintWriter; /** * A {@link ClassVisitor} that prints the classes it visits with a * {@link Printer}. This class visitor can be used in the middle of a class * visitor chain to trace the class that is visited at a given point in this * chain. This may be useful for debugging purposes. - * <p> + * * The trace printed when visiting the <tt>Hello</tt> class is the following: - * <p> + * * <blockquote> * * <pre> @@ -64,7 +58,7 @@ import org.apache.tapestry5.internal.plastic.asm.TypePath; * </pre> * * </blockquote> where <tt>Hello</tt> is defined by: - * <p> + * * <blockquote> * * <pre> http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/Processor.java ---------------------------------------------------------------------- diff --git a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/Processor.java b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/Processor.java index 6d5715c..eb26b11 100644 --- a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/Processor.java +++ b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/Processor.java @@ -29,47 +29,29 @@ */ package org.apache.tapestry5.internal.plastic.asm.xml; -import java.io.BufferedOutputStream; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.io.Writer; -import java.util.zip.ZipEntry; -import java.util.zip.ZipInputStream; -import java.util.zip.ZipOutputStream; - -import javax.xml.transform.Source; -import javax.xml.transform.Templates; -import javax.xml.transform.TransformerConfigurationException; -import javax.xml.transform.TransformerException; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.sax.SAXResult; -import javax.xml.transform.sax.SAXSource; -import javax.xml.transform.sax.SAXTransformerFactory; -import javax.xml.transform.sax.TransformerHandler; -import javax.xml.transform.stream.StreamSource; - import org.apache.tapestry5.internal.plastic.asm.ClassReader; import org.apache.tapestry5.internal.plastic.asm.ClassWriter; -import org.xml.sax.Attributes; -import org.xml.sax.ContentHandler; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; +import org.xml.sax.*; import org.xml.sax.ext.LexicalHandler; import org.xml.sax.helpers.AttributesImpl; import org.xml.sax.helpers.DefaultHandler; import org.xml.sax.helpers.XMLReaderFactory; +import javax.xml.transform.*; +import javax.xml.transform.sax.SAXResult; +import javax.xml.transform.sax.SAXSource; +import javax.xml.transform.sax.SAXTransformerFactory; +import javax.xml.transform.sax.TransformerHandler; +import javax.xml.transform.stream.StreamSource; +import java.io.*; +import java.util.zip.ZipEntry; +import java.util.zip.ZipInputStream; +import java.util.zip.ZipOutputStream; + /** * Processor is a command line tool that can be used for bytecode waving * directed by XSL transformation. - * <p> + * * In order to use a concrete XSLT engine, system property * <tt>javax.xml.transform.TransformerFactory</tt> must be set to one of the * following values. @@ -791,7 +773,7 @@ public class Processor { * {@link java.net.ContentHandlerFactory ContentHandlerFactory}. This is * useful for running XSLT engine against large XML document that will * hardly fit into the memory all together. - * <p> + * * TODO use complete path for subdocumentRoot */ private static final class InputSlicingHandler extends DefaultHandler { @@ -895,7 +877,7 @@ public class Processor { * useful for running XSLT engine against large XML document that will * hardly fit into the memory all together. * - * <p> + * * TODO use complete path for subdocumentRoot */ private static final class OutputSlicingHandler extends DefaultHandler { http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticInternalUtils.java ---------------------------------------------------------------------- diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticInternalUtils.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticInternalUtils.java index 8cc9191..aae8340 100644 --- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticInternalUtils.java +++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticInternalUtils.java @@ -1,5 +1,3 @@ -// Copyright 2011, 2012 The Apache Software Foundation -// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at @@ -14,31 +12,7 @@ package org.apache.tapestry5.internal.plastic; -import java.io.ByteArrayOutputStream; -import java.io.Closeable; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.lang.reflect.Array; -import java.net.URISyntaxException; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.apache.tapestry5.internal.plastic.asm.ClassReader; -import org.apache.tapestry5.internal.plastic.asm.ClassVisitor; -import org.apache.tapestry5.internal.plastic.asm.MethodVisitor; -import org.apache.tapestry5.internal.plastic.asm.Opcodes; -import org.apache.tapestry5.internal.plastic.asm.Type; +import org.apache.tapestry5.internal.plastic.asm.*; import org.apache.tapestry5.internal.plastic.asm.commons.JSRInlinerAdapter; import org.apache.tapestry5.internal.plastic.asm.tree.ClassNode; import org.apache.tapestry5.internal.plastic.asm.tree.MethodNode; @@ -46,6 +20,14 @@ import org.apache.tapestry5.internal.plastic.asm.util.TraceClassVisitor; import org.apache.tapestry5.plastic.InstanceContext; import org.apache.tapestry5.plastic.MethodDescription; +import java.io.*; +import java.lang.reflect.Array; +import java.net.URISyntaxException; +import java.net.URL; +import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + @SuppressWarnings("rawtypes") public class PlasticInternalUtils { @@ -154,7 +136,7 @@ public class PlasticInternalUtils * <li>boolean --> Z * <li> * <li>java.lang.Integer --> Ljava/lang/Integer;</li> - * <li>char[] -->> [C</li> + * <li>char[] --> [C</li> * <li>java.lang.String[][] --> [[java/lang/String; * </ul> */ http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/plastic/src/main/java/org/apache/tapestry5/plastic/FieldConduit.java ---------------------------------------------------------------------- diff --git a/plastic/src/main/java/org/apache/tapestry5/plastic/FieldConduit.java b/plastic/src/main/java/org/apache/tapestry5/plastic/FieldConduit.java index 496f00d..7d7d860 100644 --- a/plastic/src/main/java/org/apache/tapestry5/plastic/FieldConduit.java +++ b/plastic/src/main/java/org/apache/tapestry5/plastic/FieldConduit.java @@ -1,5 +1,3 @@ -// Copyright 2011 The Apache Software Foundation -// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at @@ -18,9 +16,9 @@ package org.apache.tapestry5.plastic; * A {@link FieldConduit} is an object that effectively <em>replaces</em> the field in the instantiated object. * All reads and writes of the field are replaced with invocations on the conduit. Once a field's access is replaced * with a conduit, the field itself is no longer used. The conduit will even see initializations of the field. - * <p> + * * In Aspect Oriented Programming terms, a FieldConduit allows you to advise read and write access to the field. - * <p> + * * If a field has both a FieldConduit and a {@link FieldHandle}, then the methods of the FieldHandle will be connected * to the methods of the FieldConduit. */ http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/plastic/src/main/java/org/apache/tapestry5/plastic/InstructionBuilder.java ---------------------------------------------------------------------- diff --git a/plastic/src/main/java/org/apache/tapestry5/plastic/InstructionBuilder.java b/plastic/src/main/java/org/apache/tapestry5/plastic/InstructionBuilder.java index 7c57edb..97a4f17 100644 --- a/plastic/src/main/java/org/apache/tapestry5/plastic/InstructionBuilder.java +++ b/plastic/src/main/java/org/apache/tapestry5/plastic/InstructionBuilder.java @@ -1,5 +1,3 @@ -// Copyright 2011 The Apache Software Foundation -// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at @@ -21,9 +19,9 @@ import java.lang.reflect.Method; * created with a friendlier API that focuses on Java type names (names as they would appear in Java source) rather than * JVM descriptors or internal names. In some limited cases, types may be specified as Java Class instances as well. * In addition, there is good support for primitive type boxing and unboxing. - * <p/> + * * Most methods return the same instance of InstructionBuilder, allowing for a "fluid" API. - * <p/> + * * More complex functionality, such as {@linkplain #startTryCatch(TryCatchCallback) * try/catch blocks}, is more like a DSL (domain specific language), and is based on callbacks. This looks better in * Groovy and will be more reasonable once JDK 1.8 closures are available; in the meantime, it means some deeply nested @@ -433,7 +431,7 @@ public interface InstructionBuilder * Simplified version of {@link #when(Condition, WhenCallback)} that * simply executes the callback code when the condition is true and does nothing * if the condition is false (the more general case). - * <p/> + * * The testing opcodes all pop the value off the stack, so this is usually preceded by {@link #dupe(int) dupe(0)}. * * @param condition to evaluate http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/plastic/src/main/java/org/apache/tapestry5/plastic/MethodDescription.java ---------------------------------------------------------------------- diff --git a/plastic/src/main/java/org/apache/tapestry5/plastic/MethodDescription.java b/plastic/src/main/java/org/apache/tapestry5/plastic/MethodDescription.java index b20d4b8..66daaeb 100644 --- a/plastic/src/main/java/org/apache/tapestry5/plastic/MethodDescription.java +++ b/plastic/src/main/java/org/apache/tapestry5/plastic/MethodDescription.java @@ -1,5 +1,3 @@ -// Copyright 2011 The Apache Software Foundation -// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at @@ -14,26 +12,26 @@ package org.apache.tapestry5.plastic; +import org.apache.tapestry5.internal.plastic.PlasticInternalUtils; + import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.Arrays; -import org.apache.tapestry5.internal.plastic.PlasticInternalUtils; - /** * Describes a {@link PlasticMethod} in terms of a method name, a set of modifiers * (public, private, static, final, etc.), a return type, types of method arguments, * and types of checked exceptions. Types are represented as Java source names: * either names of primitives ("void", "byte", "long") or fully qualified class names ("java.lang.Object", * "java.lang.Runnable"). ASM refers to this as "class name". - * <p> + * * MethodDescriptions are immutable, and properly implement equals() and hashCode(); they are often used as keys in * Maps. - * <p> + * * The natural sort order for a MethodDescription is ascending order by method name, then descending order by number of * parameters (for the same name). Sort order is not currently specified for overrides of the same method with the same * number of parameters. - * <p> + * * TODO: Handling generic types. */ public class MethodDescription implements Comparable<MethodDescription> http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84053397/plastic/src/main/java/org/apache/tapestry5/plastic/MethodInvocation.java ---------------------------------------------------------------------- diff --git a/plastic/src/main/java/org/apache/tapestry5/plastic/MethodInvocation.java b/plastic/src/main/java/org/apache/tapestry5/plastic/MethodInvocation.java index a7a9ba1..41020a0 100644 --- a/plastic/src/main/java/org/apache/tapestry5/plastic/MethodInvocation.java +++ b/plastic/src/main/java/org/apache/tapestry5/plastic/MethodInvocation.java @@ -1,5 +1,3 @@ -// Copyright 2011 The Apache Software Foundation -// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at @@ -43,7 +41,7 @@ public interface MethodInvocation extends MethodInvocationResult, AnnotationAcce * Overrides the return value of the method. The value provided will be cast to the actual return type * (or, if the return type is a primitive value, the value will be cast to the corresponding wrapper type and then * converted to a primitive). - * <p> + * * Overriding the return value clears any checked exception. * * @param returnValue