This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git
from fe49781a3 Merge pull request #1002 from apache/7.0.x/WW-5411-delete-deprecated add 35d9c0b41 WW-5411 General code clean up using modern language features add 5cd03aa02 Merge pull request #1003 from apache/7.0.x/WW-5411-delete-deprecated-2 No new revisions were added by this update. Summary of changes: .../showcase/application/TestDataProvider.java | 108 +++++------ .../main/java/com/opensymphony/xwork2/Action.java | 12 +- .../com/opensymphony/xwork2/ActionChainResult.java | 3 +- .../opensymphony/xwork2/ActionEventListener.java | 12 +- .../opensymphony/xwork2/CompositeTextProvider.java | 26 ++- .../xwork2/DefaultActionInvocation.java | 19 +- .../opensymphony/xwork2/DefaultActionProxy.java | 6 +- .../xwork2/DefaultActionProxyFactory.java | 16 +- .../opensymphony/xwork2/DefaultTextProvider.java | 26 ++- .../xwork2/DefaultUnknownHandlerManager.java | 2 +- .../xwork2/StrutsTextProviderFactory.java | 18 +- .../com/opensymphony/xwork2/XWorkTestCase.java | 3 +- .../xwork2/config/FileManagerFactoryProvider.java | 6 +- .../xwork2/config/FileManagerProvider.java | 8 +- .../xwork2/config/entities/ActionConfig.java | 41 ++-- .../xwork2/config/entities/AllowedMethods.java | 8 +- .../config/entities/ExceptionMappingConfig.java | 16 +- .../xwork2/config/entities/InterceptorConfig.java | 15 +- .../xwork2/config/entities/InterceptorMapping.java | 9 +- .../config/entities/InterceptorStackConfig.java | 13 +- .../xwork2/config/entities/PackageConfig.java | 44 +++-- .../xwork2/config/entities/Parameterizable.java | 2 +- .../xwork2/config/entities/ResultConfig.java | 15 +- .../xwork2/config/entities/ResultTypeConfig.java | 9 +- .../xwork2/config/impl/ActionConfigMatcher.java | 15 +- .../xwork2/config/impl/DefaultConfiguration.java | 2 + .../config/impl/LocatableConstantFactory.java | 10 +- .../xwork2/config/impl/LocatableFactory.java | 27 +-- .../xwork2/config/impl/MockConfiguration.java | 27 ++- .../xwork2/config/impl/NamespaceMatch.java | 4 +- .../xwork2/config/providers/CycleDetector.java | 8 +- .../xwork2/config/providers/DirectedGraph.java | 17 +- .../config/providers/InterceptorBuilder.java | 26 +-- .../config/providers/XmlConfigurationProvider.java | 3 +- .../providers/XmlDocConfigurationProvider.java | 18 +- .../xwork2/config/providers/XmlHelper.java | 2 +- .../xwork2/conversion/ObjectTypeDeterminer.java | 14 +- .../xwork2/conversion/impl/DateConverter.java | 36 ++-- .../impl/DefaultObjectTypeDeterminer.java | 11 +- .../conversion/impl/DefaultTypeConverter.java | 73 +++---- .../xwork2/conversion/impl/NumberConverter.java | 21 +-- .../xwork2/conversion/impl/StringConverter.java | 6 +- .../conversion/impl/XWorkBasicConverter.java | 17 +- .../xwork2/conversion/impl/XWorkConverter.java | 56 +++--- .../xwork2/conversion/impl/XWorkList.java | 8 +- .../xwork2/factory/DefaultInterceptorFactory.java | 5 +- .../factory/DefaultUnknownHandlerFactory.java | 1 + .../xwork2/inject/ConstructionContext.java | 150 +++++++-------- .../xwork2/inject/ContainerBuilder.java | 32 ++-- .../opensymphony/xwork2/inject/ContainerImpl.java | 28 +-- .../xwork2/inject/ExternalContext.java | 14 +- .../com/opensymphony/xwork2/inject/Factory.java | 10 +- .../xwork2/inject/InitializableFactory.java | 4 +- .../com/opensymphony/xwork2/inject/Inject.java | 37 ++-- .../xwork2/inject/InternalContext.java | 82 ++++---- .../xwork2/inject/InternalFactory.java | 10 +- .../java/com/opensymphony/xwork2/inject/Key.java | 5 +- .../java/com/opensymphony/xwork2/inject/Scope.java | 33 ++-- .../com/opensymphony/xwork2/inject/Scoped.java | 19 +- .../xwork2/inject/util/ReferenceCache.java | 16 +- .../xwork2/inject/util/ReferenceMap.java | 58 +++--- .../xwork2/inject/util/ReferenceType.java | 2 +- .../xwork2/interceptor/AbstractInterceptor.java | 3 + .../xwork2/interceptor/AliasInterceptor.java | 3 +- .../xwork2/interceptor/ChainingInterceptor.java | 15 +- .../interceptor/ConversionErrorInterceptor.java | 17 +- .../interceptor/DefaultWorkflowInterceptor.java | 8 +- .../xwork2/interceptor/ExceptionHolder.java | 8 +- .../interceptor/ExceptionMappingInterceptor.java | 9 +- .../xwork2/interceptor/LoggingInterceptor.java | 2 +- .../interceptor/MethodFilterInterceptorUtil.java | 48 +++-- .../xwork2/interceptor/ModelDrivenInterceptor.java | 5 +- .../interceptor/PrefixMethodInvocationUtil.java | 209 ++++++++++----------- .../xwork2/interceptor/PrepareInterceptor.java | 4 +- .../interceptor/ScopedModelDrivenInterceptor.java | 27 ++- .../xwork2/interceptor/WithLazyParams.java | 7 +- .../annotations/AnnotationWorkflowInterceptor.java | 51 ++--- .../xwork2/ognl/BeanInfoCacheFactory.java | 2 +- .../com/opensymphony/xwork2/ognl/OgnlLRUCache.java | 2 +- .../xwork2/ognl/OgnlNullHandlerWrapper.java | 6 +- .../xwork2/ognl/OgnlReflectionContextFactory.java | 1 + .../xwork2/ognl/OgnlReflectionProvider.java | 19 +- .../xwork2/ognl/OgnlTypeConverterWrapper.java | 8 +- .../opensymphony/xwork2/ognl/OgnlValueStack.java | 21 +++ .../xwork2/ognl/XWorkTypeConverterWrapper.java | 8 +- .../xwork2/ognl/accessor/CompoundRootAccessor.java | 3 +- .../ognl/accessor/ObjectProxyPropertyAccessor.java | 8 +- .../accessor/XWorkCollectionPropertyAccessor.java | 30 +-- .../ognl/accessor/XWorkListPropertyAccessor.java | 15 +- .../ognl/accessor/XWorkMapPropertyAccessor.java | 12 +- .../xwork2/ognl/accessor/XWorkMethodAccessor.java | 18 +- .../ognl/accessor/XWorkObjectPropertyAccessor.java | 3 +- .../security/DefaultAcceptedPatternsChecker.java | 2 +- .../xwork2/test/StubConfigurationProvider.java | 5 + .../xwork2/util/AbstractLocalizedTextProvider.java | 36 ++-- .../opensymphony/xwork2/util/ClassLoaderUtil.java | 17 +- .../opensymphony/xwork2/util/ClassPathFinder.java | 8 +- .../com/opensymphony/xwork2/util/CompoundRoot.java | 4 +- .../com/opensymphony/xwork2/util/DebugUtils.java | 6 +- .../com/opensymphony/xwork2/util/DomHelper.java | 4 +- .../com/opensymphony/xwork2/util/Evaluated.java | 2 +- .../opensymphony/xwork2/util/OgnlTextParser.java | 4 +- .../opensymphony/xwork2/util/PropertiesReader.java | 18 +- .../com/opensymphony/xwork2/util/ResolverUtil.java | 100 +++++----- .../opensymphony/xwork2/util/TextParseUtil.java | 19 +- .../opensymphony/xwork2/util/WildcardHelper.java | 17 -- .../util/classloader/AbstractResourceStore.java | 2 + .../xwork2/util/classloader/FileResourceStore.java | 1 + .../xwork2/util/classloader/JarResourceStore.java | 7 +- .../util/classloader/ReloadingClassLoader.java | 7 + .../util/classloader/ResourceStoreClassLoader.java | 4 +- .../xwork2/util/finder/ClassLoaderInterface.java | 12 +- .../util/finder/ClassLoaderInterfaceDelegate.java | 7 +- .../xwork2/util/finder/ResourceFinder.java | 69 ++++--- .../com/opensymphony/xwork2/util/finder/Test.java | 4 +- .../opensymphony/xwork2/util/finder/UrlSet.java | 12 +- .../xwork2/util/fs/DefaultFileManager.java | 17 +- .../xwork2/util/fs/DefaultFileManagerFactory.java | 14 +- .../opensymphony/xwork2/util/fs/FileRevision.java | 5 +- .../xwork2/util/fs/JarEntryRevision.java | 11 +- .../xwork2/util/fs/StrutsJarURLConnection.java | 36 ++-- .../xwork2/util/location/Locatable.java | 4 +- .../xwork2/util/location/LocatableProperties.java | 1 - .../opensymphony/xwork2/util/location/Located.java | 11 +- .../xwork2/util/location/Location.java | 22 +-- .../xwork2/util/location/LocationImpl.java | 7 +- .../xwork2/util/location/LocationUtils.java | 111 +++++------ .../util/reflection/ReflectionContextState.java | 60 +++--- .../AnnotationValidationConfigurationBuilder.java | 133 +++++++------ .../xwork2/validator/DefaultValidatorFactory.java | 18 +- .../validator/DefaultValidatorFileParser.java | 42 +++-- .../validator/DelegatingValidatorContext.java | 14 +- .../xwork2/validator/ValidatorConfig.java | 28 +-- .../ConditionalVisitorFieldValidator.java | 4 +- .../validators/ConversionErrorFieldValidator.java | 9 +- .../validators/DoubleRangeFieldValidator.java | 2 +- .../validator/validators/ExpressionValidator.java | 4 +- .../validators/FieldExpressionValidator.java | 8 +- .../validators/FieldValidatorSupport.java | 2 + .../validator/validators/RegexFieldValidator.java | 8 +- ...pulateConversionErrorFieldValidatorSupport.java | 20 +- .../validators/RequiredFieldValidator.java | 14 +- .../validators/RequiredStringValidator.java | 13 +- .../xwork2/validator/validators/URLValidator.java | 10 +- .../validator/validators/ValidatorSupport.java | 8 +- .../validators/VisitorFieldValidator.java | 15 +- .../main/java/org/apache/struts2/RequestUtils.java | 8 +- .../java/org/apache/struts2/StrutsException.java | 6 +- .../apache/struts2/components/ActionComponent.java | 13 +- .../java/org/apache/struts2/components/Anchor.java | 5 +- .../apache/struts2/components/AppendIterator.java | 10 +- .../org/apache/struts2/components/ComboBox.java | 12 +- .../struts2/components/ComponentUrlProvider.java | 49 ++++- .../apache/struts2/components/DateTextField.java | 11 +- .../java/org/apache/struts2/components/Debug.java | 20 +- .../org/apache/struts2/components/FieldError.java | 8 +- .../java/org/apache/struts2/components/File.java | 7 +- .../java/org/apache/struts2/components/Form.java | 19 +- .../org/apache/struts2/components/FormButton.java | 12 +- .../java/org/apache/struts2/components/If.java | 7 +- .../org/apache/struts2/components/Include.java | 60 +++--- .../struts2/components/InputTransferSelect.java | 6 +- .../struts2/components/IteratorComponent.java | 10 +- .../java/org/apache/struts2/components/Label.java | 8 +- .../org/apache/struts2/components/ListUIBean.java | 6 +- .../java/org/apache/struts2/components/Number.java | 8 +- .../org/apache/struts2/components/OptGroup.java | 22 +-- .../struts2/components/OptionTransferSelect.java | 8 +- .../org/apache/struts2/components/Property.java | 2 +- .../java/org/apache/struts2/components/Radio.java | 4 +- .../java/org/apache/struts2/components/Set.java | 7 +- .../java/org/apache/struts2/components/Submit.java | 3 - .../java/org/apache/struts2/components/UIBean.java | 7 +- .../java/org/apache/struts2/components/URL.java | 6 +- .../apache/struts2/components/UpDownSelect.java | 8 +- .../template/FreemarkerTemplateEngine.java | 10 +- .../components/template/JspTemplateEngine.java | 6 +- .../struts2/components/template/Template.java | 11 +- .../components/template/TemplateEngineManager.java | 28 ++- .../struts2/config/DefaultPropertiesProvider.java | 8 +- .../java/org/apache/struts2/config/NullResult.java | 1 + .../config/PropertiesConfigurationProvider.java | 5 + .../apache/struts2/config/PropertiesSettings.java | 10 +- .../config/StrutsJavaConfigurationProvider.java | 27 ++- .../config/StrutsXmlConfigurationProvider.java | 26 +-- .../conversion/StrutsTypeConverterHolder.java | 19 +- .../struts2/conversion/UploadedFileConverter.java | 3 +- .../apache/struts2/dispatcher/ApplicationMap.java | 6 +- .../apache/struts2/dispatcher/AttributeMap.java | 5 +- .../struts2/dispatcher/DefaultActionSupport.java | 5 +- .../dispatcher/DefaultDispatcherErrorHandler.java | 11 +- .../dispatcher/DefaultStaticContentLoader.java | 8 +- .../org/apache/struts2/dispatcher/Dispatcher.java | 19 +- .../struts2/dispatcher/DispatcherErrorHandler.java | 4 +- .../struts2/dispatcher/DispatcherListener.java | 4 +- .../struts2/dispatcher/ExecuteOperations.java | 8 +- .../apache/struts2/dispatcher/HttpParameters.java | 2 +- .../struts2/dispatcher/LocalizedMessage.java | 11 +- .../org/apache/struts2/dispatcher/Parameter.java | 3 +- .../struts2/dispatcher/PrepareOperations.java | 8 +- .../org/apache/struts2/dispatcher/RequestMap.java | 3 + .../org/apache/struts2/dispatcher/SessionMap.java | 9 +- .../struts2/dispatcher/StringObjectEntry.java | 7 +- .../dispatcher/filter/FilterHostConfig.java | 13 +- .../dispatcher/filter/StrutsExecuteFilter.java | 17 +- .../filter/StrutsPrepareAndExecuteFilter.java | 3 + .../dispatcher/filter/StrutsPrepareFilter.java | 3 + .../dispatcher/listener/ListenerHostConfig.java | 9 +- .../dispatcher/listener/StrutsListener.java | 8 +- .../dispatcher/mapper/CompositeActionMapper.java | 6 +- .../dispatcher/mapper/DefaultActionMapper.java | 29 ++- .../dispatcher/mapper/PrefixBasedActionMapper.java | 7 +- .../dispatcher/mapper/Restful2ActionMapper.java | 8 +- .../dispatcher/mapper/RestfulActionMapper.java | 4 +- .../multipart/AbstractMultiPartRequest.java | 10 + .../multipart/JakartaMultiPartRequest.java | 1 + .../dispatcher/servlet/ServletHostConfig.java | 13 +- .../apache/struts2/factory/StrutsActionProxy.java | 5 +- .../struts2/factory/StrutsResultFactory.java | 3 +- .../interceptor/ActionFileUploadInterceptor.java | 1 + .../struts2/interceptor/CheckboxInterceptor.java | 5 +- .../interceptor/ClearSessionInterceptor.java | 5 +- .../struts2/interceptor/CookieInterceptor.java | 3 + .../interceptor/CookieProviderInterceptor.java | 7 +- .../interceptor/CreateSessionInterceptor.java | 8 +- .../interceptor/DateTextFieldInterceptor.java | 38 ++-- .../interceptor/ExecuteAndWaitInterceptor.java | 4 +- .../interceptor/MessageStoreInterceptor.java | 19 +- .../interceptor/MessageStorePreResultListener.java | 3 +- .../interceptor/MultiselectInterceptor.java | 2 + .../apache/struts2/interceptor/PrincipalProxy.java | 2 - .../struts2/interceptor/RolesInterceptor.java | 25 +-- .../struts2/interceptor/ScopeInterceptor.java | 4 +- .../interceptor/ServletConfigInterceptor.java | 4 + .../StrutsConversionErrorInterceptor.java | 12 +- .../interceptor/TokenSessionStoreInterceptor.java | 22 ++- .../struts2/interceptor/csp/CspInterceptor.java | 6 +- .../debugging/DebuggingInterceptor.java | 26 +-- .../interceptor/debugging/ObjectToHTMLWriter.java | 15 +- .../interceptor/debugging/PrettyPrintWriter.java | 2 +- .../interceptor/exec/StrutsBackgroundProcess.java | 2 + .../parameter/ParametersInterceptor.java | 2 +- .../interceptor/servlet/ServletPrincipalProxy.java | 8 +- .../apache/struts2/result/HttpHeaderResult.java | 8 +- .../org/apache/struts2/result/PlainTextResult.java | 7 +- .../org/apache/struts2/result/PostbackResult.java | 13 +- .../result/ServletActionRedirectResult.java | 2 + .../struts2/result/ServletDispatcherResult.java | 10 +- .../struts2/result/ServletRedirectResult.java | 6 +- .../org/apache/struts2/result/StreamResult.java | 6 +- .../struts2/result/plain/DateHttpHeader.java | 2 + .../apache/struts2/result/plain/IntHttpHeader.java | 2 + .../struts2/url/StrutsQueryStringBuilder.java | 7 +- .../apache/struts2/util/AppendIteratorFilter.java | 15 +- .../java/org/apache/struts2/util/ContainUtil.java | 4 +- .../main/java/org/apache/struts2/util/Counter.java | 12 +- .../struts2/util/DefaultContentTypeMatcher.java | 4 +- .../struts2/util/FastByteArrayOutputStream.java | 17 +- .../struts2/util/InvocationSessionStore.java | 2 + .../org/apache/struts2/util/IteratorGenerator.java | 7 +- .../apache/struts2/util/MergeIteratorFilter.java | 13 +- .../apache/struts2/util/RegexPatternMatcher.java | 10 +- .../apache/struts2/util/SortIteratorFilter.java | 9 +- .../apache/struts2/util/SubsetIteratorFilter.java | 13 +- .../java/org/apache/struts2/util/TabbedPane.java | 2 +- .../apache/struts2/util/fs/JBossFileManager.java | 4 +- .../apache/struts2/views/JspSupportServlet.java | 3 + .../struts2/views/TagLibraryDirectiveProvider.java | 7 +- .../views/freemarker/FreemarkerManager.java | 20 +- .../struts2/views/freemarker/FreemarkerResult.java | 10 +- .../struts2/views/freemarker/ScopesHashModel.java | 8 +- .../views/freemarker/StrutsBeanWrapper.java | 20 +- .../views/freemarker/tags/ActionErrorModel.java | 5 +- .../views/freemarker/tags/ActionMessageModel.java | 5 +- .../struts2/views/freemarker/tags/ActionModel.java | 5 +- .../struts2/views/freemarker/tags/AnchorModel.java | 5 +- .../struts2/views/freemarker/tags/BeanModel.java | 5 +- .../views/freemarker/tags/CallbackWriter.java | 21 ++- .../views/freemarker/tags/CheckboxListModel.java | 5 +- .../views/freemarker/tags/CheckboxModel.java | 5 +- .../views/freemarker/tags/ComboBoxModel.java | 5 +- .../views/freemarker/tags/ComponentModel.java | 5 +- .../struts2/views/freemarker/tags/DateModel.java | 5 +- .../views/freemarker/tags/DoubleSelectModel.java | 5 +- .../struts2/views/freemarker/tags/ElseIfModel.java | 5 +- .../struts2/views/freemarker/tags/ElseModel.java | 5 +- .../views/freemarker/tags/FieldErrorModel.java | 5 +- .../struts2/views/freemarker/tags/FileModel.java | 5 +- .../struts2/views/freemarker/tags/FormModel.java | 5 +- .../struts2/views/freemarker/tags/HeadModel.java | 5 +- .../struts2/views/freemarker/tags/HiddenModel.java | 5 +- .../struts2/views/freemarker/tags/I18nModel.java | 5 +- .../struts2/views/freemarker/tags/IfModel.java | 6 +- .../views/freemarker/tags/IncludeModel.java | 5 +- .../freemarker/tags/InputTransferSelectModel.java | 3 +- .../views/freemarker/tags/IteratorModel.java | 5 +- .../struts2/views/freemarker/tags/LabelModel.java | 5 +- .../struts2/views/freemarker/tags/LinkModel.java | 5 +- .../views/freemarker/tags/OptGroupModel.java | 5 +- .../freemarker/tags/OptionTransferSelectModel.java | 5 +- .../struts2/views/freemarker/tags/ParamModel.java | 5 +- .../views/freemarker/tags/PasswordModel.java | 5 +- .../views/freemarker/tags/PropertyModel.java | 1 + .../struts2/views/freemarker/tags/PushModel.java | 1 + .../struts2/views/freemarker/tags/RadioModel.java | 5 +- .../struts2/views/freemarker/tags/ResetModel.java | 5 +- .../struts2/views/freemarker/tags/ScriptModel.java | 5 +- .../struts2/views/freemarker/tags/SelectModel.java | 5 +- .../struts2/views/freemarker/tags/SetModel.java | 5 +- .../views/freemarker/tags/StrutsModels.java | 4 +- .../struts2/views/freemarker/tags/SubmitModel.java | 1 + .../struts2/views/freemarker/tags/TagModel.java | 18 +- .../views/freemarker/tags/TextAreaModel.java | 5 +- .../views/freemarker/tags/TextFieldModel.java | 5 +- .../struts2/views/freemarker/tags/TextModel.java | 5 +- .../struts2/views/freemarker/tags/TokenModel.java | 5 +- .../struts2/views/freemarker/tags/URLModel.java | 5 +- .../views/freemarker/tags/UpDownSelectModel.java | 5 +- .../org/apache/struts2/views/jsp/ActionTag.java | 10 +- .../java/org/apache/struts2/views/jsp/BeanTag.java | 13 +- .../struts2/views/jsp/ComponentTagSupport.java | 8 +- .../apache/struts2/views/jsp/ContextBeanTag.java | 4 +- .../java/org/apache/struts2/views/jsp/DateTag.java | 10 +- .../org/apache/struts2/views/jsp/ElseIfTag.java | 9 +- .../java/org/apache/struts2/views/jsp/ElseTag.java | 7 +- .../java/org/apache/struts2/views/jsp/I18nTag.java | 9 +- .../java/org/apache/struts2/views/jsp/IfTag.java | 9 +- .../org/apache/struts2/views/jsp/IncludeTag.java | 9 +- .../org/apache/struts2/views/jsp/IteratorTag.java | 12 +- .../org/apache/struts2/views/jsp/NumberTag.java | 10 +- .../org/apache/struts2/views/jsp/ParamTag.java | 12 +- .../org/apache/struts2/views/jsp/PropertyTag.java | 7 +- .../java/org/apache/struts2/views/jsp/PushTag.java | 7 +- .../java/org/apache/struts2/views/jsp/SetTag.java | 9 +- .../struts2/views/jsp/StrutsBodyTagSupport.java | 10 +- .../java/org/apache/struts2/views/jsp/TextTag.java | 11 +- .../java/org/apache/struts2/views/jsp/URLTag.java | 19 +- .../views/jsp/iterator/AppendIteratorTag.java | 7 +- .../views/jsp/iterator/IteratorGeneratorTag.java | 16 +- .../views/jsp/iterator/MergeIteratorTag.java | 7 +- .../views/jsp/iterator/SortIteratorTag.java | 31 ++- .../views/jsp/iterator/SubsetIteratorTag.java | 22 ++- .../struts2/views/jsp/ui/AbstractClosingTag.java | 4 +- .../views/jsp/ui/AbstractDoubleListTag.java | 4 +- .../struts2/views/jsp/ui/AbstractListTag.java | 4 +- .../views/jsp/ui/AbstractRequiredListTag.java | 2 +- .../apache/struts2/views/jsp/ui/AbstractUITag.java | 4 +- .../struts2/views/jsp/ui/ActionErrorTag.java | 9 +- .../struts2/views/jsp/ui/ActionMessageTag.java | 9 +- .../org/apache/struts2/views/jsp/ui/AnchorTag.java | 13 +- .../struts2/views/jsp/ui/CheckboxListTag.java | 7 +- .../apache/struts2/views/jsp/ui/CheckboxTag.java | 8 +- .../apache/struts2/views/jsp/ui/ComboBoxTag.java | 9 +- .../apache/struts2/views/jsp/ui/ComponentTag.java | 7 +- .../struts2/views/jsp/ui/DateTextFieldTag.java | 11 +- .../org/apache/struts2/views/jsp/ui/DebugTag.java | 7 +- .../struts2/views/jsp/ui/DoubleSelectTag.java | 7 +- .../apache/struts2/views/jsp/ui/FieldErrorTag.java | 9 +- .../org/apache/struts2/views/jsp/ui/FileTag.java | 9 +- .../org/apache/struts2/views/jsp/ui/FormTag.java | 11 +- .../org/apache/struts2/views/jsp/ui/HeadTag.java | 7 +- .../org/apache/struts2/views/jsp/ui/HiddenTag.java | 7 +- .../views/jsp/ui/InputTransferSelectTag.java | 12 +- .../org/apache/struts2/views/jsp/ui/LabelTag.java | 9 +- .../org/apache/struts2/views/jsp/ui/LinkTag.java | 1 - .../apache/struts2/views/jsp/ui/OptGroupTag.java | 9 +- .../views/jsp/ui/OptionTransferSelectTag.java | 9 +- .../apache/struts2/views/jsp/ui/PasswordTag.java | 9 +- .../org/apache/struts2/views/jsp/ui/RadioTag.java | 7 +- .../org/apache/struts2/views/jsp/ui/ResetTag.java | 10 +- .../org/apache/struts2/views/jsp/ui/ScriptTag.java | 6 +- .../org/apache/struts2/views/jsp/ui/SelectTag.java | 9 +- .../org/apache/struts2/views/jsp/ui/SubmitTag.java | 7 +- .../apache/struts2/views/jsp/ui/TextFieldTag.java | 10 +- .../apache/struts2/views/jsp/ui/TextareaTag.java | 9 +- .../org/apache/struts2/views/jsp/ui/TokenTag.java | 7 +- .../struts2/views/jsp/ui/UpDownSelectTag.java | 9 +- .../apache/struts2/views/util/ResourceUtil.java | 4 +- 378 files changed, 2541 insertions(+), 2407 deletions(-)