You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/08/23 13:01:30 UTC
[commons-jelly] branch master updated (8950dda3 -> 3ebc3e00)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jelly.git
from 8950dda3 Fix formatting
new a0669b9f Add missing @Override
new 50230f2b Add missing @Override
new 3ebc3e00 Add missing @Override
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/commons/jelly/DynaBeanTagSupport.java | 3 +++
.../org/apache/commons/jelly/DynaTagSupport.java | 1 +
.../org/apache/commons/jelly/JellyException.java | 13 +++++++++++++
.../org/apache/commons/jelly/MapTagSupport.java | 1 +
.../java/org/apache/commons/jelly/TagLibrary.java | 1 +
.../java/org/apache/commons/jelly/TagSupport.java | 13 +++++++++++--
.../java/org/apache/commons/jelly/XMLOutput.java | 20 ++++++++++++++++++++
.../jelly/expression/CompositeExpression.java | 5 +++++
.../jelly/expression/ConstantExpression.java | 3 +++
.../jelly/expression/ExpressionSupport.java | 4 ++++
.../jelly/expression/jexl/JexlExpression.java | 17 +++++++++++++++++
.../expression/jexl/JexlExpressionFactory.java | 4 ++++
.../jelly/expression/xpath/XPathExpression.java | 4 ++++
.../jelly/impl/CompositeTextScriptBlock.java | 1 +
.../commons/jelly/impl/DefaultTagFactory.java | 1 +
.../jelly/impl/DefaultTagLibraryResolver.java | 1 +
.../apache/commons/jelly/impl/DynamicBeanTag.java | 4 ++++
.../commons/jelly/impl/DynamicDynaBeanTag.java | 4 ++++
.../org/apache/commons/jelly/impl/DynamicTag.java | 2 ++
.../commons/jelly/impl/DynamicTagLibrary.java | 3 +++
.../commons/jelly/impl/ExpressionScript.java | 3 +++
.../org/apache/commons/jelly/impl/ScriptBlock.java | 3 +++
.../org/apache/commons/jelly/impl/StaticTag.java | 3 +++
.../apache/commons/jelly/impl/StaticTagScript.java | 1 +
.../org/apache/commons/jelly/impl/TagScript.java | 3 +++
.../org/apache/commons/jelly/impl/TextScript.java | 3 +++
.../jelly/parser/DefaultNamespaceFilter.java | 3 +++
.../org/apache/commons/jelly/parser/XMLParser.java | 17 +++++++++++++++++
.../apache/commons/jelly/servlet/JellyServlet.java | 2 ++
.../commons/jelly/servlet/JellyServletContext.java | 3 +++
.../org/apache/commons/jelly/tags/core/ArgTag.java | 7 +++++++
.../apache/commons/jelly/tags/core/BreakTag.java | 1 +
.../apache/commons/jelly/tags/core/CaseTag.java | 1 +
.../apache/commons/jelly/tags/core/CatchTag.java | 1 +
.../apache/commons/jelly/tags/core/ChooseTag.java | 1 +
.../apache/commons/jelly/tags/core/DefaultTag.java | 1 +
.../apache/commons/jelly/tags/core/ExprTag.java | 1 +
.../apache/commons/jelly/tags/core/FileTag.java | 2 ++
.../apache/commons/jelly/tags/core/ForEachTag.java | 9 +++++++++
.../commons/jelly/tags/core/GetStaticTag.java | 1 +
.../org/apache/commons/jelly/tags/core/IfTag.java | 1 +
.../apache/commons/jelly/tags/core/ImportTag.java | 1 +
.../apache/commons/jelly/tags/core/IncludeTag.java | 1 +
.../commons/jelly/tags/core/InvokeStaticTag.java | 2 ++
.../apache/commons/jelly/tags/core/InvokeTag.java | 2 ++
.../apache/commons/jelly/tags/core/JellyTag.java | 1 +
.../apache/commons/jelly/tags/core/MuteTag.java | 2 ++
.../org/apache/commons/jelly/tags/core/NewTag.java | 2 ++
.../commons/jelly/tags/core/OtherwiseTag.java | 1 +
.../apache/commons/jelly/tags/core/ParseTag.java | 1 +
.../apache/commons/jelly/tags/core/RemoveTag.java | 1 +
.../apache/commons/jelly/tags/core/ScopeTag.java | 1 +
.../commons/jelly/tags/core/SetPropertiesTag.java | 1 +
.../org/apache/commons/jelly/tags/core/SetTag.java | 1 +
.../apache/commons/jelly/tags/core/SwitchTag.java | 1 +
.../apache/commons/jelly/tags/core/ThreadTag.java | 2 ++
.../apache/commons/jelly/tags/core/UseBeanTag.java | 2 ++
.../apache/commons/jelly/tags/core/UseListTag.java | 5 +++++
.../apache/commons/jelly/tags/core/WhenTag.java | 1 +
.../apache/commons/jelly/tags/core/WhileTag.java | 1 +
.../commons/jelly/tags/core/WhitespaceTag.java | 1 +
.../apache/commons/jelly/test/BaseJellyTest.java | 1 +
.../commons/jelly/util/CommandLineParser.java | 4 +++-
.../commons/jelly/util/SafeContentHandler.java | 11 +++++++++++
.../commons/jelly/xpath/XPathComparator.java | 1 +
.../test/java/org/apache/commons/jelly/TJEcho.java | 3 ++-
.../org/apache/commons/jelly/TJTagLibrary.java | 6 ++++--
.../test/java/org/apache/commons/jelly/TJTest.java | 3 ++-
.../org/apache/commons/jelly/core/Customer.java | 1 +
.../java/org/apache/commons/jelly/core/Order.java | 1 +
.../org/apache/commons/jelly/core/Product.java | 1 +
.../org/apache/commons/jelly/core/TestArgTag.java | 6 ++++++
.../apache/commons/jelly/core/TestIncludeTag.java | 1 +
.../commons/jelly/core/TestInvokeStaticTag.java | 2 ++
.../apache/commons/jelly/core/TestInvokeTag.java | 2 ++
.../commons/jelly/core/TestNamespacePrefixes.java | 1 +
.../apache/commons/jelly/core/TestSwitchTag.java | 2 ++
.../jelly/core/TestUnexpectedTagCaching.java | 2 ++
.../apache/commons/jelly/core/TestUnknownTags.java | 1 +
.../expression/TestCustomExpressionFactory.java | 1 +
.../commons/jelly/tags/junit/AssertEqualsTag.java | 1 +
.../apache/commons/jelly/tags/junit/AssertTag.java | 1 +
.../commons/jelly/tags/junit/AssertThrowsTag.java | 1 +
.../apache/commons/jelly/tags/junit/CaseTag.java | 2 ++
.../apache/commons/jelly/tags/junit/FailTag.java | 1 +
.../commons/jelly/tags/junit/JUnitTagLibrary.java | 1 +
.../tags/junit/JellyAssertionFailedError.java | 13 +++++++++++++
.../apache/commons/jelly/tags/junit/RunTag.java | 5 +++++
.../apache/commons/jelly/tags/junit/SuiteTag.java | 1 +
.../apache/commons/jelly/test/impl/DummyTag.java | 1 +
.../jelly/test/xml/TestDefaultNamespaceFilter.java | 1 +
.../org/apache/commons/jelly/tags/ant/AntTag.java | 5 +++++
.../commons/jelly/tags/ant/AntTagLibrary.java | 7 +++++++
.../jelly/tags/ant/DefaultPropsHandler.java | 13 +++++++++++++
.../commons/jelly/tags/ant/FileIterator.java | 3 +++
.../commons/jelly/tags/ant/FileScannerTag.java | 3 +++
.../commons/jelly/tags/ant/GrantProject.java | 14 ++++++++++++++
.../commons/jelly/tags/ant/JellyPropsHandler.java | 3 +++
.../commons/jelly/tags/ant/SetPropertyTag.java | 1 +
.../apache/commons/jelly/task/AntJellyContext.java | 7 +++++++
.../org/apache/commons/jelly/task/JellyTask.java | 1 +
.../org/apache/commons/jelly/ant/tag/DummyTag.java | 2 ++
.../apache/commons/jelly/ant/task/DummyTask.java | 1 +
.../apache/commons/jelly/tags/antlr/AntlrTag.java | 3 +++
.../commons/jelly/tags/antlr/GrammarTag.java | 1 +
.../commons/jelly/avalon/JellyServiceImpl.java | 7 +++++++
.../commons/jelly/tags/bean/BeanPropertyTag.java | 1 +
.../apache/commons/jelly/tags/bean/BeanTag.java | 1 +
.../commons/jelly/tags/bean/BeanTagLibrary.java | 3 +++
.../apache/commons/jelly/tags/bean/BeandefTag.java | 1 +
.../apache/commons/jelly/tags/bean/Customer.java | 1 +
.../apache/commons/jelly/tags/bean/Manager.java | 1 +
.../commons/jelly/tags/bean/MyContainerTag.java | 2 ++
.../commons/jelly/tags/bean/MyTagLibrary.java | 2 ++
.../org/apache/commons/jelly/tags/bean/Order.java | 1 +
.../apache/commons/jelly/tags/bean/Product.java | 1 +
.../jelly/tags/beanshell/BeanShellExpression.java | 2 ++
.../tags/beanshell/BeanShellExpressionFactory.java | 1 +
.../commons/jelly/tags/beanshell/ScriptTag.java | 1 +
.../jelly/tags/beanshell/TestBeanShellEL.java | 1 +
.../jelly/tags/betwixt/IntrospectorTag.java | 2 ++
.../commons/jelly/tags/betwixt/ParseTag.java | 1 +
.../apache/commons/digester/rss/RSSDigester.java | 5 +++++
.../commons/jelly/tags/bsf/BSFExpression.java | 2 ++
.../jelly/tags/bsf/BSFExpressionFactory.java | 1 +
.../commons/jelly/tags/bsf/BSFTagLibrary.java | 1 +
.../jelly/tags/bsf/JellyContextRegistry.java | 2 ++
.../apache/commons/jelly/tags/bsf/ScriptTag.java | 9 +++++++++
.../commons/jelly/tags/define/AttributeTag.java | 1 +
.../apache/commons/jelly/tags/define/BeanTag.java | 2 ++
.../commons/jelly/tags/define/ClassLoaderTag.java | 1 +
.../commons/jelly/tags/define/DynaBeanTag.java | 2 ++
.../commons/jelly/tags/define/ExtendTag.java | 1 +
.../commons/jelly/tags/define/InvokeBodyTag.java | 1 +
.../commons/jelly/tags/define/InvokeTag.java | 1 +
.../commons/jelly/tags/define/JellyBeanTag.java | 1 +
.../commons/jelly/tags/define/ScriptTag.java | 1 +
.../apache/commons/jelly/tags/define/SuperTag.java | 1 +
.../apache/commons/jelly/tags/define/TagTag.java | 1 +
.../commons/jelly/tags/define/TaglibTag.java | 1 +
.../commons/jelly/tags/define/DynamicTag.java | 1 +
.../commons/jelly/tags/define/MyRunnable.java | 1 +
.../commons/jelly/tags/dynabean/DynabeanTag.java | 1 +
.../commons/jelly/tags/dynabean/DynaclassTag.java | 1 +
.../commons/jelly/tags/dynabean/PropertyTag.java | 1 +
.../apache/commons/jelly/tags/dynabean/SetTag.java | 1 +
.../apache/commons/jelly/tags/email/EmailTag.java | 1 +
.../apache/commons/jelly/tags/fmt/BundleTag.java | 1 +
.../commons/jelly/tags/fmt/FormatDateTag.java | 1 +
.../apache/commons/jelly/tags/fmt/MessageTag.java | 1 +
.../apache/commons/jelly/tags/fmt/ParamTag.java | 1 +
.../commons/jelly/tags/fmt/SetBundleTag.java | 1 +
.../commons/jelly/tags/fmt/SetLocaleTag.java | 1 +
.../commons/jelly/tags/fmt/SetTimeZoneTag.java | 1 +
.../apache/commons/jelly/tags/fmt/TimeZoneTag.java | 1 +
.../apache/commons/jelly/tags/html/ParseTag.java | 2 ++
.../apache/commons/jelly/tags/http/BodyTag.java | 1 +
.../apache/commons/jelly/tags/http/DeleteTag.java | 1 +
.../org/apache/commons/jelly/tags/http/GetTag.java | 1 +
.../apache/commons/jelly/tags/http/HeadTag.java | 1 +
.../apache/commons/jelly/tags/http/HeaderTag.java | 1 +
.../commons/jelly/tags/http/HttpTagLibrary.java | 1 +
.../commons/jelly/tags/http/HttpTagSupport.java | 1 +
.../commons/jelly/tags/http/MultipartPostTag.java | 2 ++
.../apache/commons/jelly/tags/http/OptionsTag.java | 1 +
.../commons/jelly/tags/http/ParameterTag.java | 1 +
.../apache/commons/jelly/tags/http/PartTag.java | 4 +++-
.../apache/commons/jelly/tags/http/PostTag.java | 2 ++
.../org/apache/commons/jelly/tags/http/PutTag.java | 2 ++
.../apache/commons/jelly/tags/http/SessionTag.java | 1 +
.../commons/jelly/tags/interaction/AskTag.java | 1 +
.../commons/jelly/tags/jaxme/GeneratorTag.java | 1 +
.../commons/jelly/tags/jaxme/MarshallTag.java | 1 +
.../commons/jelly/tags/jaxme/UnmarshallTag.java | 1 +
.../examples/misc/address/impl/AddressHandler.java | 3 ++-
.../examples/misc/address/impl/AddressImpl.java | 3 ++-
.../misc/address/impl/AddressTypeHandler.java | 22 ++++++++++++++++------
.../misc/address/impl/AddressTypeImpl.java | 19 +++++++++++++++----
.../misc/address/impl/AddressTypeSerializer.java | 10 +++++++---
.../jelly/tags/jetty/AbstractMethodHandlerTag.java | 1 +
.../commons/jelly/tags/jetty/DeleteRequestTag.java | 1 +
.../commons/jelly/tags/jetty/GetRequestTag.java | 1 +
.../commons/jelly/tags/jetty/HttpContextTag.java | 1 +
.../jelly/tags/jetty/JellyResourceHandlerTag.java | 1 +
.../jelly/tags/jetty/JellyResourceHttpHandler.java | 1 +
.../jelly/tags/jetty/JettyHttpServerTag.java | 1 +
.../commons/jelly/tags/jetty/JettyTagLibrary.java | 1 +
.../jelly/tags/jetty/NotFoundHandlerTag.java | 1 +
.../commons/jelly/tags/jetty/PostRequestTag.java | 1 +
.../commons/jelly/tags/jetty/PutRequestTag.java | 1 +
.../apache/commons/jelly/tags/jetty/RealmTag.java | 1 +
.../jelly/tags/jetty/ResourceHandlerTag.java | 1 +
.../commons/jelly/tags/jetty/ResponseBodyTag.java | 1 +
.../commons/jelly/tags/jetty/ResponseCodeTag.java | 1 +
.../jelly/tags/jetty/ResponseHeaderTag.java | 1 +
.../jelly/tags/jetty/SecurityHandlerTag.java | 1 +
.../jelly/tags/jetty/SocketListenerTag.java | 1 +
.../apache/commons/jelly/tags/jface/ActionTag.java | 2 ++
.../jelly/tags/jface/ContributionItemTag.java | 1 +
.../jelly/tags/jface/DoubleClickListenerTag.java | 2 ++
.../commons/jelly/tags/jface/JFaceImageTag.java | 1 +
.../jelly/tags/jface/JFaceLayoutDataTag.java | 1 +
.../commons/jelly/tags/jface/JFaceLayoutTag.java | 1 +
.../commons/jelly/tags/jface/JFaceTagLibrary.java | 14 ++++++++++++++
.../commons/jelly/tags/jface/JFaceWidgetTag.java | 2 ++
.../commons/jelly/tags/jface/MenuManagerTag.java | 1 +
.../tags/jface/SelectionChangedListenerTag.java | 2 ++
.../apache/commons/jelly/tags/jface/ViewerTag.java | 1 +
.../tags/jface/impl/ApplicationWindowImpl.java | 1 +
.../tags/jface/preference/FieldEditorTag.java | 2 ++
.../tags/jface/preference/PreferenceDialogTag.java | 1 +
.../tags/jface/preference/PreferencePageTag.java | 5 +++++
.../tags/jface/window/ApplicationWindowImpl.java | 1 +
.../tags/jface/window/ApplicationWindowTag.java | 2 ++
.../jelly/tags/jface/wizard/WizardDialogTag.java | 5 +++++
.../jelly/tags/jface/wizard/WizardPageTag.java | 2 ++
.../commons/jelly/tags/jms/ConnectionTag.java | 2 ++
.../commons/jelly/tags/jms/DestinationTag.java | 1 +
.../apache/commons/jelly/tags/jms/MapEntryTag.java | 1 +
.../commons/jelly/tags/jms/MapMessageTag.java | 1 +
.../jelly/tags/jms/MessageOperationTag.java | 1 +
.../apache/commons/jelly/tags/jms/MessageTag.java | 1 +
.../commons/jelly/tags/jms/ObjectMessageTag.java | 1 +
.../commons/jelly/tags/jms/OnMessageTag.java | 2 ++
.../apache/commons/jelly/tags/jms/PropertyTag.java | 1 +
.../apache/commons/jelly/tags/jms/ReceiveTag.java | 1 +
.../org/apache/commons/jelly/tags/jms/SendTag.java | 1 +
.../commons/jelly/tags/jms/StopwatchTag.java | 2 ++
.../commons/jelly/tags/jms/SubscribeTag.java | 2 ++
.../commons/jelly/tags/jms/TextMessageTag.java | 1 +
.../jelly/tags/jmx/ObjectNameConverter.java | 1 +
.../commons/jelly/tags/jmx/OperationTag.java | 2 ++
.../apache/commons/jelly/tags/jmx/RegisterTag.java | 2 ++
.../apache/commons/jelly/tags/jmx/ServerTag.java | 1 +
.../org/apache/commons/jelly/tags/jmx/Dummy.java | 6 ++++++
.../commons/jelly/tags/jsl/ApplyTemplatesTag.java | 1 +
.../commons/jelly/tags/jsl/JSLTagLibrary.java | 1 +
.../commons/jelly/tags/jsl/JellyStylesheet.java | 1 +
.../apache/commons/jelly/tags/jsl/StyleTag.java | 1 +
.../commons/jelly/tags/jsl/StylesheetTag.java | 2 ++
.../apache/commons/jelly/tags/jsl/TemplateTag.java | 3 +++
.../jelly/tags/jsl/XPathPatternExpression.java | 3 +++
.../commons/jelly/tags/junit/AssertEqualsTag.java | 1 +
.../jelly/tags/junit/AssertFileContainsTag.java | 1 +
.../jelly/tags/junit/AssertFileExistsTag.java | 3 ++-
.../jelly/tags/junit/AssertFileNotFoundTag.java | 1 +
.../apache/commons/jelly/tags/junit/AssertTag.java | 1 +
.../commons/jelly/tags/junit/AssertThrowsTag.java | 1 +
.../apache/commons/jelly/tags/junit/CaseTag.java | 2 ++
.../apache/commons/jelly/tags/junit/FailTag.java | 1 +
.../commons/jelly/tags/junit/JUnitTagLibrary.java | 1 +
.../tags/junit/JellyAssertionFailedError.java | 13 +++++++++++++
.../apache/commons/jelly/tags/junit/RunTag.java | 5 +++++
.../apache/commons/jelly/tags/junit/SuiteTag.java | 1 +
.../apache/commons/jelly/tags/log/DebugTag.java | 1 +
.../apache/commons/jelly/tags/log/ErrorTag.java | 1 +
.../apache/commons/jelly/tags/log/FatalTag.java | 1 +
.../org/apache/commons/jelly/tags/log/InfoTag.java | 1 +
.../apache/commons/jelly/tags/log/TraceTag.java | 1 +
.../org/apache/commons/jelly/tags/log/WarnTag.java | 1 +
.../org/apache/commons/jelly/tags/log/MockLog.java | 14 ++++++++++++++
.../commons/jelly/tags/memory/FreeMemoryTag.java | 1 +
.../apache/commons/jelly/tags/memory/GcTag.java | 1 +
.../apache/commons/jelly/tags/ojb/BrokerTag.java | 1 +
.../apache/commons/jelly/tags/ojb/StoreTag.java | 1 +
.../commons/jelly/tags/quartz/CronTriggerTag.java | 1 +
.../apache/commons/jelly/tags/quartz/JellyJob.java | 1 +
.../apache/commons/jelly/tags/quartz/JobTag.java | 1 +
.../jelly/tags/quartz/QuartzTagSupport.java | 1 +
.../jelly/tags/quartz/WaitForSchedulerTag.java | 1 +
.../commons/jelly/tags/regexp/ContainsTag.java | 1 +
.../apache/commons/jelly/tags/regexp/MatchTag.java | 1 +
.../commons/jelly/tags/regexp/RegexpTag.java | 1 +
.../commons/jelly/tags/regexp/ContainsTagTest.java | 2 ++
.../commons/jelly/tags/regexp/MatchTagTest.java | 6 ++++--
.../commons/jelly/tags/soap/InvokeRawTag.java | 1 +
.../apache/commons/jelly/tags/soap/InvokeTag.java | 1 +
.../commons/jelly/tags/soap/StringInputStream.java | 5 +++++
.../javax/servlet/jsp/jstl/sql/ResultImpl.java | 5 +++++
.../commons/jelly/tags/sql/DataSourceWrapper.java | 7 +++++++
.../commons/jelly/tags/sql/DateParamTag.java | 1 +
.../apache/commons/jelly/tags/sql/DriverTag.java | 1 +
.../apache/commons/jelly/tags/sql/ParamTag.java | 1 +
.../apache/commons/jelly/tags/sql/QueryTag.java | 1 +
.../apache/commons/jelly/tags/sql/ResultImpl.java | 5 +++++
.../commons/jelly/tags/sql/ResultSetTag.java | 1 +
.../org/apache/commons/jelly/tags/sql/RowTag.java | 1 +
.../commons/jelly/tags/sql/SetDataSourceTag.java | 1 +
.../commons/jelly/tags/sql/SqlTagSupport.java | 1 +
.../commons/jelly/tags/sql/TransactionTag.java | 1 +
.../apache/commons/jelly/tags/sql/UpdateTag.java | 1 +
.../apache/commons/jelly/tags/swing/ActionTag.java | 8 +++++++-
.../commons/jelly/tags/swing/BeanFactory.java | 1 +
.../commons/jelly/tags/swing/BorderAlignTag.java | 2 ++
.../commons/jelly/tags/swing/BorderLayoutTag.java | 1 +
.../commons/jelly/tags/swing/BorderTagSupport.java | 1 +
.../commons/jelly/tags/swing/ButtonGroupTag.java | 2 ++
.../commons/jelly/tags/swing/CardLayoutTag.java | 1 +
.../commons/jelly/tags/swing/ComponentTag.java | 7 +++++++
.../commons/jelly/tags/swing/ConstraintTag.java | 6 ++++++
.../apache/commons/jelly/tags/swing/DialogTag.java | 2 ++
.../commons/jelly/tags/swing/EmptyBorderTag.java | 2 ++
.../commons/jelly/tags/swing/EtchedBorderTag.java | 2 ++
.../commons/jelly/tags/swing/FocusListenerTag.java | 5 ++++-
.../apache/commons/jelly/tags/swing/FontTag.java | 1 +
.../apache/commons/jelly/tags/swing/GbcTag.java | 4 ++++
.../commons/jelly/tags/swing/GridBagLayoutTag.java | 1 +
.../commons/jelly/tags/swing/KeyListenerTag.java | 6 +++++-
.../commons/jelly/tags/swing/LayoutTagSupport.java | 1 +
.../commons/jelly/tags/swing/SwingTagLibrary.java | 5 +++++
.../commons/jelly/tags/swing/TableLayoutTag.java | 2 ++
.../jelly/tags/swing/TableModelColumnTag.java | 3 +++
.../commons/jelly/tags/swing/TableModelTag.java | 2 ++
.../org/apache/commons/jelly/tags/swing/TdTag.java | 2 ++
.../commons/jelly/tags/swing/TitledBorderTag.java | 2 ++
.../org/apache/commons/jelly/tags/swing/TrTag.java | 1 +
.../jelly/tags/swing/WindowListenerTag.java | 1 +
.../tags/swing/converters/ColorConverter.java | 1 +
.../swing/converters/DebugGraphicsConverter.java | 1 +
.../tags/swing/converters/DimensionConverter.java | 1 +
.../tags/swing/converters/PointConverter.java | 1 +
.../tags/swing/impl/GridBagConstraintBean.java | 1 +
.../tags/swing/model/ExpressionTableColumn.java | 1 +
.../tags/swing/model/ExpressionTableModel.java | 4 ++++
.../apache/commons/jelly/core/BaseJellyTest.java | 1 +
.../commons/jelly/demos/HomepageBuilder.java | 2 ++
.../apache/commons/jelly/swing/MyTableModel.java | 7 +++++++
.../apache/commons/jelly/swing/TestSwingTags.java | 1 +
.../apache/commons/jelly/tags/swt/ColorTag.java | 1 +
.../apache/commons/jelly/tags/swt/DialogTag.java | 1 +
.../org/apache/commons/jelly/tags/swt/FontTag.java | 1 +
.../org/apache/commons/jelly/tags/swt/GCTag.java | 1 +
.../apache/commons/jelly/tags/swt/ImageTag.java | 1 +
.../commons/jelly/tags/swt/LayoutDataTag.java | 3 +++
.../apache/commons/jelly/tags/swt/LayoutTag.java | 2 ++
.../commons/jelly/tags/swt/LayoutTagSupport.java | 2 ++
.../org/apache/commons/jelly/tags/swt/MenuTag.java | 2 ++
.../apache/commons/jelly/tags/swt/OnEventTag.java | 2 ++
.../commons/jelly/tags/swt/SwtTagLibrary.java | 7 ++++++-
.../apache/commons/jelly/tags/swt/WidgetTag.java | 4 ++++
.../jelly/tags/swt/converters/ColorConverter.java | 1 +
.../jelly/tags/swt/converters/PointConverter.java | 1 +
.../commons/jelly/tags/threads/GroupTag.java | 1 +
.../commons/jelly/tags/threads/JellyThread.java | 1 +
.../commons/jelly/tags/threads/MutexTag.java | 1 +
.../commons/jelly/tags/threads/RunnableStatus.java | 1 +
.../commons/jelly/tags/threads/SleepTag.java | 1 +
.../commons/jelly/tags/threads/ThreadTag.java | 2 ++
.../commons/jelly/tags/threads/UseMutexTag.java | 1 +
.../commons/jelly/tags/threads/UseThreadTag.java | 1 +
.../commons/jelly/tags/threads/WaitForTag.java | 1 +
.../commons/jelly/tags/util/AvailableTag.java | 1 +
.../apache/commons/jelly/tags/util/FileTag.java | 1 +
.../commons/jelly/tags/util/LoadTextTag.java | 1 +
.../commons/jelly/tags/util/PropertiesTag.java | 1 +
.../apache/commons/jelly/tags/util/ReplaceTag.java | 1 +
.../apache/commons/jelly/tags/util/SleepTag.java | 1 +
.../apache/commons/jelly/tags/util/SortTag.java | 1 +
.../commons/jelly/tags/util/TokenizeTag.java | 1 +
.../apache/commons/jelly/tags/util/Customer.java | 1 +
.../jelly/tags/validate/AssertValidTag.java | 3 +++
.../commons/jelly/tags/validate/ValidateTag.java | 3 +++
.../commons/jelly/tags/validate/VerifierTag.java | 1 +
.../jelly/tags/velocity/JellyContextAdapter.java | 5 +++++
.../commons/jelly/tags/velocity/MergeTag.java | 1 +
.../tags/velocity/JellyContextAdapterTest.java | 1 +
.../commons/jelly/tags/xml/AttributeTag.java | 1 +
.../apache/commons/jelly/tags/xml/CommentTag.java | 1 +
.../apache/commons/jelly/tags/xml/CopyOfTag.java | 1 +
.../org/apache/commons/jelly/tags/xml/CopyTag.java | 1 +
.../apache/commons/jelly/tags/xml/DoctypeTag.java | 1 +
.../apache/commons/jelly/tags/xml/ElementTag.java | 7 +++++++
.../org/apache/commons/jelly/tags/xml/ExprTag.java | 1 +
.../apache/commons/jelly/tags/xml/ForEachTag.java | 3 +++
.../org/apache/commons/jelly/tags/xml/IfTag.java | 2 ++
.../apache/commons/jelly/tags/xml/ParamTag.java | 1 +
.../apache/commons/jelly/tags/xml/ParseTag.java | 2 ++
.../jelly/tags/xml/ReplaceNamespaceTag.java | 4 ++++
.../org/apache/commons/jelly/tags/xml/SetTag.java | 1 +
.../org/apache/commons/jelly/tags/xml/SortTag.java | 1 +
.../commons/jelly/tags/xml/TransformTag.java | 16 ++++++++++++++++
.../commons/jelly/tags/xml/XMLTagLibrary.java | 1 +
.../commons/jelly/tags/xmlunit/ActualTag.java | 2 ++
.../tags/xmlunit/AssertDocumentsEqualTag.java | 2 ++
.../commons/jelly/tags/xmlunit/ExpectedTag.java | 2 ++
385 files changed, 891 insertions(+), 30 deletions(-)
[commons-jelly] 03/03: Add missing @Override
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jelly.git
commit 3ebc3e00315ffc2e6181daf0899ee7be7c633aec
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Aug 22 15:01:53 2023 -0400
Add missing @Override
---
.../apache/commons/jelly/tags/antlr/AntlrTag.java | 3 +++
.../commons/jelly/tags/antlr/GrammarTag.java | 1 +
.../commons/jelly/avalon/JellyServiceImpl.java | 7 +++++++
.../commons/jelly/tags/bean/BeanPropertyTag.java | 1 +
.../apache/commons/jelly/tags/bean/BeanTag.java | 1 +
.../commons/jelly/tags/bean/BeanTagLibrary.java | 3 +++
.../apache/commons/jelly/tags/bean/BeandefTag.java | 1 +
.../apache/commons/jelly/tags/bean/Customer.java | 1 +
.../apache/commons/jelly/tags/bean/Manager.java | 1 +
.../commons/jelly/tags/bean/MyContainerTag.java | 2 ++
.../commons/jelly/tags/bean/MyTagLibrary.java | 2 ++
.../org/apache/commons/jelly/tags/bean/Order.java | 1 +
.../apache/commons/jelly/tags/bean/Product.java | 1 +
.../jelly/tags/beanshell/BeanShellExpression.java | 2 ++
.../tags/beanshell/BeanShellExpressionFactory.java | 1 +
.../commons/jelly/tags/beanshell/ScriptTag.java | 1 +
.../jelly/tags/beanshell/TestBeanShellEL.java | 1 +
.../jelly/tags/betwixt/IntrospectorTag.java | 2 ++
.../commons/jelly/tags/betwixt/ParseTag.java | 1 +
.../apache/commons/digester/rss/RSSDigester.java | 5 +++++
.../commons/jelly/tags/bsf/BSFExpression.java | 2 ++
.../jelly/tags/bsf/BSFExpressionFactory.java | 1 +
.../commons/jelly/tags/bsf/BSFTagLibrary.java | 1 +
.../jelly/tags/bsf/JellyContextRegistry.java | 2 ++
.../apache/commons/jelly/tags/bsf/ScriptTag.java | 9 +++++++++
.../commons/jelly/tags/define/AttributeTag.java | 1 +
.../apache/commons/jelly/tags/define/BeanTag.java | 2 ++
.../commons/jelly/tags/define/ClassLoaderTag.java | 1 +
.../commons/jelly/tags/define/DynaBeanTag.java | 2 ++
.../commons/jelly/tags/define/ExtendTag.java | 1 +
.../commons/jelly/tags/define/InvokeBodyTag.java | 1 +
.../commons/jelly/tags/define/InvokeTag.java | 1 +
.../commons/jelly/tags/define/JellyBeanTag.java | 1 +
.../commons/jelly/tags/define/ScriptTag.java | 1 +
.../apache/commons/jelly/tags/define/SuperTag.java | 1 +
.../apache/commons/jelly/tags/define/TagTag.java | 1 +
.../commons/jelly/tags/define/TaglibTag.java | 1 +
.../commons/jelly/tags/define/DynamicTag.java | 1 +
.../commons/jelly/tags/define/MyRunnable.java | 1 +
.../commons/jelly/tags/dynabean/DynabeanTag.java | 1 +
.../commons/jelly/tags/dynabean/DynaclassTag.java | 1 +
.../commons/jelly/tags/dynabean/PropertyTag.java | 1 +
.../apache/commons/jelly/tags/dynabean/SetTag.java | 1 +
.../apache/commons/jelly/tags/email/EmailTag.java | 1 +
.../apache/commons/jelly/tags/fmt/BundleTag.java | 1 +
.../commons/jelly/tags/fmt/FormatDateTag.java | 1 +
.../apache/commons/jelly/tags/fmt/MessageTag.java | 1 +
.../apache/commons/jelly/tags/fmt/ParamTag.java | 1 +
.../commons/jelly/tags/fmt/SetBundleTag.java | 1 +
.../commons/jelly/tags/fmt/SetLocaleTag.java | 1 +
.../commons/jelly/tags/fmt/SetTimeZoneTag.java | 1 +
.../apache/commons/jelly/tags/fmt/TimeZoneTag.java | 1 +
.../apache/commons/jelly/tags/html/ParseTag.java | 2 ++
.../apache/commons/jelly/tags/http/BodyTag.java | 1 +
.../apache/commons/jelly/tags/http/DeleteTag.java | 1 +
.../org/apache/commons/jelly/tags/http/GetTag.java | 1 +
.../apache/commons/jelly/tags/http/HeadTag.java | 1 +
.../apache/commons/jelly/tags/http/HeaderTag.java | 1 +
.../commons/jelly/tags/http/HttpTagLibrary.java | 1 +
.../commons/jelly/tags/http/HttpTagSupport.java | 1 +
.../commons/jelly/tags/http/MultipartPostTag.java | 2 ++
.../apache/commons/jelly/tags/http/OptionsTag.java | 1 +
.../commons/jelly/tags/http/ParameterTag.java | 1 +
.../apache/commons/jelly/tags/http/PartTag.java | 4 +++-
.../apache/commons/jelly/tags/http/PostTag.java | 2 ++
.../org/apache/commons/jelly/tags/http/PutTag.java | 2 ++
.../apache/commons/jelly/tags/http/SessionTag.java | 1 +
.../commons/jelly/tags/interaction/AskTag.java | 1 +
.../commons/jelly/tags/jaxme/GeneratorTag.java | 1 +
.../commons/jelly/tags/jaxme/MarshallTag.java | 1 +
.../commons/jelly/tags/jaxme/UnmarshallTag.java | 1 +
.../examples/misc/address/impl/AddressHandler.java | 3 ++-
.../examples/misc/address/impl/AddressImpl.java | 3 ++-
.../misc/address/impl/AddressTypeHandler.java | 22 ++++++++++++++++------
.../misc/address/impl/AddressTypeImpl.java | 19 +++++++++++++++----
.../misc/address/impl/AddressTypeSerializer.java | 10 +++++++---
.../jelly/tags/jetty/AbstractMethodHandlerTag.java | 1 +
.../commons/jelly/tags/jetty/DeleteRequestTag.java | 1 +
.../commons/jelly/tags/jetty/GetRequestTag.java | 1 +
.../commons/jelly/tags/jetty/HttpContextTag.java | 1 +
.../jelly/tags/jetty/JellyResourceHandlerTag.java | 1 +
.../jelly/tags/jetty/JellyResourceHttpHandler.java | 1 +
.../jelly/tags/jetty/JettyHttpServerTag.java | 1 +
.../commons/jelly/tags/jetty/JettyTagLibrary.java | 1 +
.../jelly/tags/jetty/NotFoundHandlerTag.java | 1 +
.../commons/jelly/tags/jetty/PostRequestTag.java | 1 +
.../commons/jelly/tags/jetty/PutRequestTag.java | 1 +
.../apache/commons/jelly/tags/jetty/RealmTag.java | 1 +
.../jelly/tags/jetty/ResourceHandlerTag.java | 1 +
.../commons/jelly/tags/jetty/ResponseBodyTag.java | 1 +
.../commons/jelly/tags/jetty/ResponseCodeTag.java | 1 +
.../jelly/tags/jetty/ResponseHeaderTag.java | 1 +
.../jelly/tags/jetty/SecurityHandlerTag.java | 1 +
.../jelly/tags/jetty/SocketListenerTag.java | 1 +
.../apache/commons/jelly/tags/jface/ActionTag.java | 2 ++
.../jelly/tags/jface/ContributionItemTag.java | 1 +
.../jelly/tags/jface/DoubleClickListenerTag.java | 2 ++
.../commons/jelly/tags/jface/JFaceImageTag.java | 1 +
.../jelly/tags/jface/JFaceLayoutDataTag.java | 1 +
.../commons/jelly/tags/jface/JFaceLayoutTag.java | 1 +
.../commons/jelly/tags/jface/JFaceTagLibrary.java | 14 ++++++++++++++
.../commons/jelly/tags/jface/JFaceWidgetTag.java | 2 ++
.../commons/jelly/tags/jface/MenuManagerTag.java | 1 +
.../tags/jface/SelectionChangedListenerTag.java | 2 ++
.../apache/commons/jelly/tags/jface/ViewerTag.java | 1 +
.../tags/jface/impl/ApplicationWindowImpl.java | 1 +
.../tags/jface/preference/FieldEditorTag.java | 2 ++
.../tags/jface/preference/PreferenceDialogTag.java | 1 +
.../tags/jface/preference/PreferencePageTag.java | 5 +++++
.../tags/jface/window/ApplicationWindowImpl.java | 1 +
.../tags/jface/window/ApplicationWindowTag.java | 2 ++
.../jelly/tags/jface/wizard/WizardDialogTag.java | 5 +++++
.../jelly/tags/jface/wizard/WizardPageTag.java | 2 ++
.../commons/jelly/tags/jms/ConnectionTag.java | 2 ++
.../commons/jelly/tags/jms/DestinationTag.java | 1 +
.../apache/commons/jelly/tags/jms/MapEntryTag.java | 1 +
.../commons/jelly/tags/jms/MapMessageTag.java | 1 +
.../jelly/tags/jms/MessageOperationTag.java | 1 +
.../apache/commons/jelly/tags/jms/MessageTag.java | 1 +
.../commons/jelly/tags/jms/ObjectMessageTag.java | 1 +
.../commons/jelly/tags/jms/OnMessageTag.java | 2 ++
.../apache/commons/jelly/tags/jms/PropertyTag.java | 1 +
.../apache/commons/jelly/tags/jms/ReceiveTag.java | 1 +
.../org/apache/commons/jelly/tags/jms/SendTag.java | 1 +
.../commons/jelly/tags/jms/StopwatchTag.java | 2 ++
.../commons/jelly/tags/jms/SubscribeTag.java | 2 ++
.../commons/jelly/tags/jms/TextMessageTag.java | 1 +
.../jelly/tags/jmx/ObjectNameConverter.java | 1 +
.../commons/jelly/tags/jmx/OperationTag.java | 2 ++
.../apache/commons/jelly/tags/jmx/RegisterTag.java | 2 ++
.../apache/commons/jelly/tags/jmx/ServerTag.java | 1 +
.../org/apache/commons/jelly/tags/jmx/Dummy.java | 6 ++++++
.../commons/jelly/tags/jsl/ApplyTemplatesTag.java | 1 +
.../commons/jelly/tags/jsl/JSLTagLibrary.java | 1 +
.../commons/jelly/tags/jsl/JellyStylesheet.java | 1 +
.../apache/commons/jelly/tags/jsl/StyleTag.java | 1 +
.../commons/jelly/tags/jsl/StylesheetTag.java | 2 ++
.../apache/commons/jelly/tags/jsl/TemplateTag.java | 3 +++
.../jelly/tags/jsl/XPathPatternExpression.java | 3 +++
.../commons/jelly/tags/junit/AssertEqualsTag.java | 1 +
.../jelly/tags/junit/AssertFileContainsTag.java | 1 +
.../jelly/tags/junit/AssertFileExistsTag.java | 3 ++-
.../jelly/tags/junit/AssertFileNotFoundTag.java | 1 +
.../apache/commons/jelly/tags/junit/AssertTag.java | 1 +
.../commons/jelly/tags/junit/AssertThrowsTag.java | 1 +
.../apache/commons/jelly/tags/junit/CaseTag.java | 2 ++
.../apache/commons/jelly/tags/junit/FailTag.java | 1 +
.../commons/jelly/tags/junit/JUnitTagLibrary.java | 1 +
.../tags/junit/JellyAssertionFailedError.java | 13 +++++++++++++
.../apache/commons/jelly/tags/junit/RunTag.java | 5 +++++
.../apache/commons/jelly/tags/junit/SuiteTag.java | 1 +
.../apache/commons/jelly/tags/log/DebugTag.java | 1 +
.../apache/commons/jelly/tags/log/ErrorTag.java | 1 +
.../apache/commons/jelly/tags/log/FatalTag.java | 1 +
.../org/apache/commons/jelly/tags/log/InfoTag.java | 1 +
.../apache/commons/jelly/tags/log/TraceTag.java | 1 +
.../org/apache/commons/jelly/tags/log/WarnTag.java | 1 +
.../org/apache/commons/jelly/tags/log/MockLog.java | 14 ++++++++++++++
.../commons/jelly/tags/memory/FreeMemoryTag.java | 1 +
.../apache/commons/jelly/tags/memory/GcTag.java | 1 +
.../apache/commons/jelly/tags/ojb/BrokerTag.java | 1 +
.../apache/commons/jelly/tags/ojb/StoreTag.java | 1 +
.../commons/jelly/tags/quartz/CronTriggerTag.java | 1 +
.../apache/commons/jelly/tags/quartz/JellyJob.java | 1 +
.../apache/commons/jelly/tags/quartz/JobTag.java | 1 +
.../jelly/tags/quartz/QuartzTagSupport.java | 1 +
.../jelly/tags/quartz/WaitForSchedulerTag.java | 1 +
.../commons/jelly/tags/regexp/ContainsTag.java | 1 +
.../apache/commons/jelly/tags/regexp/MatchTag.java | 1 +
.../commons/jelly/tags/regexp/RegexpTag.java | 1 +
.../commons/jelly/tags/regexp/ContainsTagTest.java | 2 ++
.../commons/jelly/tags/regexp/MatchTagTest.java | 6 ++++--
.../commons/jelly/tags/soap/InvokeRawTag.java | 1 +
.../apache/commons/jelly/tags/soap/InvokeTag.java | 1 +
.../commons/jelly/tags/soap/StringInputStream.java | 5 +++++
.../javax/servlet/jsp/jstl/sql/ResultImpl.java | 5 +++++
.../commons/jelly/tags/sql/DataSourceWrapper.java | 7 +++++++
.../commons/jelly/tags/sql/DateParamTag.java | 1 +
.../apache/commons/jelly/tags/sql/DriverTag.java | 1 +
.../apache/commons/jelly/tags/sql/ParamTag.java | 1 +
.../apache/commons/jelly/tags/sql/QueryTag.java | 1 +
.../apache/commons/jelly/tags/sql/ResultImpl.java | 5 +++++
.../commons/jelly/tags/sql/ResultSetTag.java | 1 +
.../org/apache/commons/jelly/tags/sql/RowTag.java | 1 +
.../commons/jelly/tags/sql/SetDataSourceTag.java | 1 +
.../commons/jelly/tags/sql/SqlTagSupport.java | 1 +
.../commons/jelly/tags/sql/TransactionTag.java | 1 +
.../apache/commons/jelly/tags/sql/UpdateTag.java | 1 +
.../apache/commons/jelly/tags/swing/ActionTag.java | 8 +++++++-
.../commons/jelly/tags/swing/BeanFactory.java | 1 +
.../commons/jelly/tags/swing/BorderAlignTag.java | 2 ++
.../commons/jelly/tags/swing/BorderLayoutTag.java | 1 +
.../commons/jelly/tags/swing/BorderTagSupport.java | 1 +
.../commons/jelly/tags/swing/ButtonGroupTag.java | 2 ++
.../commons/jelly/tags/swing/CardLayoutTag.java | 1 +
.../commons/jelly/tags/swing/ComponentTag.java | 7 +++++++
.../commons/jelly/tags/swing/ConstraintTag.java | 6 ++++++
.../apache/commons/jelly/tags/swing/DialogTag.java | 2 ++
.../commons/jelly/tags/swing/EmptyBorderTag.java | 2 ++
.../commons/jelly/tags/swing/EtchedBorderTag.java | 2 ++
.../commons/jelly/tags/swing/FocusListenerTag.java | 5 ++++-
.../apache/commons/jelly/tags/swing/FontTag.java | 1 +
.../apache/commons/jelly/tags/swing/GbcTag.java | 4 ++++
.../commons/jelly/tags/swing/GridBagLayoutTag.java | 1 +
.../commons/jelly/tags/swing/KeyListenerTag.java | 6 +++++-
.../commons/jelly/tags/swing/LayoutTagSupport.java | 1 +
.../commons/jelly/tags/swing/SwingTagLibrary.java | 5 +++++
.../commons/jelly/tags/swing/TableLayoutTag.java | 2 ++
.../jelly/tags/swing/TableModelColumnTag.java | 3 +++
.../commons/jelly/tags/swing/TableModelTag.java | 2 ++
.../org/apache/commons/jelly/tags/swing/TdTag.java | 2 ++
.../commons/jelly/tags/swing/TitledBorderTag.java | 2 ++
.../org/apache/commons/jelly/tags/swing/TrTag.java | 1 +
.../jelly/tags/swing/WindowListenerTag.java | 1 +
.../tags/swing/converters/ColorConverter.java | 1 +
.../swing/converters/DebugGraphicsConverter.java | 1 +
.../tags/swing/converters/DimensionConverter.java | 1 +
.../tags/swing/converters/PointConverter.java | 1 +
.../tags/swing/impl/GridBagConstraintBean.java | 1 +
.../tags/swing/model/ExpressionTableColumn.java | 1 +
.../tags/swing/model/ExpressionTableModel.java | 4 ++++
.../apache/commons/jelly/core/BaseJellyTest.java | 1 +
.../commons/jelly/demos/HomepageBuilder.java | 2 ++
.../apache/commons/jelly/swing/MyTableModel.java | 7 +++++++
.../apache/commons/jelly/swing/TestSwingTags.java | 1 +
.../apache/commons/jelly/tags/swt/ColorTag.java | 1 +
.../apache/commons/jelly/tags/swt/DialogTag.java | 1 +
.../org/apache/commons/jelly/tags/swt/FontTag.java | 1 +
.../org/apache/commons/jelly/tags/swt/GCTag.java | 1 +
.../apache/commons/jelly/tags/swt/ImageTag.java | 1 +
.../commons/jelly/tags/swt/LayoutDataTag.java | 3 +++
.../apache/commons/jelly/tags/swt/LayoutTag.java | 2 ++
.../commons/jelly/tags/swt/LayoutTagSupport.java | 2 ++
.../org/apache/commons/jelly/tags/swt/MenuTag.java | 2 ++
.../apache/commons/jelly/tags/swt/OnEventTag.java | 2 ++
.../commons/jelly/tags/swt/SwtTagLibrary.java | 7 ++++++-
.../apache/commons/jelly/tags/swt/WidgetTag.java | 4 ++++
.../jelly/tags/swt/converters/ColorConverter.java | 1 +
.../jelly/tags/swt/converters/PointConverter.java | 1 +
.../commons/jelly/tags/threads/GroupTag.java | 1 +
.../commons/jelly/tags/threads/JellyThread.java | 1 +
.../commons/jelly/tags/threads/MutexTag.java | 1 +
.../commons/jelly/tags/threads/RunnableStatus.java | 1 +
.../commons/jelly/tags/threads/SleepTag.java | 1 +
.../commons/jelly/tags/threads/ThreadTag.java | 2 ++
.../commons/jelly/tags/threads/UseMutexTag.java | 1 +
.../commons/jelly/tags/threads/UseThreadTag.java | 1 +
.../commons/jelly/tags/threads/WaitForTag.java | 1 +
.../commons/jelly/tags/util/AvailableTag.java | 1 +
.../apache/commons/jelly/tags/util/FileTag.java | 1 +
.../commons/jelly/tags/util/LoadTextTag.java | 1 +
.../commons/jelly/tags/util/PropertiesTag.java | 1 +
.../apache/commons/jelly/tags/util/ReplaceTag.java | 1 +
.../apache/commons/jelly/tags/util/SleepTag.java | 1 +
.../apache/commons/jelly/tags/util/SortTag.java | 1 +
.../commons/jelly/tags/util/TokenizeTag.java | 1 +
.../apache/commons/jelly/tags/util/Customer.java | 1 +
.../jelly/tags/validate/AssertValidTag.java | 3 +++
.../commons/jelly/tags/validate/ValidateTag.java | 3 +++
.../commons/jelly/tags/validate/VerifierTag.java | 1 +
.../jelly/tags/velocity/JellyContextAdapter.java | 5 +++++
.../commons/jelly/tags/velocity/MergeTag.java | 1 +
.../tags/velocity/JellyContextAdapterTest.java | 1 +
.../commons/jelly/tags/xml/AttributeTag.java | 1 +
.../apache/commons/jelly/tags/xml/CommentTag.java | 1 +
.../apache/commons/jelly/tags/xml/CopyOfTag.java | 1 +
.../org/apache/commons/jelly/tags/xml/CopyTag.java | 1 +
.../apache/commons/jelly/tags/xml/DoctypeTag.java | 1 +
.../apache/commons/jelly/tags/xml/ElementTag.java | 7 +++++++
.../org/apache/commons/jelly/tags/xml/ExprTag.java | 1 +
.../apache/commons/jelly/tags/xml/ForEachTag.java | 3 +++
.../org/apache/commons/jelly/tags/xml/IfTag.java | 2 ++
.../apache/commons/jelly/tags/xml/ParamTag.java | 1 +
.../apache/commons/jelly/tags/xml/ParseTag.java | 2 ++
.../jelly/tags/xml/ReplaceNamespaceTag.java | 4 ++++
.../org/apache/commons/jelly/tags/xml/SetTag.java | 1 +
.../org/apache/commons/jelly/tags/xml/SortTag.java | 1 +
.../commons/jelly/tags/xml/TransformTag.java | 16 ++++++++++++++++
.../commons/jelly/tags/xml/XMLTagLibrary.java | 1 +
.../commons/jelly/tags/xmlunit/ActualTag.java | 2 ++
.../tags/xmlunit/AssertDocumentsEqualTag.java | 2 ++
.../commons/jelly/tags/xmlunit/ExpectedTag.java | 2 ++
282 files changed, 558 insertions(+), 23 deletions(-)
diff --git a/jelly-tags/antlr/src/main/java/org/apache/commons/jelly/tags/antlr/AntlrTag.java b/jelly-tags/antlr/src/main/java/org/apache/commons/jelly/tags/antlr/AntlrTag.java
index b700b138..2947961e 100644
--- a/jelly-tags/antlr/src/main/java/org/apache/commons/jelly/tags/antlr/AntlrTag.java
+++ b/jelly-tags/antlr/src/main/java/org/apache/commons/jelly/tags/antlr/AntlrTag.java
@@ -50,6 +50,7 @@ public class AntlrTag extends TagSupport
* Evaluate the body to register all the various goals and pre/post conditions
* then run all the current targets
*/
+ @Override
public void doTag(final XMLOutput output) throws MissingAttributeException, JellyTagException
{
if ( this.outputDir == null )
@@ -197,10 +198,12 @@ class NoExitSecurityManager extends SecurityManager
{
}
+ @Override
public void checkPermission(Permission permission)
{
}
+ @Override
public void checkExit(int status)
{
throw new SecurityException( "exitVM-" + status );
diff --git a/jelly-tags/antlr/src/main/java/org/apache/commons/jelly/tags/antlr/GrammarTag.java b/jelly-tags/antlr/src/main/java/org/apache/commons/jelly/tags/antlr/GrammarTag.java
index a183b8c7..cdd4157d 100644
--- a/jelly-tags/antlr/src/main/java/org/apache/commons/jelly/tags/antlr/GrammarTag.java
+++ b/jelly-tags/antlr/src/main/java/org/apache/commons/jelly/tags/antlr/GrammarTag.java
@@ -31,6 +31,7 @@ public class GrammarTag extends TagSupport
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(final XMLOutput output) throws JellyTagException
{
String grammar = getBodyText();
diff --git a/jelly-tags/avalon/src/main/java/org/apache/commons/jelly/avalon/JellyServiceImpl.java b/jelly-tags/avalon/src/main/java/org/apache/commons/jelly/avalon/JellyServiceImpl.java
index 076db04e..d48f193b 100644
--- a/jelly-tags/avalon/src/main/java/org/apache/commons/jelly/avalon/JellyServiceImpl.java
+++ b/jelly-tags/avalon/src/main/java/org/apache/commons/jelly/avalon/JellyServiceImpl.java
@@ -60,6 +60,7 @@ public class JellyServiceImpl implements JellyService, Configurable {
/**
* @see org.apache.commons.jelly.avalon.JellyService#runNamedScript(String, Map)
*/
+ @Override
public Map runNamedScript( String name, Map params ) throws Exception {
return runNamedScript(name, params, createXMLOutput());
}
@@ -67,6 +68,7 @@ public class JellyServiceImpl implements JellyService, Configurable {
/**
* @see org.apache.commons.jelly.avalon.JellyService#runNamedScript(String, Map, XMLOutput)
*/
+ @Override
public Map runNamedScript( String name, Map params, XMLOutput output ) throws Exception {
if ( !m_scripts.containsKey( name ) )
throw new JellyException( "No script exists for script name [" + name + "]" );
@@ -83,6 +85,7 @@ public class JellyServiceImpl implements JellyService, Configurable {
/**
* @see org.apache.commons.jelly.avalon.JellyService#runNamedScript(String, Map, OutputStream)
*/
+ @Override
public Map runNamedScript( String name, Map params, OutputStream out ) throws Exception {
XMLOutput xmlOutput = XMLOutput.createXMLOutput( out );
Map answer = runNamedScript(name, params, xmlOutput);
@@ -93,6 +96,7 @@ public class JellyServiceImpl implements JellyService, Configurable {
/**
* @see org.apache.commons.jelly.avalon.JellyService#runScript(String, Map, XMLOutput)
*/
+ @Override
public Map runScript( String url, Map params, XMLOutput output ) throws Exception {
URL actualUrl = null;
try {
@@ -115,6 +119,7 @@ public class JellyServiceImpl implements JellyService, Configurable {
/**
* @see org.apache.commons.jelly.avalon.JellyService#runScript(String, Map, OutputStream)
*/
+ @Override
public Map runScript( String url, Map params, OutputStream out ) throws Exception {
XMLOutput xmlOutput = XMLOutput.createXMLOutput( out );
Map answer = runScript(url, params, xmlOutput);
@@ -125,6 +130,7 @@ public class JellyServiceImpl implements JellyService, Configurable {
/**
* @see org.apache.commons.jelly.avalon.JellyService#runScript(String, Map)
*/
+ @Override
public Map runScript( String url, Map params ) throws Exception {
return runScript(url, params, createXMLOutput());
}
@@ -156,6 +162,7 @@ public class JellyServiceImpl implements JellyService, Configurable {
* @param config The configuration
* @throws ConfigurationException
*/
+ @Override
public void configure( Configuration config ) throws ConfigurationException {
if ( m_configured )
throw new ConfigurationException( "configure may only be executed once" );
diff --git a/jelly-tags/bean/src/main/java/org/apache/commons/jelly/tags/bean/BeanPropertyTag.java b/jelly-tags/bean/src/main/java/org/apache/commons/jelly/tags/bean/BeanPropertyTag.java
index 1d56f886..cebae3de 100644
--- a/jelly-tags/bean/src/main/java/org/apache/commons/jelly/tags/bean/BeanPropertyTag.java
+++ b/jelly-tags/bean/src/main/java/org/apache/commons/jelly/tags/bean/BeanPropertyTag.java
@@ -59,6 +59,7 @@ public class BeanPropertyTag extends BeanTag {
/**
* Creates a new instance by calling a create method on the parent bean
*/
+ @Override
protected Object newInstance(Class theClass, Map attributes, XMLOutput output) throws JellyTagException {
Object parentObject = getParentObject();
if (parentObject != null) {
diff --git a/jelly-tags/bean/src/main/java/org/apache/commons/jelly/tags/bean/BeanTag.java b/jelly-tags/bean/src/main/java/org/apache/commons/jelly/tags/bean/BeanTag.java
index 5a26cdd1..fb1ee2d9 100644
--- a/jelly-tags/bean/src/main/java/org/apache/commons/jelly/tags/bean/BeanTag.java
+++ b/jelly-tags/bean/src/main/java/org/apache/commons/jelly/tags/bean/BeanTag.java
@@ -88,6 +88,7 @@ public class BeanTag extends UseBeanTag {
* Output the tag as a named variable. If the parent bean has an adder or setter
* method then invoke that to register this bean with its parent.
*/
+ @Override
protected void processBean(String var, Object bean) throws JellyTagException {
if (var != null) {
context.setVariable(var, bean);
diff --git a/jelly-tags/bean/src/main/java/org/apache/commons/jelly/tags/bean/BeanTagLibrary.java b/jelly-tags/bean/src/main/java/org/apache/commons/jelly/tags/bean/BeanTagLibrary.java
index 55acfd02..fc947282 100644
--- a/jelly-tags/bean/src/main/java/org/apache/commons/jelly/tags/bean/BeanTagLibrary.java
+++ b/jelly-tags/bean/src/main/java/org/apache/commons/jelly/tags/bean/BeanTagLibrary.java
@@ -45,6 +45,7 @@ public class BeanTagLibrary extends TagLibrary {
registerTagFactory(
"beandef",
new TagFactory() {
+ @Override
public Tag createTag(String name, Attributes attributes) throws JellyException {
return new BeandefTag(BeanTagLibrary.this);
}
@@ -84,6 +85,7 @@ public class BeanTagLibrary extends TagLibrary {
// TagLibrary interface
//-------------------------------------------------------------------------
+ @Override
public TagScript createTagScript(
final String name, final Attributes attributes
) throws JellyException {
@@ -107,6 +109,7 @@ public class BeanTagLibrary extends TagLibrary {
protected TagFactory createTagFactory(String name, Attributes attributes) throws JellyException {
return new TagFactory() {
+ @Override
public Tag createTag(String name, Attributes attributes) throws JellyException {
return createBeanTag(name, attributes);
}
diff --git a/jelly-tags/bean/src/main/java/org/apache/commons/jelly/tags/bean/BeandefTag.java b/jelly-tags/bean/src/main/java/org/apache/commons/jelly/tags/bean/BeandefTag.java
index 745ed95a..7cd61e48 100644
--- a/jelly-tags/bean/src/main/java/org/apache/commons/jelly/tags/bean/BeandefTag.java
+++ b/jelly-tags/bean/src/main/java/org/apache/commons/jelly/tags/bean/BeandefTag.java
@@ -68,6 +68,7 @@ public class BeandefTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
invokeBody(output);
diff --git a/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/Customer.java b/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/Customer.java
index 4c2f51c4..d3daa24a 100644
--- a/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/Customer.java
+++ b/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/Customer.java
@@ -61,6 +61,7 @@ public class Customer {
}
}
+ @Override
public String toString() {
return super.toString() + "[name=" + name + ";location=" + location + "]";
}
diff --git a/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/Manager.java b/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/Manager.java
index 06e69376..76752882 100644
--- a/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/Manager.java
+++ b/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/Manager.java
@@ -39,6 +39,7 @@ public class Manager {
public Manager() {
}
+ @Override
public String toString() {
return super.toString() + "[customers=" + customers + "]";
}
diff --git a/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/MyContainerTag.java b/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/MyContainerTag.java
index fb719bd5..6959402b 100644
--- a/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/MyContainerTag.java
+++ b/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/MyContainerTag.java
@@ -40,6 +40,7 @@ public class MyContainerTag extends TagSupport implements CollectionTag {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
invokeBody(output);
context.setVariable(var, list);
@@ -48,6 +49,7 @@ public class MyContainerTag extends TagSupport implements CollectionTag {
// CollectionTag interface
//-------------------------------------------------------------------------
+ @Override
public void addItem(Object value) {
list.add(value);
}
diff --git a/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/MyTagLibrary.java b/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/MyTagLibrary.java
index 30c0f147..74e018e5 100644
--- a/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/MyTagLibrary.java
+++ b/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/MyTagLibrary.java
@@ -39,9 +39,11 @@ public class MyTagLibrary extends TagLibrary {
// TagLibrary interface
//-------------------------------------------------------------------------
+ @Override
public TagScript createTagScript(String name, Attributes attributes) throws JellyException {
TagFactory factory = new TagFactory() {
+ @Override
public Tag createTag(String name, Attributes attributes) throws JellyException {
return createBeanTag(name, attributes);
}
diff --git a/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/Order.java b/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/Order.java
index 04296d7b..e7762ea9 100644
--- a/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/Order.java
+++ b/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/Order.java
@@ -36,6 +36,7 @@ public class Order {
public Order() {
}
+ @Override
public String toString() {
return "Order[amount=" + amount + ";price=" + price + ";product=" + product + "]";
}
diff --git a/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/Product.java b/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/Product.java
index ba2245d9..a6de684a 100644
--- a/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/Product.java
+++ b/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/Product.java
@@ -35,6 +35,7 @@ public class Product {
public Product() {
}
+ @Override
public String toString() {
return "Product[id=" + id + ";name=" + name + "]";
}
diff --git a/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpression.java b/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpression.java
index 2ddfb678..a42520d0 100644
--- a/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpression.java
+++ b/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpression.java
@@ -41,10 +41,12 @@ public class BeanShellExpression extends ExpressionSupport {
// Expression interface
//-------------------------------------------------------------------------
+ @Override
public String getExpressionText() {
return "${" + text + "}";
}
+ @Override
public Object evaluate(JellyContext context) {
try {
JellyInterpreter interpreter = new JellyInterpreter();
diff --git a/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpressionFactory.java b/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpressionFactory.java
index 50a64437..104c5a93 100644
--- a/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpressionFactory.java
+++ b/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpressionFactory.java
@@ -57,6 +57,7 @@ public class BeanShellExpressionFactory implements ExpressionFactory {
// ExpressionFactory interface
//-------------------------------------------------------------------------
+ @Override
public Expression createExpression(String text) throws JellyException {
return new BeanShellExpression(text);
}
diff --git a/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/ScriptTag.java b/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/ScriptTag.java
index 3288c40f..6de2e78c 100644
--- a/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/ScriptTag.java
+++ b/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/ScriptTag.java
@@ -35,6 +35,7 @@ public class ScriptTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
try {
JellyInterpreter interpreter = BeanShellExpressionFactory.getInterpreter(context);
diff --git a/jelly-tags/beanshell/src/test/java/org/apache/commons/jelly/tags/beanshell/TestBeanShellEL.java b/jelly-tags/beanshell/src/test/java/org/apache/commons/jelly/tags/beanshell/TestBeanShellEL.java
index 58443186..ec09a175 100644
--- a/jelly-tags/beanshell/src/test/java/org/apache/commons/jelly/tags/beanshell/TestBeanShellEL.java
+++ b/jelly-tags/beanshell/src/test/java/org/apache/commons/jelly/tags/beanshell/TestBeanShellEL.java
@@ -58,6 +58,7 @@ public class TestBeanShellEL extends TestCase {
super(testName);
}
+ @Override
public void setUp() {
context = new JellyContext();
context.setVariable( "foo", "abc" );
diff --git a/jelly-tags/betwixt/src/main/java/org/apache/commons/jelly/tags/betwixt/IntrospectorTag.java b/jelly-tags/betwixt/src/main/java/org/apache/commons/jelly/tags/betwixt/IntrospectorTag.java
index a8cc6d26..155e8efb 100644
--- a/jelly-tags/betwixt/src/main/java/org/apache/commons/jelly/tags/betwixt/IntrospectorTag.java
+++ b/jelly-tags/betwixt/src/main/java/org/apache/commons/jelly/tags/betwixt/IntrospectorTag.java
@@ -51,6 +51,7 @@ public class IntrospectorTag extends TagSupport {
// register converters to standard Strategies
ConvertUtils.register(
new Converter() {
+ @Override
public Object convert(Class type, Object value) {
if ( value instanceof String ) {
return createNameMapper((String) value);
@@ -78,6 +79,7 @@ public class IntrospectorTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(final XMLOutput output) throws MissingAttributeException, JellyTagException {
if ( var == null ) {
diff --git a/jelly-tags/betwixt/src/main/java/org/apache/commons/jelly/tags/betwixt/ParseTag.java b/jelly-tags/betwixt/src/main/java/org/apache/commons/jelly/tags/betwixt/ParseTag.java
index 9e2d860a..0d9ad8ce 100644
--- a/jelly-tags/betwixt/src/main/java/org/apache/commons/jelly/tags/betwixt/ParseTag.java
+++ b/jelly-tags/betwixt/src/main/java/org/apache/commons/jelly/tags/betwixt/ParseTag.java
@@ -66,6 +66,7 @@ public class ParseTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(final XMLOutput output) throws MissingAttributeException, JellyTagException {
if ( var == null ) {
throw new MissingAttributeException( "var" );
diff --git a/jelly-tags/betwixt/src/test/java/org/apache/commons/digester/rss/RSSDigester.java b/jelly-tags/betwixt/src/test/java/org/apache/commons/digester/rss/RSSDigester.java
index 459a95b1..003a82d9 100644
--- a/jelly-tags/betwixt/src/test/java/org/apache/commons/digester/rss/RSSDigester.java
+++ b/jelly-tags/betwixt/src/test/java/org/apache/commons/digester/rss/RSSDigester.java
@@ -148,6 +148,7 @@ public class RSSDigester extends Digester {
* @throws IOException if an input/output error occurs
* @throws SAXException if a parsing exception occurs
*/
+ @Override
public Object parse(File file) throws IOException, SAXException {
configure();
@@ -166,6 +167,7 @@ public class RSSDigester extends Digester {
* @throws IOException if an input/output error occurs
* @throws SAXException if a parsing exception occurs
*/
+ @Override
public Object parse(InputSource input) throws IOException, SAXException {
configure();
@@ -184,6 +186,7 @@ public class RSSDigester extends Digester {
* @throws IOException if an input/output error occurs
* @throws SAXException if a parsing exception occurs
*/
+ @Override
public Object parse(InputStream input) throws IOException, SAXException {
configure();
@@ -202,6 +205,7 @@ public class RSSDigester extends Digester {
* @throws IOException if an input/output error occurs
* @throws SAXException if a parsing exception occurs
*/
+ @Override
public Object parse(String uri) throws IOException, SAXException {
configure();
@@ -220,6 +224,7 @@ public class RSSDigester extends Digester {
/**
* Configure the parsing rules that will be used to process RSS input.
*/
+ @Override
protected void configure() {
if (configured) {
diff --git a/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/BSFExpression.java b/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/BSFExpression.java
index 298c5702..509ab4d9 100644
--- a/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/BSFExpression.java
+++ b/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/BSFExpression.java
@@ -57,10 +57,12 @@ public class BSFExpression extends ExpressionSupport {
// Expression interface
//-------------------------------------------------------------------------
+ @Override
public String getExpressionText() {
return "${" + text + "}";
}
+ @Override
public Object evaluate(JellyContext context) {
// XXXX: unfortunately we must synchronize evaluations
// so that we can swizzle in the context.
diff --git a/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/BSFExpressionFactory.java b/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/BSFExpressionFactory.java
index ca8ae214..ea380d41 100644
--- a/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/BSFExpressionFactory.java
+++ b/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/BSFExpressionFactory.java
@@ -82,6 +82,7 @@ public class BSFExpressionFactory implements ExpressionFactory {
// ExpressionFactory interface
//-------------------------------------------------------------------------
+ @Override
public Expression createExpression(String text) throws JellyException {
try {
return new BSFExpression( text, getBSFEngine(), getBSFManager(), registry );
diff --git a/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/BSFTagLibrary.java b/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/BSFTagLibrary.java
index 1bb3fb90..7749cc93 100644
--- a/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/BSFTagLibrary.java
+++ b/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/BSFTagLibrary.java
@@ -39,6 +39,7 @@ public class BSFTagLibrary extends CoreTagLibrary {
registerTagFactory(
"script",
new TagFactory() {
+ @Override
public Tag createTag(String name, Attributes attributes)
throws JellyException {
return createScriptTag(name, attributes);
diff --git a/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/JellyContextRegistry.java b/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/JellyContextRegistry.java
index dbe761fc..ca4516ec 100644
--- a/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/JellyContextRegistry.java
+++ b/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/JellyContextRegistry.java
@@ -48,10 +48,12 @@ public class JellyContextRegistry extends ObjectRegistry {
// ObjectRegistry interface
//-------------------------------------------------------------------------
+ @Override
public Object lookup(String name) {
return context.getVariable(name);
}
+ @Override
public void register(String name, Object value) {
context.setVariable(name, value);
}
diff --git a/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/ScriptTag.java b/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/ScriptTag.java
index bff33a54..f56612dd 100644
--- a/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/ScriptTag.java
+++ b/jelly-tags/bsf/src/main/java/org/apache/commons/jelly/tags/bsf/ScriptTag.java
@@ -54,6 +54,7 @@ public class ScriptTag extends TagSupport implements LocationAware {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
String text = getBodyText();
@@ -86,6 +87,7 @@ public class ScriptTag extends TagSupport implements LocationAware {
/**
* @return int
*/
+ @Override
public int getColumnNumber() {
return columnNumber;
}
@@ -93,6 +95,7 @@ public class ScriptTag extends TagSupport implements LocationAware {
/**
* @return String
*/
+ @Override
public String getElementName() {
return elementName;
}
@@ -107,6 +110,7 @@ public class ScriptTag extends TagSupport implements LocationAware {
/**
* @return String
*/
+ @Override
public String getFileName() {
return fileName;
}
@@ -114,6 +118,7 @@ public class ScriptTag extends TagSupport implements LocationAware {
/**
* @return int
*/
+ @Override
public int getLineNumber() {
return lineNumber;
}
@@ -122,6 +127,7 @@ public class ScriptTag extends TagSupport implements LocationAware {
* Sets the columnNumber.
* @param columnNumber The columnNumber to set
*/
+ @Override
public void setColumnNumber(int columnNumber) {
this.columnNumber = columnNumber;
}
@@ -130,6 +136,7 @@ public class ScriptTag extends TagSupport implements LocationAware {
* Sets the elementName.
* @param elementName The elementName to set
*/
+ @Override
public void setElementName(String elementName) {
this.elementName = elementName;
}
@@ -146,6 +153,7 @@ public class ScriptTag extends TagSupport implements LocationAware {
* Sets the fileName.
* @param fileName The fileName to set
*/
+ @Override
public void setFileName(String fileName) {
this.fileName = fileName;
}
@@ -154,6 +162,7 @@ public class ScriptTag extends TagSupport implements LocationAware {
* Sets the lineNumber.
* @param lineNumber The lineNumber to set
*/
+ @Override
public void setLineNumber(int lineNumber) {
this.lineNumber = lineNumber;
}
diff --git a/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/AttributeTag.java b/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/AttributeTag.java
index b44b19ed..e2eb24da 100644
--- a/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/AttributeTag.java
+++ b/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/AttributeTag.java
@@ -54,6 +54,7 @@ public class AttributeTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
BeanTag tag = (BeanTag) findAncestorWithClass( BeanTag.class );
if ( tag == null ) {
diff --git a/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/BeanTag.java b/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/BeanTag.java
index 90381a1f..29f3831f 100644
--- a/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/BeanTag.java
+++ b/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/BeanTag.java
@@ -76,6 +76,7 @@ public class BeanTag extends DefineTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
invokeBody(output);
@@ -105,6 +106,7 @@ public class BeanTag extends DefineTagSupport {
final Map beanAttributes = (attributes != null) ? attributes : EMPTY_MAP;
TagFactory factory = new TagFactory() {
+ @Override
public Tag createTag(String name, Attributes attributes) {
return new DynamicBeanTag(beanClass, beanAttributes, varAttribute, invokeMethod);
}
diff --git a/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/ClassLoaderTag.java b/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/ClassLoaderTag.java
index 19c1e4b1..d99643be 100644
--- a/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/ClassLoaderTag.java
+++ b/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/ClassLoaderTag.java
@@ -80,6 +80,7 @@ public class ClassLoaderTag extends BeanTag {
// Implementation methods
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
if ( getVar() == null ) {
throw new MissingAttributeException( "var" );
diff --git a/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/DynaBeanTag.java b/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/DynaBeanTag.java
index 5cae8d79..2ec5dba4 100644
--- a/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/DynaBeanTag.java
+++ b/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/DynaBeanTag.java
@@ -70,6 +70,7 @@ public class DynaBeanTag extends DefineTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
invokeBody(output);
@@ -84,6 +85,7 @@ public class DynaBeanTag extends DefineTagSupport {
final Map beanAttributes = (attributes != null) ? attributes : EMPTY_MAP;
TagFactory factory = new TagFactory() {
+ @Override
public Tag createTag(String name, Attributes attributes) {
return new DynamicDynaBeanTag(theDynaClass, beanAttributes, varAttribute);
}
diff --git a/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/ExtendTag.java b/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/ExtendTag.java
index 3e2be4a8..22daff96 100644
--- a/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/ExtendTag.java
+++ b/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/ExtendTag.java
@@ -39,6 +39,7 @@ public class ExtendTag extends DefineTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
DynamicTagLibrary library = getTagLibrary();
DynamicTagLibrary owner = library.find(getName());
diff --git a/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/InvokeBodyTag.java b/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/InvokeBodyTag.java
index 2481734f..6a663df8 100644
--- a/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/InvokeBodyTag.java
+++ b/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/InvokeBodyTag.java
@@ -42,6 +42,7 @@ public class InvokeBodyTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
// Try find find the body from the reserved 'org.apache.commons.jelly.body' variable
Script script = (Script) context.getVariable("org.apache.commons.jelly.body");
diff --git a/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/InvokeTag.java b/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/InvokeTag.java
index a77bcb9c..bf6874ca 100644
--- a/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/InvokeTag.java
+++ b/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/InvokeTag.java
@@ -52,6 +52,7 @@ public class InvokeTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
if ( script == null ) {
throw new MissingAttributeException("script");
diff --git a/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/JellyBeanTag.java b/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/JellyBeanTag.java
index 523508b1..b579ef74 100644
--- a/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/JellyBeanTag.java
+++ b/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/JellyBeanTag.java
@@ -71,6 +71,7 @@ public class JellyBeanTag extends BeanTag {
// Implementation methods
//-------------------------------------------------------------------------
+ @Override
protected Method getInvokeMethod( Class theClass ) {
Method invokeMethod =
MethodUtils.getAccessibleMethod(
diff --git a/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/ScriptTag.java b/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/ScriptTag.java
index 2baa2def..a855369a 100644
--- a/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/ScriptTag.java
+++ b/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/ScriptTag.java
@@ -39,6 +39,7 @@ public class ScriptTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
if ( var == null ) {
throw new JellyTagException( "<define:script> must have a var attribute" );
diff --git a/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/SuperTag.java b/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/SuperTag.java
index 1e83fecd..21a81061 100644
--- a/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/SuperTag.java
+++ b/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/SuperTag.java
@@ -34,6 +34,7 @@ public class SuperTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
ExtendTag tag = (ExtendTag) findAncestorWithClass(ExtendTag.class);
if (tag == null) {
diff --git a/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/TagTag.java b/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/TagTag.java
index 53144cc0..755af789 100644
--- a/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/TagTag.java
+++ b/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/TagTag.java
@@ -39,6 +39,7 @@ public class TagTag extends DefineTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
getTagLibrary().registerDynamicTag( getName(), getBody() );
}
diff --git a/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/TaglibTag.java b/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/TaglibTag.java
index 9a5e55aa..777f1276 100644
--- a/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/TaglibTag.java
+++ b/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/TaglibTag.java
@@ -51,6 +51,7 @@ public class TaglibTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
String uri = getUri();
tagLibrary = new DynamicTagLibrary( uri );
diff --git a/jelly-tags/define/src/test/java/org/apache/commons/jelly/tags/define/DynamicTag.java b/jelly-tags/define/src/test/java/org/apache/commons/jelly/tags/define/DynamicTag.java
index 1a90f0e9..12803b8e 100644
--- a/jelly-tags/define/src/test/java/org/apache/commons/jelly/tags/define/DynamicTag.java
+++ b/jelly-tags/define/src/test/java/org/apache/commons/jelly/tags/define/DynamicTag.java
@@ -31,6 +31,7 @@ public class DynamicTag extends TagSupport
/**
* @see org.apache.commons.jelly.Tag#doTag(XMLOutput)
*/
+ @Override
public void doTag(XMLOutput output) throws JellyTagException
{
try {
diff --git a/jelly-tags/define/src/test/java/org/apache/commons/jelly/tags/define/MyRunnable.java b/jelly-tags/define/src/test/java/org/apache/commons/jelly/tags/define/MyRunnable.java
index cfa6bcf7..0e6d176d 100644
--- a/jelly-tags/define/src/test/java/org/apache/commons/jelly/tags/define/MyRunnable.java
+++ b/jelly-tags/define/src/test/java/org/apache/commons/jelly/tags/define/MyRunnable.java
@@ -56,6 +56,7 @@ public class MyRunnable implements Runnable {
// Runnable interface
//-------------------------------------------------------------------------
+ @Override
public void run() {
log.info( "About to do something where x = " + getX() + " y = " + getY() );
log.info( "FileSets are: " + fileSets );
diff --git a/jelly-tags/dynabean/src/main/java/org/apache/commons/jelly/tags/dynabean/DynabeanTag.java b/jelly-tags/dynabean/src/main/java/org/apache/commons/jelly/tags/dynabean/DynabeanTag.java
index 31094a5f..e32a3f94 100644
--- a/jelly-tags/dynabean/src/main/java/org/apache/commons/jelly/tags/dynabean/DynabeanTag.java
+++ b/jelly-tags/dynabean/src/main/java/org/apache/commons/jelly/tags/dynabean/DynabeanTag.java
@@ -38,6 +38,7 @@ public class DynabeanTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
if (dynaClass == null) {
diff --git a/jelly-tags/dynabean/src/main/java/org/apache/commons/jelly/tags/dynabean/DynaclassTag.java b/jelly-tags/dynabean/src/main/java/org/apache/commons/jelly/tags/dynabean/DynaclassTag.java
index 9b2a7783..fadc2c91 100644
--- a/jelly-tags/dynabean/src/main/java/org/apache/commons/jelly/tags/dynabean/DynaclassTag.java
+++ b/jelly-tags/dynabean/src/main/java/org/apache/commons/jelly/tags/dynabean/DynaclassTag.java
@@ -49,6 +49,7 @@ public class DynaclassTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
if (name == null) {
diff --git a/jelly-tags/dynabean/src/main/java/org/apache/commons/jelly/tags/dynabean/PropertyTag.java b/jelly-tags/dynabean/src/main/java/org/apache/commons/jelly/tags/dynabean/PropertyTag.java
index 67872027..d25adf2e 100644
--- a/jelly-tags/dynabean/src/main/java/org/apache/commons/jelly/tags/dynabean/PropertyTag.java
+++ b/jelly-tags/dynabean/src/main/java/org/apache/commons/jelly/tags/dynabean/PropertyTag.java
@@ -44,6 +44,7 @@ public class PropertyTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag (XMLOutput output) throws MissingAttributeException, JellyTagException {
// Check that this tag is used inside the body of
diff --git a/jelly-tags/dynabean/src/main/java/org/apache/commons/jelly/tags/dynabean/SetTag.java b/jelly-tags/dynabean/src/main/java/org/apache/commons/jelly/tags/dynabean/SetTag.java
index 1d265371..b6f7138b 100644
--- a/jelly-tags/dynabean/src/main/java/org/apache/commons/jelly/tags/dynabean/SetTag.java
+++ b/jelly-tags/dynabean/src/main/java/org/apache/commons/jelly/tags/dynabean/SetTag.java
@@ -56,6 +56,7 @@ public class SetTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
Object answer = null;
if ( value != null ) {
diff --git a/jelly-tags/email/src/main/java/org/apache/commons/jelly/tags/email/EmailTag.java b/jelly-tags/email/src/main/java/org/apache/commons/jelly/tags/email/EmailTag.java
index ad9501fe..1be12c66 100644
--- a/jelly-tags/email/src/main/java/org/apache/commons/jelly/tags/email/EmailTag.java
+++ b/jelly-tags/email/src/main/java/org/apache/commons/jelly/tags/email/EmailTag.java
@@ -143,6 +143,7 @@ public class EmailTag extends TagSupport {
/**
* Execute the tag
*/
+ @Override
public void doTag(XMLOutput xmlOutput) throws JellyTagException {
Properties props = new Properties();
props.putAll(context.getVariables());
diff --git a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/BundleTag.java b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/BundleTag.java
index 8d23b8fa..4315310d 100644
--- a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/BundleTag.java
+++ b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/BundleTag.java
@@ -86,6 +86,7 @@ public class BundleTag extends TagSupport {
* Evaluates this tag after all the tags properties have been initialized.
*
*/
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
Object basenameInput = null;
if (this.basename != null) {
diff --git a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/FormatDateTag.java b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/FormatDateTag.java
index c63aa24d..b2d57b31 100644
--- a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/FormatDateTag.java
+++ b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/FormatDateTag.java
@@ -88,6 +88,7 @@ public class FormatDateTag extends TagSupport {
* Evaluates this tag after all the tags properties have been initialized.
*
*/
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
if (scope != null && var == null) {
diff --git a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/MessageTag.java b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/MessageTag.java
index 3fe2adab..aeeb022c 100644
--- a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/MessageTag.java
+++ b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/MessageTag.java
@@ -65,6 +65,7 @@ public class MessageTag extends TagSupport {
params.add(arg);
}
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
Object keyInput = null;
diff --git a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/ParamTag.java b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/ParamTag.java
index 5af924cb..2d607c4d 100644
--- a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/ParamTag.java
+++ b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/ParamTag.java
@@ -43,6 +43,7 @@ public class ParamTag extends TagSupport {
* Evaluates this tag after all the tags properties have been initialized.
*
*/
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
MessageTag parent = null;
Tag t = findAncestorWithClass(this, MessageTag.class);
diff --git a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/SetBundleTag.java b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/SetBundleTag.java
index 8e38ac23..10cc9bde 100644
--- a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/SetBundleTag.java
+++ b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/SetBundleTag.java
@@ -43,6 +43,7 @@ public class SetBundleTag extends TagSupport {
* Evaluates this tag after all the tags properties have been initialized.
*
*/
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
Object basenameInput = null;
if (this.basename != null) {
diff --git a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/SetLocaleTag.java b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/SetLocaleTag.java
index 2c93c508..adabed0e 100644
--- a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/SetLocaleTag.java
+++ b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/SetLocaleTag.java
@@ -51,6 +51,7 @@ public class SetLocaleTag extends TagSupport {
* Evaluates this tag after all the tags properties have been initialized.
*
*/
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
Locale locale = null;
diff --git a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/SetTimeZoneTag.java b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/SetTimeZoneTag.java
index 3dc84382..4fec9485 100644
--- a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/SetTimeZoneTag.java
+++ b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/SetTimeZoneTag.java
@@ -44,6 +44,7 @@ public class SetTimeZoneTag extends TagSupport {
* Evaluates this tag after all the tags properties have been initialized.
*
*/
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
TimeZone timeZone = null;
diff --git a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/TimeZoneTag.java b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/TimeZoneTag.java
index b5e7c41a..78511721 100644
--- a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/TimeZoneTag.java
+++ b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/TimeZoneTag.java
@@ -63,6 +63,7 @@ public class TimeZoneTag extends TagSupport {
* Evaluates this tag after all the tags properties have been initialized.
*
*/
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
Object valueInput = null;
if (this.value != null) {
diff --git a/jelly-tags/html/src/main/java/org/apache/commons/jelly/tags/html/ParseTag.java b/jelly-tags/html/src/main/java/org/apache/commons/jelly/tags/html/ParseTag.java
index 66571130..48863011 100644
--- a/jelly-tags/html/src/main/java/org/apache/commons/jelly/tags/html/ParseTag.java
+++ b/jelly-tags/html/src/main/java/org/apache/commons/jelly/tags/html/ParseTag.java
@@ -52,6 +52,7 @@ public class ParseTag extends ParseTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
if (getVar() == null) {
throw new IllegalArgumentException("The var attribute cannot be null");
@@ -106,6 +107,7 @@ public class ParseTag extends ParseTagSupport {
/**
* Factory method to create a new SAXReader
*/
+ @Override
protected SAXReader createSAXReader() throws SAXException {
// installs the NeckHTML parser
SAXParser parser = new SAXParser();
diff --git a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/BodyTag.java b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/BodyTag.java
index 14966be7..dd08b5ee 100644
--- a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/BodyTag.java
+++ b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/BodyTag.java
@@ -45,6 +45,7 @@ public class BodyTag extends TagSupport {
* @param xmlOutput for writing output to
* @throws JellyTagException when any error occurs
*/
+ @Override
public void doTag(XMLOutput xmlOutput) throws JellyTagException {
HttpTagSupport httpTag = (HttpTagSupport) findAncestorWithClass(
HttpTagSupport.class);
diff --git a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/DeleteTag.java b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/DeleteTag.java
index 5359de9e..d0e49993 100644
--- a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/DeleteTag.java
+++ b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/DeleteTag.java
@@ -42,6 +42,7 @@ public class DeleteTag extends HttpTagSupport {
* @return a url method for a get request
* @throws MalformedURLException when the url is bad
*/
+ @Override
protected HttpMethod getHttpMethod() throws MalformedURLException {
if (_deleteMethod == null) {
_deleteMethod = new DeleteMethod(getResolvedUrl());
diff --git a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/GetTag.java b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/GetTag.java
index c6aaedec..4820649f 100644
--- a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/GetTag.java
+++ b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/GetTag.java
@@ -42,6 +42,7 @@ public class GetTag extends HttpTagSupport {
* @return a url method for a get request
* @throws MalformedURLException when the url is bad
*/
+ @Override
protected HttpMethod getHttpMethod() throws MalformedURLException {
if (_getMethod == null) {
_getMethod = new GetMethod(getResolvedUrl());
diff --git a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/HeadTag.java b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/HeadTag.java
index f6fcf48e..5fa8c0e5 100644
--- a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/HeadTag.java
+++ b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/HeadTag.java
@@ -42,6 +42,7 @@ public class HeadTag extends HttpTagSupport {
* @return a url method for a Head request
* @throws MalformedURLException when the url is bad
*/
+ @Override
protected HttpMethod getHttpMethod() throws MalformedURLException {
if (_headMethod == null) {
_headMethod = new HeadMethod(getResolvedUrl());
diff --git a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/HeaderTag.java b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/HeaderTag.java
index 590dc7f8..339ed5a1 100644
--- a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/HeaderTag.java
+++ b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/HeaderTag.java
@@ -42,6 +42,7 @@ public class HeaderTag extends TagSupport {
* @param xmlOutput where to send output
* @throws JellyTagException when an error occurs
*/
+ @Override
public void doTag(XMLOutput xmlOutput) throws JellyTagException {
HttpTagSupport http = (HttpTagSupport) findAncestorWithClass(
HttpTagSupport.class);
diff --git a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/HttpTagLibrary.java b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/HttpTagLibrary.java
index 716b10fe..91567f1f 100644
--- a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/HttpTagLibrary.java
+++ b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/HttpTagLibrary.java
@@ -51,6 +51,7 @@ public class HttpTagLibrary extends TagLibrary {
*
* @return a Map of tag name to tag class
*/
+ @Override
public Map getTagClasses() {
return super.getTagClasses();
}
diff --git a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/HttpTagSupport.java b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/HttpTagSupport.java
index 02f4113b..d35afe57 100644
--- a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/HttpTagSupport.java
+++ b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/HttpTagSupport.java
@@ -107,6 +107,7 @@ public abstract class HttpTagSupport extends TagSupport {
* @param xmlOutput where to send output
* @throws JellyTagException when an error occurs
*/
+ @Override
public void doTag(XMLOutput xmlOutput) throws JellyTagException {
// allow nested tags first, e.g body
invokeBody(xmlOutput);
diff --git a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/MultipartPostTag.java b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/MultipartPostTag.java
index 49392549..9f2a03d1 100644
--- a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/MultipartPostTag.java
+++ b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/MultipartPostTag.java
@@ -65,6 +65,7 @@ public class MultipartPostTag extends PostTag {
* @throws MalformedURLException when the {@link #getUri() URI} or
* {@link #getPath() path} is invalid
*/
+ @Override
protected HttpMethod getHttpMethod() throws MalformedURLException {
if (_postMethod == null) {
_postMethod = new MultipartPostMethod(getResolvedUrl());
@@ -88,6 +89,7 @@ public class MultipartPostTag extends PostTag {
* It <strong>must</strong> be called after
* {@link #getHttpMethod()}
*/
+ @Override
protected void setParameters(HttpMethod method) {
for (int index = 0; index < _parts.size(); index++) {
((MultipartPostMethod) method).addPart( (Part) _parts.get(index) );
diff --git a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/OptionsTag.java b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/OptionsTag.java
index 56540bac..9afdfd27 100644
--- a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/OptionsTag.java
+++ b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/OptionsTag.java
@@ -42,6 +42,7 @@ public class OptionsTag extends HttpTagSupport {
* @return a url method for an options request
* @throws MalformedURLException when the url is bad
*/
+ @Override
protected HttpMethod getHttpMethod() throws MalformedURLException {
if (_optionsMethod == null) {
_optionsMethod = new OptionsMethod(getResolvedUrl());
diff --git a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/ParameterTag.java b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/ParameterTag.java
index 5a3877b3..0b70df4c 100644
--- a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/ParameterTag.java
+++ b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/ParameterTag.java
@@ -42,6 +42,7 @@ public class ParameterTag extends TagSupport {
* @param xmlOutput where to send output
* @throws JellyTagException when an error occurs
*/
+ @Override
public void doTag(XMLOutput xmlOutput) throws JellyTagException {
HttpTagSupport http = (HttpTagSupport) findAncestorWithClass(
HttpTagSupport.class);
diff --git a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/PartTag.java b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/PartTag.java
index 12a99a8a..6ff7e808 100644
--- a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/PartTag.java
+++ b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/PartTag.java
@@ -46,7 +46,8 @@ public class PartTag extends TagSupport {
super(name, value, "utf-8");
_contentType=contentType;
}
- public String getContentType() { return _contentType; }
+ @Override
+ public String getContentType() { return _contentType; }
}
/**
@@ -56,6 +57,7 @@ public class PartTag extends TagSupport {
* @param xmlOutput where to send output
* @throws JellyTagException when an error occurs
*/
+ @Override
public void doTag(XMLOutput xmlOutput) throws JellyTagException {
MultipartPostTag http = (MultipartPostTag) findAncestorWithClass(MultipartPostTag.class);
StringPart sp = new MyStringPart(getName(), getValue(), getContentType());
diff --git a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/PostTag.java b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/PostTag.java
index d61ee384..94157357 100644
--- a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/PostTag.java
+++ b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/PostTag.java
@@ -44,6 +44,7 @@ public class PostTag extends HttpTagSupport {
* @throws MalformedURLException when the {@link #getUri() URI} or
* {@link #getPath() path} is invalid
*/
+ @Override
protected HttpMethod getHttpMethod() throws MalformedURLException {
if (_postMethod == null) {
_postMethod = new PostMethod(getResolvedUrl());
@@ -57,6 +58,7 @@ public class PostTag extends HttpTagSupport {
* This method <strong>must</strong> be called after
* {@link #getHttpMethod()}
*/
+ @Override
protected void setParameters(HttpMethod method) {
NameValuePair nvp = null;
for (int index = 0; index < getParameters().size(); index++) {
diff --git a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/PutTag.java b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/PutTag.java
index a8293169..6277ebc7 100644
--- a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/PutTag.java
+++ b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/PutTag.java
@@ -43,6 +43,7 @@ public class PutTag extends HttpTagSupport {
* @throws MalformedURLException when the {@link #getUri() URI} or
* {@link #getPath() path} is invalid
*/
+ @Override
protected HttpMethod getHttpMethod() throws MalformedURLException {
if (_putMethod == null) {
_putMethod = new PutMethod(getResolvedUrl());
@@ -63,6 +64,7 @@ public class PutTag extends HttpTagSupport {
* @param name the parameter name
* @param value the parameter value
*/
+ @Override
public void addParameter(String name, String value) {
throw new IllegalArgumentException("PUT requests don't have params");
}
diff --git a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/SessionTag.java b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/SessionTag.java
index 25bbe9f4..84493319 100644
--- a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/SessionTag.java
+++ b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/SessionTag.java
@@ -57,6 +57,7 @@ public class SessionTag extends TagSupport {
* @param xmlOutput to write output
* @throws JellyTagException when any error occurs
*/
+ @Override
public void doTag(XMLOutput xmlOutput) throws JellyTagException {
if (_httpClient == null)
{
diff --git a/jelly-tags/interaction/src/main/java/org/apache/commons/jelly/tags/interaction/AskTag.java b/jelly-tags/interaction/src/main/java/org/apache/commons/jelly/tags/interaction/AskTag.java
index 8576ec62..484c9a64 100644
--- a/jelly-tags/interaction/src/main/java/org/apache/commons/jelly/tags/interaction/AskTag.java
+++ b/jelly-tags/interaction/src/main/java/org/apache/commons/jelly/tags/interaction/AskTag.java
@@ -136,6 +136,7 @@ public class AskTag extends TagSupport {
* @param output
* the place to write output
*/
+ @Override
public void doTag(XMLOutput output) {
if (question != null) {
if (defaultInput != null) {
diff --git a/jelly-tags/jaxme/src/main/java/org/apache/commons/jelly/tags/jaxme/GeneratorTag.java b/jelly-tags/jaxme/src/main/java/org/apache/commons/jelly/tags/jaxme/GeneratorTag.java
index 47a88c73..62cb643a 100644
--- a/jelly-tags/jaxme/src/main/java/org/apache/commons/jelly/tags/jaxme/GeneratorTag.java
+++ b/jelly-tags/jaxme/src/main/java/org/apache/commons/jelly/tags/jaxme/GeneratorTag.java
@@ -76,6 +76,7 @@ public class GeneratorTag extends TagSupport {
return new File(target);
}
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
if (schemaUrl == null) {
diff --git a/jelly-tags/jaxme/src/main/java/org/apache/commons/jelly/tags/jaxme/MarshallTag.java b/jelly-tags/jaxme/src/main/java/org/apache/commons/jelly/tags/jaxme/MarshallTag.java
index 8e944359..61117214 100644
--- a/jelly-tags/jaxme/src/main/java/org/apache/commons/jelly/tags/jaxme/MarshallTag.java
+++ b/jelly-tags/jaxme/src/main/java/org/apache/commons/jelly/tags/jaxme/MarshallTag.java
@@ -66,6 +66,7 @@ public class MarshallTag extends TagSupport {
this.object = object;
}
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
if (packages == null) {
throw new MissingAttributeException( "packages" );
diff --git a/jelly-tags/jaxme/src/main/java/org/apache/commons/jelly/tags/jaxme/UnmarshallTag.java b/jelly-tags/jaxme/src/main/java/org/apache/commons/jelly/tags/jaxme/UnmarshallTag.java
index 2c963776..034e1bd7 100644
--- a/jelly-tags/jaxme/src/main/java/org/apache/commons/jelly/tags/jaxme/UnmarshallTag.java
+++ b/jelly-tags/jaxme/src/main/java/org/apache/commons/jelly/tags/jaxme/UnmarshallTag.java
@@ -74,6 +74,7 @@ public class UnmarshallTag extends TagSupport {
this.var = var;
}
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
if (packages == null) {
throw new MissingAttributeException( "packages" );
diff --git a/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/impl/AddressHandler.java b/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/impl/AddressHandler.java
index 0352e88c..0fbd8eca 100644
--- a/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/impl/AddressHandler.java
+++ b/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/impl/AddressHandler.java
@@ -17,7 +17,8 @@
package org.apache.ws.jaxme.examples.misc.address.impl;
public class AddressHandler extends org.apache.ws.jaxme.examples.misc.address.impl.AddressTypeHandler implements org.apache.ws.jaxme.JMHandler {
- protected org.apache.ws.jaxme.examples.misc.address.AddressType newResult() throws org.xml.sax.SAXException {
+ @Override
+protected org.apache.ws.jaxme.examples.misc.address.AddressType newResult() throws org.xml.sax.SAXException {
try {
return (org.apache.ws.jaxme.examples.misc.address.AddressType) getData().getFactory().getElement(org.apache.ws.jaxme.examples.misc.address.Address.class);
} catch (javax.xml.bind.JAXBException _1) {
diff --git a/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/impl/AddressImpl.java b/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/impl/AddressImpl.java
index 9200bd1e..c618e9df 100644
--- a/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/impl/AddressImpl.java
+++ b/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/impl/AddressImpl.java
@@ -20,7 +20,8 @@ public class AddressImpl extends org.apache.ws.jaxme.examples.misc.address.impl.
private final static javax.xml.namespace.QName __qName = new javax.xml.namespace.QName("http://ws.apache.org/jaxme/examples/misc/address", "Address");
- public javax.xml.namespace.QName getQName() {
+ @Override
+public javax.xml.namespace.QName getQName() {
return __qName;
}
diff --git a/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/impl/AddressTypeHandler.java b/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/impl/AddressTypeHandler.java
index 75f86954..dda09322 100644
--- a/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/impl/AddressTypeHandler.java
+++ b/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/impl/AddressTypeHandler.java
@@ -41,6 +41,7 @@ public class AddressTypeHandler extends org.apache.ws.jaxme.impl.JMHandlerImpl {
private org.apache.ws.jaxme.JMHandler __handler;
+ @Override
public void startDocument() throws org.xml.sax.SAXException {
__level = 0;
__state = 0;
@@ -52,6 +53,7 @@ public class AddressTypeHandler extends org.apache.ws.jaxme.impl.JMHandlerImpl {
return new org.apache.ws.jaxme.examples.misc.address.impl.AddressTypeImpl.NameTypeImpl();
}
+ @Override
public void startElement(java.lang.String pNamespaceURI, java.lang.String pLocalName, java.lang.String pQName, org.xml.sax.Attributes pAttr) throws org.xml.sax.SAXException {
switch (__level++) {
case 0:
@@ -126,6 +128,7 @@ public class AddressTypeHandler extends org.apache.ws.jaxme.impl.JMHandlerImpl {
}
}
+ @Override
public void endElement(java.lang.String pNamespaceURI, java.lang.String pLocalName, java.lang.String pQName) throws org.xml.sax.SAXException {
if (__handler == null) {
if (__level > 1) {
@@ -170,6 +173,7 @@ public class AddressTypeHandler extends org.apache.ws.jaxme.impl.JMHandlerImpl {
}
}
+ @Override
public void characters(char[] pChars, int pOffset, int pLen) throws org.xml.sax.SAXException {
if (__handler == null) {
super.characters(pChars, pOffset, pLen);
@@ -202,14 +206,16 @@ public class AddressTypeHandler extends org.apache.ws.jaxme.impl.JMHandlerImpl {
private org.apache.ws.jaxme.JMHandler __handler_Name;
- public void startDocument() throws org.xml.sax.SAXException {
+ @Override
+public void startDocument() throws org.xml.sax.SAXException {
__level = 0;
__state = 0;
__state = 0;
__handler = null;
}
- public void addAttribute(java.lang.String pURI, java.lang.String pLocalName, java.lang.String pValue) throws org.xml.sax.SAXException {
+ @Override
+public void addAttribute(java.lang.String pURI, java.lang.String pLocalName, java.lang.String pValue) throws org.xml.sax.SAXException {
if (pURI == null) {
pURI = "";
}
@@ -231,7 +237,8 @@ public class AddressTypeHandler extends org.apache.ws.jaxme.impl.JMHandlerImpl {
}
}
- public void startElement(java.lang.String pNamespaceURI, java.lang.String pLocalName, java.lang.String pQName, org.xml.sax.Attributes pAttr) throws org.xml.sax.SAXException {
+ @Override
+public void startElement(java.lang.String pNamespaceURI, java.lang.String pLocalName, java.lang.String pQName, org.xml.sax.Attributes pAttr) throws org.xml.sax.SAXException {
switch (__level++) {
case 0:
setResult(newResult());
@@ -267,7 +274,8 @@ public class AddressTypeHandler extends org.apache.ws.jaxme.impl.JMHandlerImpl {
}
}
- public void endElement(java.lang.String pNamespaceURI, java.lang.String pLocalName, java.lang.String pQName) throws org.xml.sax.SAXException {
+ @Override
+public void endElement(java.lang.String pNamespaceURI, java.lang.String pLocalName, java.lang.String pQName) throws org.xml.sax.SAXException {
if (__handler == null) {
if (__level > 1) {
super.endElement(pNamespaceURI, pLocalName, pQName);
@@ -293,7 +301,8 @@ public class AddressTypeHandler extends org.apache.ws.jaxme.impl.JMHandlerImpl {
}
}
- public void characters(char[] pChars, int pOffset, int pLen) throws org.xml.sax.SAXException {
+ @Override
+public void characters(char[] pChars, int pOffset, int pLen) throws org.xml.sax.SAXException {
if (__handler == null) {
super.characters(pChars, pOffset, pLen);
} else {
@@ -301,7 +310,8 @@ public class AddressTypeHandler extends org.apache.ws.jaxme.impl.JMHandlerImpl {
}
}
- public void init(org.apache.ws.jaxme.JMHandler.Data pData) throws javax.xml.bind.JAXBException {
+ @Override
+public void init(org.apache.ws.jaxme.JMHandler.Data pData) throws javax.xml.bind.JAXBException {
super.init(pData);
if (__handler_Name != null) {
__handler_Name.init(pData);
diff --git a/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/impl/AddressTypeImpl.java b/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/impl/AddressTypeImpl.java
index 7299e6ea..2e134100 100644
--- a/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/impl/AddressTypeImpl.java
+++ b/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/impl/AddressTypeImpl.java
@@ -27,30 +27,37 @@ public class AddressTypeImpl implements org.apache.ws.jaxme.examples.misc.addres
private java.lang.String Initials;
+ @Override
public java.lang.String getFirst() {
return First;
}
+ @Override
public void setFirst(java.lang.String pFirst) {
First = pFirst;
}
+ @Override
public java.util.List getMiddle() {
return Middle;
}
+ @Override
public java.lang.String getLast() {
return Last;
}
+ @Override
public void setLast(java.lang.String pLast) {
Last = pLast;
}
+ @Override
public java.lang.String getInitials() {
return Initials;
}
+ @Override
public void setInitials(java.lang.String pInitials) {
Initials = pInitials;
}
@@ -62,19 +69,23 @@ public class AddressTypeImpl implements org.apache.ws.jaxme.examples.misc.addres
private org.apache.ws.jaxme.examples.misc.address.AddressType.NameType Name;
- public java.lang.String getId() {
+ @Override
+public java.lang.String getId() {
return Id;
}
- public void setId(java.lang.String pId) {
+ @Override
+public void setId(java.lang.String pId) {
Id = pId;
}
- public org.apache.ws.jaxme.examples.misc.address.AddressType.NameType getName() {
+ @Override
+public org.apache.ws.jaxme.examples.misc.address.AddressType.NameType getName() {
return Name;
}
- public void setName(org.apache.ws.jaxme.examples.misc.address.AddressType.NameType pName) {
+ @Override
+public void setName(org.apache.ws.jaxme.examples.misc.address.AddressType.NameType pName) {
Name = pName;
}
diff --git a/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/impl/AddressTypeSerializer.java b/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/impl/AddressTypeSerializer.java
index b228f9b2..63163984 100644
--- a/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/impl/AddressTypeSerializer.java
+++ b/jelly-tags/jaxme/src/test/java/org/apache/ws/jaxme/examples/misc/address/impl/AddressTypeSerializer.java
@@ -28,6 +28,7 @@ public class AddressTypeSerializer extends org.apache.ws.jaxme.impl.JMXmlSeriali
final static javax.xml.namespace.QName __ser_Initials_qname = new javax.xml.namespace.QName("http://ws.apache.org/jaxme/examples/misc/address", "Initials");
+ @Override
protected void marshalChilds(org.apache.ws.jaxme.JMXmlSerializer.Data pData, java.lang.Object pObject) throws org.xml.sax.SAXException {
org.apache.ws.jaxme.examples.misc.address.AddressType.NameType _1 = (org.apache.ws.jaxme.examples.misc.address.AddressType.NameType) pObject;
java.lang.String _2 = _1.getFirst();
@@ -58,7 +59,8 @@ public class AddressTypeSerializer extends org.apache.ws.jaxme.impl.JMXmlSeriali
final static javax.xml.namespace.QName __ser_Name_qname = new javax.xml.namespace.QName("http://ws.apache.org/jaxme/examples/misc/address", "Name");
- protected org.xml.sax.helpers.AttributesImpl getAttributes(org.apache.ws.jaxme.JMXmlSerializer.Data pData, java.lang.Object pElement) throws org.xml.sax.SAXException {
+ @Override
+protected org.xml.sax.helpers.AttributesImpl getAttributes(org.apache.ws.jaxme.JMXmlSerializer.Data pData, java.lang.Object pElement) throws org.xml.sax.SAXException {
org.xml.sax.helpers.AttributesImpl _1 = super.getAttributes(pData, pElement);
org.apache.ws.jaxme.examples.misc.address.AddressType _2 = (org.apache.ws.jaxme.examples.misc.address.AddressType) pElement;
java.lang.String _3 = _2.getId();
@@ -68,13 +70,15 @@ public class AddressTypeSerializer extends org.apache.ws.jaxme.impl.JMXmlSeriali
return _1;
}
- public void init(org.apache.ws.jaxme.impl.JAXBContextImpl pFactory) throws javax.xml.bind.JAXBException {
+ @Override
+public void init(org.apache.ws.jaxme.impl.JAXBContextImpl pFactory) throws javax.xml.bind.JAXBException {
super.init(pFactory);
__ser_Name = new org.apache.ws.jaxme.examples.misc.address.impl.AddressTypeSerializer.NameTypeSerializer();
__ser_Name.init(pFactory);
}
- protected void marshalChilds(org.apache.ws.jaxme.JMXmlSerializer.Data pData, java.lang.Object pObject) throws org.xml.sax.SAXException {
+ @Override
+protected void marshalChilds(org.apache.ws.jaxme.JMXmlSerializer.Data pData, java.lang.Object pObject) throws org.xml.sax.SAXException {
org.apache.ws.jaxme.examples.misc.address.AddressType _1 = (org.apache.ws.jaxme.examples.misc.address.AddressType) pObject;
org.apache.ws.jaxme.examples.misc.address.AddressType.NameType _2 = _1.getName();
if (_2 != null) {
diff --git a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/AbstractMethodHandlerTag.java b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/AbstractMethodHandlerTag.java
index 29f5d131..20a6a74a 100644
--- a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/AbstractMethodHandlerTag.java
+++ b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/AbstractMethodHandlerTag.java
@@ -40,6 +40,7 @@ abstract public class AbstractMethodHandlerTag extends TagSupport {
* @param xmlOutput where to send output
* @throws JellyTagException when an error occurs
*/
+ @Override
public void doTag(XMLOutput xmlOutput) throws JellyTagException {
JellyResourceHandlerTag parentTag =
(JellyResourceHandlerTag) findAncestorWithClass(
diff --git a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/DeleteRequestTag.java b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/DeleteRequestTag.java
index d47bbdec..cfa5565e 100644
--- a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/DeleteRequestTag.java
+++ b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/DeleteRequestTag.java
@@ -26,6 +26,7 @@ package org.apache.commons.jelly.tags.jetty;
public class DeleteRequestTag extends AbstractMethodHandlerTag {
/** return the name of the http method handled by this tag */
+ @Override
public String getMethodHandled() {
return "DELETE";
}
diff --git a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/GetRequestTag.java b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/GetRequestTag.java
index 60de6596..5b8d195c 100644
--- a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/GetRequestTag.java
+++ b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/GetRequestTag.java
@@ -25,6 +25,7 @@ package org.apache.commons.jelly.tags.jetty;
public class GetRequestTag extends AbstractMethodHandlerTag {
/** return the name of the http method handled by this tag */
+ @Override
public String getMethodHandled() {
return "GET";
}
diff --git a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/HttpContextTag.java b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/HttpContextTag.java
index 2d9fe286..6503a996 100644
--- a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/HttpContextTag.java
+++ b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/HttpContextTag.java
@@ -63,6 +63,7 @@ public class HttpContextTag extends TagSupport {
* @param xmlOutput where to send output
* @throws JellyTagException when an error occurs
*/
+ @Override
public void doTag(XMLOutput xmlOutput) throws JellyTagException {
JettyHttpServerTag httpserver = (JettyHttpServerTag) findAncestorWithClass(
diff --git a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JellyResourceHandlerTag.java b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JellyResourceHandlerTag.java
index c29c57b9..e6f60c63 100644
--- a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JellyResourceHandlerTag.java
+++ b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JellyResourceHandlerTag.java
@@ -43,6 +43,7 @@ public class JellyResourceHandlerTag extends TagSupport {
* @param xmlOutput where to send output
* @throws JellyTagException when an error occurs
*/
+ @Override
public void doTag(XMLOutput xmlOutput) throws JellyTagException {
HttpContextTag httpContext = (HttpContextTag) findAncestorWithClass(
HttpContextTag.class);
diff --git a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JellyResourceHttpHandler.java b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JellyResourceHttpHandler.java
index fe8c16c6..33ced7b0 100644
--- a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JellyResourceHttpHandler.java
+++ b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JellyResourceHttpHandler.java
@@ -80,6 +80,7 @@ class JellyResourceHttpHandler extends AbstractHttpHandler {
* @throws HttpException when an error occurs
* @throws IOException when an error occurs
*/
+ @Override
public void handle(String pathInContext,
String pathParams,
HttpRequest request,
diff --git a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JettyHttpServerTag.java b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JettyHttpServerTag.java
index 0c2317cf..3a006dae 100644
--- a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JettyHttpServerTag.java
+++ b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JettyHttpServerTag.java
@@ -107,6 +107,7 @@ public class JettyHttpServerTag extends TagSupport {
* @param xmlOutput where to send output
* @throws JellyTagException when an error occurs
*/
+ @Override
public void doTag(XMLOutput xmlOutput) throws JellyTagException {
try {
diff --git a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JettyTagLibrary.java b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JettyTagLibrary.java
index e1426446..a603fa97 100644
--- a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JettyTagLibrary.java
+++ b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JettyTagLibrary.java
@@ -56,6 +56,7 @@ public class JettyTagLibrary extends TagLibrary {
*
* @return a Map of tag name to tag class
*/
+ @Override
public Map getTagClasses() {
return super.getTagClasses();
}
diff --git a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/NotFoundHandlerTag.java b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/NotFoundHandlerTag.java
index 4eeea537..0bfa3767 100644
--- a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/NotFoundHandlerTag.java
+++ b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/NotFoundHandlerTag.java
@@ -40,6 +40,7 @@ public class NotFoundHandlerTag extends TagSupport {
* @param xmlOutput where to send output
* @throws JellyTagException when an error occurs
*/
+ @Override
public void doTag(XMLOutput xmlOutput) throws JellyTagException {
HttpContextTag httpContext = (HttpContextTag) findAncestorWithClass(
HttpContextTag.class);
diff --git a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/PostRequestTag.java b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/PostRequestTag.java
index e810b22f..681aa4c3 100644
--- a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/PostRequestTag.java
+++ b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/PostRequestTag.java
@@ -25,6 +25,7 @@ package org.apache.commons.jelly.tags.jetty;
public class PostRequestTag extends AbstractMethodHandlerTag {
/** return the name of the http method handled by this tag */
+ @Override
public String getMethodHandled() {
return "POST";
}
diff --git a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/PutRequestTag.java b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/PutRequestTag.java
index 4dc493d7..a1c07cc5 100644
--- a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/PutRequestTag.java
+++ b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/PutRequestTag.java
@@ -26,6 +26,7 @@ package org.apache.commons.jelly.tags.jetty;
public class PutRequestTag extends AbstractMethodHandlerTag {
/** return the name of the http method handled by this tag */
+ @Override
public String getMethodHandled() {
return "PUT";
}
diff --git a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/RealmTag.java b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/RealmTag.java
index 2d346052..d858f230 100644
--- a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/RealmTag.java
+++ b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/RealmTag.java
@@ -51,6 +51,7 @@ public class RealmTag extends TagSupport {
* @param xmlOutput where to send output
* @throws JellyTagException when an error occurs
*/
+ @Override
public void doTag(XMLOutput xmlOutput) throws JellyTagException {
JettyHttpServerTag httpserver = (JettyHttpServerTag) findAncestorWithClass(
JettyHttpServerTag.class);
diff --git a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/ResourceHandlerTag.java b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/ResourceHandlerTag.java
index 21110132..4819f33f 100644
--- a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/ResourceHandlerTag.java
+++ b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/ResourceHandlerTag.java
@@ -46,6 +46,7 @@ public class ResourceHandlerTag extends TagSupport {
* @param xmlOutput where to send output
* @throws JellyTagException when an error occurs
*/
+ @Override
public void doTag(XMLOutput xmlOutput) throws JellyTagException {
HttpContextTag httpContext = (HttpContextTag) findAncestorWithClass(
HttpContextTag.class);
diff --git a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/ResponseBodyTag.java b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/ResponseBodyTag.java
index 37cb7416..d07b6376 100644
--- a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/ResponseBodyTag.java
+++ b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/ResponseBodyTag.java
@@ -40,6 +40,7 @@ public class ResponseBodyTag extends TagSupport {
* @param xmlOutput where to send output
* @throws JellyTagException when an error occurs
*/
+ @Override
public void doTag(XMLOutput xmlOutput) throws JellyTagException {
// get the response from the context
diff --git a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/ResponseCodeTag.java b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/ResponseCodeTag.java
index ebacf8aa..c5e1e888 100644
--- a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/ResponseCodeTag.java
+++ b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/ResponseCodeTag.java
@@ -40,6 +40,7 @@ public class ResponseCodeTag extends TagSupport {
* @param xmlOutput where to send output
* @throws JellyTagException when an error occurs
*/
+ @Override
public void doTag(XMLOutput xmlOutput) throws JellyTagException {
if (getValue() <= 100) {
diff --git a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/ResponseHeaderTag.java b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/ResponseHeaderTag.java
index af03daed..86e3ceff 100644
--- a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/ResponseHeaderTag.java
+++ b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/ResponseHeaderTag.java
@@ -43,6 +43,7 @@ public class ResponseHeaderTag extends TagSupport {
* @param xmlOutput where to send output
* @throws JellyTagException when an error occurs
*/
+ @Override
public void doTag(XMLOutput xmlOutput) throws JellyTagException {
if (null == getName()) {
diff --git a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/SecurityHandlerTag.java b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/SecurityHandlerTag.java
index b95cc8ab..a86f5e75 100644
--- a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/SecurityHandlerTag.java
+++ b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/SecurityHandlerTag.java
@@ -92,6 +92,7 @@ public class SecurityHandlerTag extends TagSupport {
* @param xmlOutput where to send output
* @throws JellyTagException when an error occurs
*/
+ @Override
public void doTag(XMLOutput xmlOutput) throws JellyTagException {
HttpContextTag httpContext = (HttpContextTag) findAncestorWithClass(
HttpContextTag.class);
diff --git a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/SocketListenerTag.java b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/SocketListenerTag.java
index c96e2dea..855b1592 100644
--- a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/SocketListenerTag.java
+++ b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/SocketListenerTag.java
@@ -50,6 +50,7 @@ public class SocketListenerTag extends TagSupport {
* @param xmlOutput where to send output
* @throws JellyTagException when an error occurs
*/
+ @Override
public void doTag(XMLOutput xmlOutput) throws JellyTagException {
JettyHttpServerTag httpserver = (JettyHttpServerTag) findAncestorWithClass(
JettyHttpServerTag.class);
diff --git a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/ActionTag.java b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/ActionTag.java
index a5fdc978..d7209dca 100644
--- a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/ActionTag.java
+++ b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/ActionTag.java
@@ -39,6 +39,7 @@ public class ActionTag extends UseBeanTag {
* Implementing Action class
*/
class ActionImpl extends Action {
+ @Override
public void runWithEvent(Event event) {
try {
context.setVariable(var, event);
@@ -81,6 +82,7 @@ public class ActionTag extends UseBeanTag {
/**
* @see org.apache.commons.jelly.Tag#doTag(org.apache.commons.jelly.XMLOutput)
*/
+ @Override
public void doTag(XMLOutput output)
throws MissingAttributeException, JellyTagException {
diff --git a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/ContributionItemTag.java b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/ContributionItemTag.java
index a4ac221f..e71fe6fd 100644
--- a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/ContributionItemTag.java
+++ b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/ContributionItemTag.java
@@ -37,6 +37,7 @@ public class ContributionItemTag extends UseBeanTag {
/**
* @see org.apache.commons.jelly.Tag#doTag(org.apache.commons.jelly.XMLOutput)
*/
+ @Override
public void doTag(XMLOutput output)
throws MissingAttributeException, JellyTagException {
diff --git a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/DoubleClickListenerTag.java b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/DoubleClickListenerTag.java
index 03cfdfc4..6c1136c7 100644
--- a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/DoubleClickListenerTag.java
+++ b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/DoubleClickListenerTag.java
@@ -45,6 +45,7 @@ public class DoubleClickListenerTag
/*
* @see org.apache.commons.jelly.Tag#doTag(org.apache.commons.jelly.XMLOutput)
*/
+ @Override
public void doTag(XMLOutput output)
throws MissingAttributeException, JellyTagException {
if (var == null) {
@@ -91,6 +92,7 @@ public class DoubleClickListenerTag
/*
* @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent)
*/
+ @Override
public void doubleClick(DoubleClickEvent event) {
try {
context.setVariable(var, event);
diff --git a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/JFaceImageTag.java b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/JFaceImageTag.java
index 2043e3aa..61a42e92 100644
--- a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/JFaceImageTag.java
+++ b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/JFaceImageTag.java
@@ -56,6 +56,7 @@ public class JFaceImageTag extends ImageTag {
/*
* @see org.apache.commons.jelly.Tag#doTag(org.apache.commons.jelly.XMLOutput)
*/
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
// invoke by body just in case some nested tag configures me
diff --git a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/JFaceLayoutDataTag.java b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/JFaceLayoutDataTag.java
index dc10ff66..2a39601d 100644
--- a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/JFaceLayoutDataTag.java
+++ b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/JFaceLayoutDataTag.java
@@ -41,6 +41,7 @@ public class JFaceLayoutDataTag extends LayoutDataTag {
/* (non-Javadoc)
* @see org.apache.commons.jelly.tags.core.UseBeanTag#processBean(java.lang.String, java.lang.Object)
*/
+ @Override
protected void processBean(String var, Object bean) throws JellyTagException {
Widget parent = getParentWidget();
Window window = null;
diff --git a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/JFaceLayoutTag.java b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/JFaceLayoutTag.java
index c11f58c7..cab530da 100644
--- a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/JFaceLayoutTag.java
+++ b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/JFaceLayoutTag.java
@@ -42,6 +42,7 @@ public class JFaceLayoutTag extends LayoutTag {
/* (non-Javadoc)
* @see org.apache.commons.jelly.tags.core.UseBeanTag#processBean(java.lang.String, java.lang.Object)
*/
+ @Override
protected void processBean(String var, Object bean) throws JellyTagException {
Widget parent = getParentWidget();
diff --git a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/JFaceTagLibrary.java b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/JFaceTagLibrary.java
index efbd3c67..5ead9d71 100644
--- a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/JFaceTagLibrary.java
+++ b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/JFaceTagLibrary.java
@@ -102,6 +102,7 @@ public class JFaceTagLibrary extends SwtTagLibrary {
/**
* @see org.apache.commons.jelly.impl.TagFactory#createTag(java.lang.String, org.xml.sax.Attributes)
*/
+ @Override
public Tag createTag(String name, Attributes attributes) throws JellyException {
return new MenuManagerTag();
}
@@ -131,6 +132,7 @@ public class JFaceTagLibrary extends SwtTagLibrary {
/**
* @see org.apache.commons.jelly.impl.TagFactory#createTag(java.lang.String, org.xml.sax.Attributes)
*/
+ @Override
public Tag createTag(String name, Attributes attributes) throws JellyException {
return new ViewerTag(theClass, style);
}
@@ -148,6 +150,7 @@ public class JFaceTagLibrary extends SwtTagLibrary {
/**
* @see org.apache.commons.jelly.impl.TagFactory#createTag(java.lang.String, org.xml.sax.Attributes)
*/
+ @Override
public Tag createTag(String name, Attributes attributes) throws JellyException {
return new ApplicationWindowTag(theClass);
}
@@ -162,6 +165,7 @@ public class JFaceTagLibrary extends SwtTagLibrary {
/**
* @see org.apache.commons.jelly.impl.TagFactory#createTag(java.lang.String, org.xml.sax.Attributes)
*/
+ @Override
public Tag createTag(String name, Attributes attributes) throws JellyException {
return new ActionTag(theClass);
}
@@ -176,6 +180,7 @@ public class JFaceTagLibrary extends SwtTagLibrary {
/**
* @see org.apache.commons.jelly.impl.TagFactory#createTag(java.lang.String, org.xml.sax.Attributes)
*/
+ @Override
public Tag createTag(String name, Attributes attributes) throws JellyException {
return new ContributionItemTag(theClass);
}
@@ -191,6 +196,7 @@ public class JFaceTagLibrary extends SwtTagLibrary {
/**
* @see org.apache.commons.jelly.impl.TagFactory#createTag(java.lang.String, org.xml.sax.Attributes)
*/
+ @Override
public Tag createTag(String name, Attributes attributes) throws JellyException {
return new PreferenceDialogTag(theClass);
}
@@ -206,6 +212,7 @@ public class JFaceTagLibrary extends SwtTagLibrary {
/**
* @see org.apache.commons.jelly.impl.TagFactory#createTag(java.lang.String, org.xml.sax.Attributes)
*/
+ @Override
public Tag createTag(String name, Attributes attributes) throws JellyException {
return new FieldEditorTag(theClass);
}
@@ -221,6 +228,7 @@ public class JFaceTagLibrary extends SwtTagLibrary {
/**
* @see org.apache.commons.jelly.impl.TagFactory#createTag(java.lang.String, org.xml.sax.Attributes)
*/
+ @Override
public Tag createTag(String name, Attributes attributes) throws JellyException {
return new WizardDialogTag(theClass);
}
@@ -232,6 +240,7 @@ public class JFaceTagLibrary extends SwtTagLibrary {
/**
* @see org.apache.commons.jelly.impl.TagFactory#createTag(java.lang.String, org.xml.sax.Attributes)
*/
+ @Override
public Tag createTag(String name, Attributes attributes) throws JellyException {
return new WizardPageTag(theClass);
}
@@ -241,6 +250,7 @@ public class JFaceTagLibrary extends SwtTagLibrary {
/**
* Register a widget tag for the given name
*/
+ @Override
protected void registerWidgetTag(String name, Class widgetClass) {
registerWidgetTag(name, widgetClass, SWT.NULL);
}
@@ -248,11 +258,13 @@ public class JFaceTagLibrary extends SwtTagLibrary {
/**
* Register a widget tag for the given name
*/
+ @Override
protected void registerWidgetTag(String name, final Class widgetClass, final int style) {
registerTagFactory(name, new TagFactory() {
/**
* @see org.apache.commons.jelly.impl.TagFactory#createTag(java.lang.String, org.xml.sax.Attributes)
*/
+ @Override
public Tag createTag(String name, Attributes attributes) throws JellyException {
return new JFaceWidgetTag(widgetClass, style);
}
@@ -262,11 +274,13 @@ public class JFaceTagLibrary extends SwtTagLibrary {
/**
* Register a layout tag for the given name
*/
+ @Override
protected void registerLayoutTag(String name, final Class layoutClass) {
registerTagFactory(name, new TagFactory() {
/**
* @see org.apache.commons.jelly.impl.TagFactory#createTag(java.lang.String, org.xml.sax.Attributes)
*/
+ @Override
public Tag createTag(String name, Attributes attributes) throws JellyException {
return new JFaceLayoutTag(layoutClass);
}
diff --git a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/JFaceWidgetTag.java b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/JFaceWidgetTag.java
index 3cd0866b..2ea2d878 100644
--- a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/JFaceWidgetTag.java
+++ b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/JFaceWidgetTag.java
@@ -51,6 +51,7 @@ public class JFaceWidgetTag extends WidgetTag implements Tag {
/*
* @see org.apache.commons.jelly.tags.swt.WidgetTag#attachWidgets(java.lang.Object, org.eclipse.swt.widgets.Widget)
*/
+ @Override
protected void attachWidgets(Object parent, Widget widget) throws JellyTagException {
super.attachWidgets(parent, widget);
@@ -70,6 +71,7 @@ public class JFaceWidgetTag extends WidgetTag implements Tag {
/*
* @see org.apache.commons.jelly.tags.swt.WidgetTag#getParentWidget()
*/
+ @Override
public Widget getParentWidget() {
parent = super.getParentWidget();
diff --git a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/MenuManagerTag.java b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/MenuManagerTag.java
index 5900f92a..7b2ffd1f 100644
--- a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/MenuManagerTag.java
+++ b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/MenuManagerTag.java
@@ -55,6 +55,7 @@ public class MenuManagerTag extends UseBeanTag {
/* (non-Javadoc)
* @see org.apache.commons.jelly.Tag#doTag(org.apache.commons.jelly.XMLOutput)
*/
+ @Override
public void doTag(XMLOutput output)
throws MissingAttributeException, JellyTagException {
diff --git a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/SelectionChangedListenerTag.java b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/SelectionChangedListenerTag.java
index 1e491ee6..6e8e3ff1 100644
--- a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/SelectionChangedListenerTag.java
+++ b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/SelectionChangedListenerTag.java
@@ -45,6 +45,7 @@ public class SelectionChangedListenerTag
/*
* @see org.apache.commons.jelly.Tag#doTag(org.apache.commons.jelly.XMLOutput)
*/
+ @Override
public void doTag(XMLOutput output)
throws MissingAttributeException, JellyTagException {
if (var == null) {
@@ -89,6 +90,7 @@ public class SelectionChangedListenerTag
/*
* @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
*/
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
try {
context.setVariable(var, event);
diff --git a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/ViewerTag.java b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/ViewerTag.java
index 5376129e..c3bbd52f 100644
--- a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/ViewerTag.java
+++ b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/ViewerTag.java
@@ -55,6 +55,7 @@ public class ViewerTag extends WidgetTag {
/*
* @see org.apache.commons.jelly.tags.core.UseBeanTag#newInstance(java.lang.Class, java.util.Map, org.apache.commons.jelly.XMLOutput)
*/
+ @Override
protected Object newInstance(
Class theClass,
Map attributes,
diff --git a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/impl/ApplicationWindowImpl.java b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/impl/ApplicationWindowImpl.java
index 350e882a..ae55e347 100644
--- a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/impl/ApplicationWindowImpl.java
+++ b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/impl/ApplicationWindowImpl.java
@@ -50,6 +50,7 @@ public class ApplicationWindowImpl extends ApplicationWindow {
* override to make public
* @see org.eclipse.jface.window.Window#getContents()
*/
+ @Override
public Control getContents() {
return super.getContents();
}
diff --git a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/preference/FieldEditorTag.java b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/preference/FieldEditorTag.java
index 8eb1fae5..dac55d21 100644
--- a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/preference/FieldEditorTag.java
+++ b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/preference/FieldEditorTag.java
@@ -41,6 +41,7 @@ public class FieldEditorTag extends UseBeanTag {
/*
* @see org.apache.commons.jelly.Tag#doTag(org.apache.commons.jelly.XMLOutput)
*/
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
PreferencePageTag tag = (PreferencePageTag) findAncestorWithClass(PreferencePageTag.class);
if (tag == null) {
@@ -62,6 +63,7 @@ public class FieldEditorTag extends UseBeanTag {
/*
* @see org.apache.commons.jelly.tags.core.UseBeanTag#newInstance(java.lang.Class, java.util.Map, org.apache.commons.jelly.XMLOutput)
*/
+ @Override
protected Object newInstance(Class theClass, Map attributes, XMLOutput output)
throws JellyTagException {
diff --git a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/preference/PreferenceDialogTag.java b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/preference/PreferenceDialogTag.java
index 7e2ae281..025328ae 100644
--- a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/preference/PreferenceDialogTag.java
+++ b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/preference/PreferenceDialogTag.java
@@ -73,6 +73,7 @@ public class PreferenceDialogTag extends UseBeanTag {
/*
* @see org.apache.commons.jelly.tags.core.UseBeanTag#newInstance(java.lang.Class, java.util.Map, org.apache.commons.jelly.XMLOutput)
*/
+ @Override
protected Object newInstance(Class arg0, Map arg1, XMLOutput arg2) throws JellyTagException {
PreferenceManager pm = new PreferenceManager();
return new PreferenceDialog(getShell(), pm);
diff --git a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/preference/PreferencePageTag.java b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/preference/PreferencePageTag.java
index 14fe3b73..790d8f72 100644
--- a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/preference/PreferencePageTag.java
+++ b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/preference/PreferencePageTag.java
@@ -59,10 +59,12 @@ public class PreferencePageTag extends TagSupport {
}
}
+ @Override
public void addField(FieldEditor editor) {
super.addField(editor);
}
+ @Override
protected void createFieldEditors() {
try {
invokeBody(output);
@@ -71,10 +73,12 @@ public class PreferencePageTag extends TagSupport {
}
}
+ @Override
public Composite getFieldEditorParent() {
return super.getFieldEditorParent();
}
+ @Override
public IPreferenceStore getPreferenceStore() {
return preferenceStore;
}
@@ -98,6 +102,7 @@ public class PreferencePageTag extends TagSupport {
/*
* @see org.apache.commons.jelly.Tag#doTag(org.apache.commons.jelly.XMLOutput)
*/
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
// check location
PreferenceDialogTag dialogTag =
diff --git a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/window/ApplicationWindowImpl.java b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/window/ApplicationWindowImpl.java
index 975f83f2..e2fd2651 100644
--- a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/window/ApplicationWindowImpl.java
+++ b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/window/ApplicationWindowImpl.java
@@ -50,6 +50,7 @@ public class ApplicationWindowImpl extends ApplicationWindow {
* override to make public
* @see org.eclipse.jface.window.Window#getContents()
*/
+ @Override
public Control getContents() {
return super.getContents();
}
diff --git a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/window/ApplicationWindowTag.java b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/window/ApplicationWindowTag.java
index 7f257628..b288ea1d 100644
--- a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/window/ApplicationWindowTag.java
+++ b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/window/ApplicationWindowTag.java
@@ -48,6 +48,7 @@ public class ApplicationWindowTag extends UseBeanTag {
/*
* @see org.apache.commons.jelly.Tag#doTag(org.apache.commons.jelly.XMLOutput)
*/
+ @Override
public void doTag(XMLOutput output)
throws MissingAttributeException, JellyTagException {
Map attributes = getAttributes();
@@ -83,6 +84,7 @@ public class ApplicationWindowTag extends UseBeanTag {
/*
* @see org.apache.commons.jelly.tags.core.UseBeanTag#newInstance(java.lang.Class, java.util.Map, org.apache.commons.jelly.XMLOutput)
*/
+ @Override
protected Object newInstance(
Class theClass,
Map attributes,
diff --git a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/wizard/WizardDialogTag.java b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/wizard/WizardDialogTag.java
index 4a6e4f9d..e4c0828c 100644
--- a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/wizard/WizardDialogTag.java
+++ b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/wizard/WizardDialogTag.java
@@ -45,6 +45,7 @@ public class WizardDialogTag extends UseBeanTag {
super(parentShell, newWizard);
}
+ @Override
public IWizard getWizard() {
return super.getWizard();
}
@@ -59,6 +60,7 @@ public class WizardDialogTag extends UseBeanTag {
setNeedsProgressMonitor(true);
}
+ @Override
public boolean performCancel() {
try {
if (performCancel != null) {
@@ -73,6 +75,7 @@ public class WizardDialogTag extends UseBeanTag {
return true;
}
+ @Override
public boolean performFinish() {
try {
if (performFinish != null) {
@@ -110,6 +113,7 @@ public class WizardDialogTag extends UseBeanTag {
/*
* @see org.apache.commons.jelly.Tag#doTag(org.apache.commons.jelly.XMLOutput)
*/
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
super.doTag(output);
@@ -162,6 +166,7 @@ public class WizardDialogTag extends UseBeanTag {
/*
* @see org.apache.commons.jelly.tags.core.UseBeanTag#newInstance(java.lang.Class, java.util.Map, org.apache.commons.jelly.XMLOutput)
*/
+ @Override
protected Object newInstance(Class theClass, Map attributes, XMLOutput output)
throws JellyTagException {
Wizard wizard = new WizardImpl();
diff --git a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/wizard/WizardPageTag.java b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/wizard/WizardPageTag.java
index 45272b9b..4a4a9ed0 100644
--- a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/wizard/WizardPageTag.java
+++ b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/wizard/WizardPageTag.java
@@ -46,6 +46,7 @@ public class WizardPageTag extends UseBeanTag {
super(title);
}
+ @Override
public void createControl(Composite parent) {
// set initial parent Control to avoid a NPE during invokeBody
setControl(parent);
@@ -88,6 +89,7 @@ public class WizardPageTag extends UseBeanTag {
/*
* @see org.apache.commons.jelly.Tag#doTag(org.apache.commons.jelly.XMLOutput)
*/
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
// check location
WizardDialogTag wizardTag = (WizardDialogTag) findAncestorWithClass(WizardDialogTag.class);
diff --git a/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/ConnectionTag.java b/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/ConnectionTag.java
index 71705d8e..923fa2fe 100644
--- a/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/ConnectionTag.java
+++ b/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/ConnectionTag.java
@@ -41,12 +41,14 @@ public class ConnectionTag extends TagSupport implements ConnectionContext {
// ConnectionContext interface
//-------------------------------------------------------------------------
+ @Override
public Messenger getConnection() {
return connection;
}
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
try {
diff --git a/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/DestinationTag.java b/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/DestinationTag.java
index b39756fd..1b9fcd5b 100644
--- a/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/DestinationTag.java
+++ b/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/DestinationTag.java
@@ -38,6 +38,7 @@ public class DestinationTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
ConnectionContext messengerTag = (ConnectionContext) findAncestorWithClass( ConnectionContext.class );
if ( messengerTag == null ) {
diff --git a/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/MapEntryTag.java b/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/MapEntryTag.java
index 1c5b29c5..3446cd22 100644
--- a/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/MapEntryTag.java
+++ b/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/MapEntryTag.java
@@ -36,6 +36,7 @@ public class MapEntryTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
if ( name == null ) {
throw new MissingAttributeException("name");
diff --git a/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/MapMessageTag.java b/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/MapMessageTag.java
index bd5ac65e..3cef1082 100644
--- a/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/MapMessageTag.java
+++ b/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/MapMessageTag.java
@@ -68,6 +68,7 @@ public class MapMessageTag extends MessageTag {
// Implementation methods
//-------------------------------------------------------------------------
+ @Override
protected Message createMessage() throws JellyTagException {
try {
return getConnection().createMapMessage();
diff --git a/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/MessageOperationTag.java b/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/MessageOperationTag.java
index 7c495b51..14e0861d 100644
--- a/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/MessageOperationTag.java
+++ b/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/MessageOperationTag.java
@@ -43,6 +43,7 @@ public abstract class MessageOperationTag extends TagSupport implements Connecti
// Properties
//-------------------------------------------------------------------------
+ @Override
public Messenger getConnection() throws JellyTagException, JMSException {
if ( connection == null ) {
return findConnection();
diff --git a/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/MessageTag.java b/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/MessageTag.java
index 47df9cd9..a7961e37 100644
--- a/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/MessageTag.java
+++ b/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/MessageTag.java
@@ -57,6 +57,7 @@ public class MessageTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
if ( var == null ) {
// expose message to parent message consumer
diff --git a/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/ObjectMessageTag.java b/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/ObjectMessageTag.java
index 3d61120e..a46969de 100644
--- a/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/ObjectMessageTag.java
+++ b/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/ObjectMessageTag.java
@@ -48,6 +48,7 @@ public class ObjectMessageTag extends MessageTag {
// Implementation methods
//-------------------------------------------------------------------------
+ @Override
protected Message createMessage() throws JellyTagException {
Serializable value = (object != null) ? object : getBodyText();
try {
diff --git a/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/OnMessageTag.java b/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/OnMessageTag.java
index 5d498240..71df80d7 100644
--- a/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/OnMessageTag.java
+++ b/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/OnMessageTag.java
@@ -48,6 +48,7 @@ public class OnMessageTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
ConsumerTag tag = (ConsumerTag) findAncestorWithClass(ConsumerTag.class);
if (tag == null) {
@@ -59,6 +60,7 @@ public class OnMessageTag extends TagSupport {
final XMLOutput childOutput = output;
MessageListener listener = new MessageListener() {
+ @Override
public void onMessage(Message message) {
childContext.setVariable(var, message);
try {
diff --git a/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/PropertyTag.java b/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/PropertyTag.java
index e84f2bb5..58a1c7ed 100644
--- a/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/PropertyTag.java
+++ b/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/PropertyTag.java
@@ -37,6 +37,7 @@ public class PropertyTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
if ( name == null ) {
throw new MissingAttributeException("name");
diff --git a/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/ReceiveTag.java b/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/ReceiveTag.java
index f3fb7c14..f688927d 100644
--- a/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/ReceiveTag.java
+++ b/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/ReceiveTag.java
@@ -43,6 +43,7 @@ public class ReceiveTag extends MessageOperationTag {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
// evaluate body as it may contain a <destination> tag
invokeBody(output);
diff --git a/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/SendTag.java b/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/SendTag.java
index a3d34568..2b544a90 100644
--- a/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/SendTag.java
+++ b/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/SendTag.java
@@ -37,6 +37,7 @@ public class SendTag extends MessageOperationTag {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
// evaluate body as it may contain a <destination> or message tag
invokeBody(output);
diff --git a/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/StopwatchTag.java b/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/StopwatchTag.java
index 4f207fe5..6b219a60 100644
--- a/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/StopwatchTag.java
+++ b/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/StopwatchTag.java
@@ -48,6 +48,7 @@ public class StopwatchTag extends MessageOperationTag implements ConsumerTag {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
// evaluate body as it may contain child tags to register a MessageListener
@@ -113,6 +114,7 @@ public class StopwatchTag extends MessageOperationTag implements ConsumerTag {
/**
* Sets the JMS messageListener used to consume JMS messages on the given destination
*/
+ @Override
public void setMessageListener(MessageListener messageListener) {
this.messageListener = messageListener;
}
diff --git a/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/SubscribeTag.java b/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/SubscribeTag.java
index 9673577b..a90c756a 100644
--- a/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/SubscribeTag.java
+++ b/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/SubscribeTag.java
@@ -48,6 +48,7 @@ public class SubscribeTag extends MessageOperationTag implements ConsumerTag {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
// evaluate body as it may contain child tags to register a MessageListener
@@ -116,6 +117,7 @@ public class SubscribeTag extends MessageOperationTag implements ConsumerTag {
/**
* Sets the JMS messageListener used ot consume JMS messages on the given destination
*/
+ @Override
public void setMessageListener(MessageListener messageListener) {
this.messageListener = messageListener;
}
diff --git a/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/TextMessageTag.java b/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/TextMessageTag.java
index d9330304..2038fbff 100644
--- a/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/TextMessageTag.java
+++ b/jelly-tags/jms/src/main/java/org/apache/commons/jelly/tags/jms/TextMessageTag.java
@@ -46,6 +46,7 @@ public class TextMessageTag extends MessageTag {
// Implementation methods
//-------------------------------------------------------------------------
+ @Override
protected Message createMessage() throws JellyTagException {
String value = (text != null) ? text : getBodyText();
try {
diff --git a/jelly-tags/jmx/src/main/java/org/apache/commons/jelly/tags/jmx/ObjectNameConverter.java b/jelly-tags/jmx/src/main/java/org/apache/commons/jelly/tags/jmx/ObjectNameConverter.java
index 7d452d23..c87ef99e 100644
--- a/jelly-tags/jmx/src/main/java/org/apache/commons/jelly/tags/jmx/ObjectNameConverter.java
+++ b/jelly-tags/jmx/src/main/java/org/apache/commons/jelly/tags/jmx/ObjectNameConverter.java
@@ -37,6 +37,7 @@ public class ObjectNameConverter implements Converter {
}
//-------------------------------------------------------------------------
+ @Override
public Object convert(Class type, Object value) {
try {
if (value == null) {
diff --git a/jelly-tags/jmx/src/main/java/org/apache/commons/jelly/tags/jmx/OperationTag.java b/jelly-tags/jmx/src/main/java/org/apache/commons/jelly/tags/jmx/OperationTag.java
index 3e3ed3b0..425eb9fb 100644
--- a/jelly-tags/jmx/src/main/java/org/apache/commons/jelly/tags/jmx/OperationTag.java
+++ b/jelly-tags/jmx/src/main/java/org/apache/commons/jelly/tags/jmx/OperationTag.java
@@ -51,6 +51,7 @@ public class OperationTag extends TagSupport implements CollectionTag {
// CollectionTag interface
//-------------------------------------------------------------------------
+ @Override
public void addItem(Object value) {
if (argList == null) {
argList = new ArrayList();
@@ -60,6 +61,7 @@ public class OperationTag extends TagSupport implements CollectionTag {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
if (name == null) {
throw new MissingAttributeException("name");
diff --git a/jelly-tags/jmx/src/main/java/org/apache/commons/jelly/tags/jmx/RegisterTag.java b/jelly-tags/jmx/src/main/java/org/apache/commons/jelly/tags/jmx/RegisterTag.java
index e527ac45..96ca8b24 100644
--- a/jelly-tags/jmx/src/main/java/org/apache/commons/jelly/tags/jmx/RegisterTag.java
+++ b/jelly-tags/jmx/src/main/java/org/apache/commons/jelly/tags/jmx/RegisterTag.java
@@ -50,6 +50,7 @@ public class RegisterTag extends TagSupport implements CollectionTag {
// CollectionTag interface
//-------------------------------------------------------------------------
+ @Override
public void addItem(Object bean) throws JellyTagException {
try {
register(server, bean);
@@ -61,6 +62,7 @@ public class RegisterTag extends TagSupport implements CollectionTag {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
if (name == null) {
throw new MissingAttributeException("name");
diff --git a/jelly-tags/jmx/src/main/java/org/apache/commons/jelly/tags/jmx/ServerTag.java b/jelly-tags/jmx/src/main/java/org/apache/commons/jelly/tags/jmx/ServerTag.java
index 80d94aaa..d538da82 100644
--- a/jelly-tags/jmx/src/main/java/org/apache/commons/jelly/tags/jmx/ServerTag.java
+++ b/jelly-tags/jmx/src/main/java/org/apache/commons/jelly/tags/jmx/ServerTag.java
@@ -45,6 +45,7 @@ public class ServerTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
// force the creation of a Server
diff --git a/jelly-tags/jmx/src/test/java/org/apache/commons/jelly/tags/jmx/Dummy.java b/jelly-tags/jmx/src/test/java/org/apache/commons/jelly/tags/jmx/Dummy.java
index 54d7b085..d53e5608 100644
--- a/jelly-tags/jmx/src/test/java/org/apache/commons/jelly/tags/jmx/Dummy.java
+++ b/jelly-tags/jmx/src/test/java/org/apache/commons/jelly/tags/jmx/Dummy.java
@@ -32,11 +32,13 @@ public class Dummy implements DummyMBean {
private String name = "James";
private int count;
+ @Override
public void doSomething() {
++count;
log.info("Do something! on: " + this);
}
+ @Override
public String toString() {
return super.toString() + "[name=" + name + "]";
}
@@ -48,6 +50,7 @@ public class Dummy implements DummyMBean {
/**
* @return int
*/
+ @Override
public int getCount() {
return count;
}
@@ -55,6 +58,7 @@ public class Dummy implements DummyMBean {
/**
* @return String
*/
+ @Override
public String getName() {
return name;
}
@@ -63,6 +67,7 @@ public class Dummy implements DummyMBean {
* Sets the count.
* @param count The count to set
*/
+ @Override
public void setCount(int count) {
this.count = count;
}
@@ -71,6 +76,7 @@ public class Dummy implements DummyMBean {
* Sets the name.
* @param name The name to set
*/
+ @Override
public void setName(String name) {
this.name = name;
}
diff --git a/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/ApplyTemplatesTag.java b/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/ApplyTemplatesTag.java
index 95135d66..cd3323b8 100644
--- a/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/ApplyTemplatesTag.java
+++ b/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/ApplyTemplatesTag.java
@@ -48,6 +48,7 @@ public class ApplyTemplatesTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
/** By default just evaluate the body */
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
StylesheetTag tag = (StylesheetTag) findAncestorWithClass( StylesheetTag.class );
if (tag == null) {
diff --git a/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/JSLTagLibrary.java b/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/JSLTagLibrary.java
index ac52e071..663e6240 100644
--- a/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/JSLTagLibrary.java
+++ b/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/JSLTagLibrary.java
@@ -45,6 +45,7 @@ public class JSLTagLibrary extends XMLTagLibrary {
registerTag("valueOf", ExprTag.class);
}
+ @Override
public Expression createExpression(
ExpressionFactory factory,
TagScript tagScript,
diff --git a/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/JellyStylesheet.java b/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/JellyStylesheet.java
index 5a4abc6b..fbaf8efb 100644
--- a/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/JellyStylesheet.java
+++ b/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/JellyStylesheet.java
@@ -41,6 +41,7 @@ public class JellyStylesheet extends Stylesheet {
public JellyStylesheet() {
setValueOfAction(
new Action() {
+ @Override
public void run(Node node) throws Exception {
String text = node.getStringValue();
if ( text != null && text.length() > 0 ) {
diff --git a/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/StyleTag.java b/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/StyleTag.java
index 455adc00..891a40b3 100644
--- a/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/StyleTag.java
+++ b/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/StyleTag.java
@@ -49,6 +49,7 @@ public class StyleTag extends XPathTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
Stylesheet stylesheet = getStylesheet();
if (stylesheet == null) {
diff --git a/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/StylesheetTag.java b/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/StylesheetTag.java
index 9515515d..aa3326d1 100644
--- a/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/StylesheetTag.java
+++ b/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/StylesheetTag.java
@@ -94,6 +94,7 @@ public class StylesheetTag extends XPathTagSupport implements XPathSource {
* @return the current XPath iteration value
* so that any other XPath aware child tags to use
*/
+ @Override
public Object getXPathSource() {
return xpathSource;
}
@@ -101,6 +102,7 @@ public class StylesheetTag extends XPathTagSupport implements XPathSource {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
stylesheet = createStylesheet(output);
diff --git a/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/TemplateTag.java b/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/TemplateTag.java
index 59d7380e..5de176d6 100644
--- a/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/TemplateTag.java
+++ b/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/TemplateTag.java
@@ -61,6 +61,7 @@ public class TemplateTag extends TagSupport implements XPathSource {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
StylesheetTag tag = (StylesheetTag) findAncestorWithClass( StylesheetTag.class );
if (tag == null) {
@@ -84,6 +85,7 @@ public class TemplateTag extends TagSupport implements XPathSource {
/**
* @return the current XPath value on which relative paths are evaluated
*/
+ @Override
public Object getXPathSource() {
return xpathSource;
}
@@ -141,6 +143,7 @@ public class TemplateTag extends TagSupport implements XPathSource {
protected Action createAction(final StylesheetTag tag, final XMLOutput output) {
return new Action() {
+ @Override
public void run(Node node) throws Exception {
// store the context for use by applyTemplates tag
diff --git a/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/XPathPatternExpression.java b/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/XPathPatternExpression.java
index 354a0567..e5b29c28 100644
--- a/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/XPathPatternExpression.java
+++ b/jelly-tags/jsl/src/main/java/org/apache/commons/jelly/tags/jsl/XPathPatternExpression.java
@@ -38,10 +38,12 @@ public class XPathPatternExpression extends ExpressionSupport implements Variabl
// Expression interface
//-------------------------------------------------------------------------
+ @Override
public String getExpressionText() {
return text;
}
+ @Override
public Object evaluate(JellyContext context) {
this.context = context;
//pattern.setVariableContext(this);
@@ -50,6 +52,7 @@ public class XPathPatternExpression extends ExpressionSupport implements Variabl
// VariableContext interface
//-------------------------------------------------------------------------
+ @Override
public Object getVariableValue(
String namespaceURI,
String prefix,
diff --git a/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/AssertEqualsTag.java b/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/AssertEqualsTag.java
index 4b18029e..0dcb7077 100644
--- a/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/AssertEqualsTag.java
+++ b/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/AssertEqualsTag.java
@@ -34,6 +34,7 @@ public class AssertEqualsTag extends AssertTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
String message = getBodyText();
diff --git a/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/AssertFileContainsTag.java b/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/AssertFileContainsTag.java
index 6c716bfc..ba4e699c 100644
--- a/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/AssertFileContainsTag.java
+++ b/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/AssertFileContainsTag.java
@@ -44,6 +44,7 @@ public class AssertFileContainsTag extends AssertTagSupport
* @param output a place to write text output
* @throws JellyTagException if the file doesn't exist.
*/
+ @Override
public void doTag(XMLOutput output) throws JellyTagException
{
if (match == null)
diff --git a/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/AssertFileExistsTag.java b/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/AssertFileExistsTag.java
index 47665fef..26cefff4 100644
--- a/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/AssertFileExistsTag.java
+++ b/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/AssertFileExistsTag.java
@@ -38,7 +38,8 @@ public class AssertFileExistsTag extends AssertTagSupport
* @param output a place to write text output
* @throws JellyTagException if the file doesn't exist.
*/
- public void doTag(XMLOutput output) throws JellyTagException
+ @Override
+ public void doTag(XMLOutput output) throws JellyTagException
{
String message = getBodyText();
if (message == null || message.length() == 0)
diff --git a/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/AssertFileNotFoundTag.java b/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/AssertFileNotFoundTag.java
index b4a94bc6..f9b6ea8a 100644
--- a/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/AssertFileNotFoundTag.java
+++ b/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/AssertFileNotFoundTag.java
@@ -38,6 +38,7 @@ public class AssertFileNotFoundTag extends AssertTagSupport
* @param output a place to write text output
* @throws JellyTagException if the file exists.
*/
+ @Override
public void doTag(XMLOutput output) throws JellyTagException
{
String message = getBodyText();
diff --git a/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/AssertTag.java b/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/AssertTag.java
index 0fcd77b8..2de36d32 100644
--- a/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/AssertTag.java
+++ b/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/AssertTag.java
@@ -49,6 +49,7 @@ public class AssertTag extends AssertTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
if (test == null && xpath == null) {
throw new MissingAttributeException( "test" );
diff --git a/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/AssertThrowsTag.java b/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/AssertThrowsTag.java
index bcd61c53..a05fe79b 100644
--- a/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/AssertThrowsTag.java
+++ b/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/AssertThrowsTag.java
@@ -55,6 +55,7 @@ public class AssertThrowsTag extends AssertTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
Class throwableClass = null;
try {
diff --git a/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/CaseTag.java b/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/CaseTag.java
index 673eeba1..2d3899bf 100644
--- a/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/CaseTag.java
+++ b/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/CaseTag.java
@@ -37,6 +37,7 @@ public class CaseTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(final XMLOutput output) throws JellyTagException {
String name = getName();
if ( name == null ) {
@@ -46,6 +47,7 @@ public class CaseTag extends TagSupport {
// #### we need to redirect the output to a TestListener
// or something?
TestCase testCase = new TestCase(name) {
+ @Override
protected void runTest() throws Throwable {
// create a new child context so that each test case
// will have its own variable scopes
diff --git a/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/FailTag.java b/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/FailTag.java
index ba2d42b6..d52d7a6c 100644
--- a/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/FailTag.java
+++ b/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/FailTag.java
@@ -34,6 +34,7 @@ public class FailTag extends AssertTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
String message = getMessage();
if ( message == null ) {
diff --git a/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/JUnitTagLibrary.java b/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/JUnitTagLibrary.java
index 9ba41467..526882b9 100644
--- a/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/JUnitTagLibrary.java
+++ b/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/JUnitTagLibrary.java
@@ -52,6 +52,7 @@ public class JUnitTagLibrary extends TagLibrary {
registerTag("suite", SuiteTag.class );
}
+ @Override
public Expression createExpression(
ExpressionFactory factory,
TagScript tagScript,
diff --git a/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/JellyAssertionFailedError.java b/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/JellyAssertionFailedError.java
index 60e961f6..b86ab3f1 100644
--- a/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/JellyAssertionFailedError.java
+++ b/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/JellyAssertionFailedError.java
@@ -66,6 +66,7 @@ public class JellyAssertionFailedError extends AssertionFailedError implements L
this.cause = cause;
}
+ @Override
public Throwable getCause() {
return cause;
}
@@ -74,6 +75,7 @@ public class JellyAssertionFailedError extends AssertionFailedError implements L
/**
* @return the line number of the tag
*/
+ @Override
public int getLineNumber() {
return lineNumber;
}
@@ -81,6 +83,7 @@ public class JellyAssertionFailedError extends AssertionFailedError implements L
/**
* Sets the line number of the tag
*/
+ @Override
public void setLineNumber(int lineNumber) {
this.lineNumber = lineNumber;
}
@@ -88,6 +91,7 @@ public class JellyAssertionFailedError extends AssertionFailedError implements L
/**
* @return the column number of the tag
*/
+ @Override
public int getColumnNumber() {
return columnNumber;
}
@@ -95,6 +99,7 @@ public class JellyAssertionFailedError extends AssertionFailedError implements L
/**
* Sets the column number of the tag
*/
+ @Override
public void setColumnNumber(int columnNumber) {
this.columnNumber = columnNumber;
}
@@ -102,6 +107,7 @@ public class JellyAssertionFailedError extends AssertionFailedError implements L
/**
* @return the Jelly file which caused the problem
*/
+ @Override
public String getFileName() {
return fileName;
}
@@ -109,6 +115,7 @@ public class JellyAssertionFailedError extends AssertionFailedError implements L
/**
* Sets the Jelly file which caused the problem
*/
+ @Override
public void setFileName(String fileName) {
this.fileName = fileName;
}
@@ -117,6 +124,7 @@ public class JellyAssertionFailedError extends AssertionFailedError implements L
/**
* @return the element name which caused the problem
*/
+ @Override
public String getElementName() {
return elementName;
}
@@ -124,11 +132,13 @@ public class JellyAssertionFailedError extends AssertionFailedError implements L
/**
* Sets the element name which caused the problem
*/
+ @Override
public void setElementName(String elementName) {
this.elementName = elementName;
}
+ @Override
public String getMessage() {
return fileName + ":" + lineNumber + ":" + columnNumber + ": <" + elementName + "> " + super.getMessage();
}
@@ -138,6 +148,7 @@ public class JellyAssertionFailedError extends AssertionFailedError implements L
}
// #### overload the printStackTrace methods...
+ @Override
public void printStackTrace(PrintWriter s) {
synchronized (s) {
super.printStackTrace(s);
@@ -148,6 +159,7 @@ public class JellyAssertionFailedError extends AssertionFailedError implements L
}
}
+ @Override
public void printStackTrace(PrintStream s) {
synchronized (s) {
super.printStackTrace(s);
@@ -158,6 +170,7 @@ public class JellyAssertionFailedError extends AssertionFailedError implements L
}
}
+ @Override
public void printStackTrace() {
super.printStackTrace();
if (cause != null) {
diff --git a/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/RunTag.java b/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/RunTag.java
index 4cb6acfd..d87842ff 100644
--- a/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/RunTag.java
+++ b/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/RunTag.java
@@ -51,6 +51,7 @@ public class RunTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
Test test = getTest();
if ( test == null ) {
@@ -141,6 +142,7 @@ public class RunTag extends TagSupport {
*/
protected TestListener createTestListener(final XMLOutput output) {
return new TestListener() {
+ @Override
public void addError(Test test, Throwable t) {
try {
output.startElement("error");
@@ -160,6 +162,7 @@ public class RunTag extends TagSupport {
}
}
+ @Override
public void addFailure(Test test, AssertionFailedError t) {
try {
output.startElement("failure");
@@ -179,6 +182,7 @@ public class RunTag extends TagSupport {
}
}
+ @Override
public void endTest(Test test) {
try {
output.endElement("test");
@@ -188,6 +192,7 @@ public class RunTag extends TagSupport {
}
}
+ @Override
public void startTest(Test test) {
try {
String name = test.toString();
diff --git a/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/SuiteTag.java b/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/SuiteTag.java
index 2082ba0b..1eb6eaff 100644
--- a/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/SuiteTag.java
+++ b/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/SuiteTag.java
@@ -52,6 +52,7 @@ public class SuiteTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
suite = createSuite();
diff --git a/jelly-tags/log/src/main/java/org/apache/commons/jelly/tags/log/DebugTag.java b/jelly-tags/log/src/main/java/org/apache/commons/jelly/tags/log/DebugTag.java
index 61d03c86..5075aa88 100644
--- a/jelly-tags/log/src/main/java/org/apache/commons/jelly/tags/log/DebugTag.java
+++ b/jelly-tags/log/src/main/java/org/apache/commons/jelly/tags/log/DebugTag.java
@@ -33,6 +33,7 @@ public class DebugTag extends LogTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
Log log = getLog();
if ( log.isDebugEnabled() ) {
diff --git a/jelly-tags/log/src/main/java/org/apache/commons/jelly/tags/log/ErrorTag.java b/jelly-tags/log/src/main/java/org/apache/commons/jelly/tags/log/ErrorTag.java
index 850cb812..81216097 100644
--- a/jelly-tags/log/src/main/java/org/apache/commons/jelly/tags/log/ErrorTag.java
+++ b/jelly-tags/log/src/main/java/org/apache/commons/jelly/tags/log/ErrorTag.java
@@ -33,6 +33,7 @@ public class ErrorTag extends LogTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
Log log = getLog();
if ( log.isErrorEnabled() ) {
diff --git a/jelly-tags/log/src/main/java/org/apache/commons/jelly/tags/log/FatalTag.java b/jelly-tags/log/src/main/java/org/apache/commons/jelly/tags/log/FatalTag.java
index 02f875b8..cb081daa 100644
--- a/jelly-tags/log/src/main/java/org/apache/commons/jelly/tags/log/FatalTag.java
+++ b/jelly-tags/log/src/main/java/org/apache/commons/jelly/tags/log/FatalTag.java
@@ -33,6 +33,7 @@ public class FatalTag extends LogTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
Log log = getLog();
if ( log.isFatalEnabled() ) {
diff --git a/jelly-tags/log/src/main/java/org/apache/commons/jelly/tags/log/InfoTag.java b/jelly-tags/log/src/main/java/org/apache/commons/jelly/tags/log/InfoTag.java
index f21babd0..13a17078 100644
--- a/jelly-tags/log/src/main/java/org/apache/commons/jelly/tags/log/InfoTag.java
+++ b/jelly-tags/log/src/main/java/org/apache/commons/jelly/tags/log/InfoTag.java
@@ -33,6 +33,7 @@ public class InfoTag extends LogTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
Log log = getLog();
if ( log.isInfoEnabled() ) {
diff --git a/jelly-tags/log/src/main/java/org/apache/commons/jelly/tags/log/TraceTag.java b/jelly-tags/log/src/main/java/org/apache/commons/jelly/tags/log/TraceTag.java
index bf94489a..d483638f 100644
--- a/jelly-tags/log/src/main/java/org/apache/commons/jelly/tags/log/TraceTag.java
+++ b/jelly-tags/log/src/main/java/org/apache/commons/jelly/tags/log/TraceTag.java
@@ -33,6 +33,7 @@ public class TraceTag extends LogTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
Log log = getLog();
if ( log.isTraceEnabled() ) {
diff --git a/jelly-tags/log/src/main/java/org/apache/commons/jelly/tags/log/WarnTag.java b/jelly-tags/log/src/main/java/org/apache/commons/jelly/tags/log/WarnTag.java
index 487150d7..b2e2501f 100644
--- a/jelly-tags/log/src/main/java/org/apache/commons/jelly/tags/log/WarnTag.java
+++ b/jelly-tags/log/src/main/java/org/apache/commons/jelly/tags/log/WarnTag.java
@@ -33,6 +33,7 @@ public class WarnTag extends LogTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
Log log = getLog();
if ( log.isWarnEnabled() ) {
diff --git a/jelly-tags/log/src/test/java/org/apache/commons/jelly/tags/log/MockLog.java b/jelly-tags/log/src/test/java/org/apache/commons/jelly/tags/log/MockLog.java
index b1618da6..cfe70bcc 100644
--- a/jelly-tags/log/src/test/java/org/apache/commons/jelly/tags/log/MockLog.java
+++ b/jelly-tags/log/src/test/java/org/apache/commons/jelly/tags/log/MockLog.java
@@ -58,6 +58,7 @@ public class MockLog implements Log {
/**
* @see org.apache.commons.logging.Log#debug(java.lang.Object, java.lang.Throwable)
*/
+ @Override
public void debug(Object message, Throwable exception) {
this.debug = message;
this.lastThrowable = exception;
@@ -66,6 +67,7 @@ public class MockLog implements Log {
/**
* @see org.apache.commons.logging.Log#debug(java.lang.Object)
*/
+ @Override
public void debug(Object message) {
this.debug = message;
}
@@ -73,6 +75,7 @@ public class MockLog implements Log {
/**
* @see org.apache.commons.logging.Log#error(java.lang.Object, java.lang.Throwable)
*/
+ @Override
public void error(Object message, Throwable exception) {
this.error = message;
this.lastThrowable = exception;
@@ -81,6 +84,7 @@ public class MockLog implements Log {
/**
* @see org.apache.commons.logging.Log#error(java.lang.Object)
*/
+ @Override
public void error(Object message) {
this.error = message;
}
@@ -88,6 +92,7 @@ public class MockLog implements Log {
/**
* @see org.apache.commons.logging.Log#fatal(java.lang.Object, java.lang.Throwable)
*/
+ @Override
public void fatal(Object message, Throwable exception) {
this.fatal = message;
this.lastThrowable = exception;
@@ -96,6 +101,7 @@ public class MockLog implements Log {
/**
* @see org.apache.commons.logging.Log#fatal(java.lang.Object)
*/
+ @Override
public void fatal(Object message) {
this.fatal = message;
}
@@ -103,6 +109,7 @@ public class MockLog implements Log {
/**
* @see org.apache.commons.logging.Log#info(java.lang.Object, java.lang.Throwable)
*/
+ @Override
public void info(Object message, Throwable exception) {
this.info = message;
this.lastThrowable = exception;
@@ -111,6 +118,7 @@ public class MockLog implements Log {
/**
* @see org.apache.commons.logging.Log#info(java.lang.Object)
*/
+ @Override
public void info(Object message) {
this.info = message;
}
@@ -118,6 +126,7 @@ public class MockLog implements Log {
/**
* @see org.apache.commons.logging.Log#isDebugEnabled()
*/
+ @Override
public boolean isDebugEnabled() {
return true;
}
@@ -125,6 +134,7 @@ public class MockLog implements Log {
/**
* @see org.apache.commons.logging.Log#isErrorEnabled()
*/
+ @Override
public boolean isErrorEnabled() {
return true;
}
@@ -132,6 +142,7 @@ public class MockLog implements Log {
/**
* @see org.apache.commons.logging.Log#isFatalEnabled()
*/
+ @Override
public boolean isFatalEnabled() {
return true;
}
@@ -139,6 +150,7 @@ public class MockLog implements Log {
/**
* @see org.apache.commons.logging.Log#isInfoEnabled()
*/
+ @Override
public boolean isInfoEnabled() {
return true;
}
@@ -146,6 +158,7 @@ public class MockLog implements Log {
/**
* @see org.apache.commons.logging.Log#isTraceEnabled()
*/
+ @Override
public boolean isTraceEnabled() {
return true;
}
@@ -153,6 +166,7 @@ public class MockLog implements Log {
/**
* @see org.apache.commons.logging.Log#isWarnEnabled()
*/
+ @Override
public boolean isWarnEnabled() {
return true;
}
diff --git a/jelly-tags/memory/src/main/java/org/apache/commons/jelly/tags/memory/FreeMemoryTag.java b/jelly-tags/memory/src/main/java/org/apache/commons/jelly/tags/memory/FreeMemoryTag.java
index 78867f35..8a7198b2 100644
--- a/jelly-tags/memory/src/main/java/org/apache/commons/jelly/tags/memory/FreeMemoryTag.java
+++ b/jelly-tags/memory/src/main/java/org/apache/commons/jelly/tags/memory/FreeMemoryTag.java
@@ -46,6 +46,7 @@ public class FreeMemoryTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
Runtime r = Runtime.getRuntime();
diff --git a/jelly-tags/memory/src/main/java/org/apache/commons/jelly/tags/memory/GcTag.java b/jelly-tags/memory/src/main/java/org/apache/commons/jelly/tags/memory/GcTag.java
index 1a64b931..cee6675f 100644
--- a/jelly-tags/memory/src/main/java/org/apache/commons/jelly/tags/memory/GcTag.java
+++ b/jelly-tags/memory/src/main/java/org/apache/commons/jelly/tags/memory/GcTag.java
@@ -30,6 +30,7 @@ public class GcTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
Runtime r = Runtime.getRuntime();
diff --git a/jelly-tags/ojb/src/main/java/org/apache/commons/jelly/tags/ojb/BrokerTag.java b/jelly-tags/ojb/src/main/java/org/apache/commons/jelly/tags/ojb/BrokerTag.java
index 129e23c5..6cc86d07 100644
--- a/jelly-tags/ojb/src/main/java/org/apache/commons/jelly/tags/ojb/BrokerTag.java
+++ b/jelly-tags/ojb/src/main/java/org/apache/commons/jelly/tags/ojb/BrokerTag.java
@@ -42,6 +42,7 @@ public class BrokerTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
if ( var == null ) {
var = "org.apache.commons.jelly.ojb.Broker";
diff --git a/jelly-tags/ojb/src/main/java/org/apache/commons/jelly/tags/ojb/StoreTag.java b/jelly-tags/ojb/src/main/java/org/apache/commons/jelly/tags/ojb/StoreTag.java
index c519db97..53820bb2 100644
--- a/jelly-tags/ojb/src/main/java/org/apache/commons/jelly/tags/ojb/StoreTag.java
+++ b/jelly-tags/ojb/src/main/java/org/apache/commons/jelly/tags/ojb/StoreTag.java
@@ -41,6 +41,7 @@ public class StoreTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
if ( value == null ) {
throw new JellyTagException( "No value is supplied!" );
diff --git a/jelly-tags/quartz/src/main/java/org/apache/commons/jelly/tags/quartz/CronTriggerTag.java b/jelly-tags/quartz/src/main/java/org/apache/commons/jelly/tags/quartz/CronTriggerTag.java
index 7bd44e8a..cb95a509 100644
--- a/jelly-tags/quartz/src/main/java/org/apache/commons/jelly/tags/quartz/CronTriggerTag.java
+++ b/jelly-tags/quartz/src/main/java/org/apache/commons/jelly/tags/quartz/CronTriggerTag.java
@@ -167,6 +167,7 @@ public class CronTriggerTag extends QuartzTagSupport
* @throws MissingAttributeException If an error occurs.
* @throws JellyTagException If an error occurs.
*/
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException
{
if ( getSpec() == null )
diff --git a/jelly-tags/quartz/src/main/java/org/apache/commons/jelly/tags/quartz/JellyJob.java b/jelly-tags/quartz/src/main/java/org/apache/commons/jelly/tags/quartz/JellyJob.java
index 5371340e..61105312 100644
--- a/jelly-tags/quartz/src/main/java/org/apache/commons/jelly/tags/quartz/JellyJob.java
+++ b/jelly-tags/quartz/src/main/java/org/apache/commons/jelly/tags/quartz/JellyJob.java
@@ -58,6 +58,7 @@ public class JellyJob implements Job
*
* @throws JobExecutionException If an error occurs during job execution.
*/
+ @Override
public void execute(JobExecutionContext jobContext) throws JobExecutionException
{
diff --git a/jelly-tags/quartz/src/main/java/org/apache/commons/jelly/tags/quartz/JobTag.java b/jelly-tags/quartz/src/main/java/org/apache/commons/jelly/tags/quartz/JobTag.java
index 50fedaa4..07c79307 100644
--- a/jelly-tags/quartz/src/main/java/org/apache/commons/jelly/tags/quartz/JobTag.java
+++ b/jelly-tags/quartz/src/main/java/org/apache/commons/jelly/tags/quartz/JobTag.java
@@ -104,6 +104,7 @@ public class JobTag extends QuartzTagSupport
* @throws MissingAttributeException If an error occurs.
* @throws JellyTagException If an error occurs.
*/
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException
{
if ( getName() == null )
diff --git a/jelly-tags/quartz/src/main/java/org/apache/commons/jelly/tags/quartz/QuartzTagSupport.java b/jelly-tags/quartz/src/main/java/org/apache/commons/jelly/tags/quartz/QuartzTagSupport.java
index 9af7652a..d3414f0b 100644
--- a/jelly-tags/quartz/src/main/java/org/apache/commons/jelly/tags/quartz/QuartzTagSupport.java
+++ b/jelly-tags/quartz/src/main/java/org/apache/commons/jelly/tags/quartz/QuartzTagSupport.java
@@ -63,6 +63,7 @@ public abstract class QuartzTagSupport extends TagSupport
Runtime.getRuntime().addShutdownHook(
new Thread() {
+ @Override
public void run()
{
try
diff --git a/jelly-tags/quartz/src/main/java/org/apache/commons/jelly/tags/quartz/WaitForSchedulerTag.java b/jelly-tags/quartz/src/main/java/org/apache/commons/jelly/tags/quartz/WaitForSchedulerTag.java
index 2a6b5c53..18616826 100644
--- a/jelly-tags/quartz/src/main/java/org/apache/commons/jelly/tags/quartz/WaitForSchedulerTag.java
+++ b/jelly-tags/quartz/src/main/java/org/apache/commons/jelly/tags/quartz/WaitForSchedulerTag.java
@@ -55,6 +55,7 @@ public class WaitForSchedulerTag extends QuartzTagSupport
*
* @throws JellyTagException If an error occurs.
*/
+ @Override
public void doTag(XMLOutput output) throws JellyTagException
{
try {
diff --git a/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/ContainsTag.java b/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/ContainsTag.java
index 820c4a83..b3bc9ba7 100644
--- a/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/ContainsTag.java
+++ b/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/ContainsTag.java
@@ -23,6 +23,7 @@ package org.apache.commons.jelly.tags.regexp;
* @author <a href="mailto:christian@inx-soft.com">Christian Amor Kvalheim</a>
*/
public class ContainsTag extends RegexpTag {
+ @Override
protected boolean getResult() {
return getPatternMatcher().contains(getText(), getPattern());
}
diff --git a/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/MatchTag.java b/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/MatchTag.java
index b0e40e8c..e9ba5d21 100644
--- a/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/MatchTag.java
+++ b/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/MatchTag.java
@@ -22,6 +22,7 @@ package org.apache.commons.jelly.tags.regexp;
* @author <a href="mailto:christian@inx-soft.com">Christian Amor Kvalheim</a>
*/
public class MatchTag extends RegexpTag {
+ @Override
protected boolean getResult() {
return getPatternMatcher().matches(getText(), getPattern());
}
diff --git a/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/RegexpTag.java b/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/RegexpTag.java
index 1eef18d4..2554861a 100644
--- a/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/RegexpTag.java
+++ b/jelly-tags/regexp/src/main/java/org/apache/commons/jelly/tags/regexp/RegexpTag.java
@@ -74,6 +74,7 @@ public abstract class RegexpTag extends TagSupport {
this.scope = scope;
}
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
// Check required properties
if (getText() == null || getText().length() == 0)
diff --git a/jelly-tags/regexp/src/test/java/org/apache/commons/jelly/tags/regexp/ContainsTagTest.java b/jelly-tags/regexp/src/test/java/org/apache/commons/jelly/tags/regexp/ContainsTagTest.java
index 8b0a62c0..2260a2a1 100644
--- a/jelly-tags/regexp/src/test/java/org/apache/commons/jelly/tags/regexp/ContainsTagTest.java
+++ b/jelly-tags/regexp/src/test/java/org/apache/commons/jelly/tags/regexp/ContainsTagTest.java
@@ -33,6 +33,7 @@ public class ContainsTagTest extends TestCase {
super(name);
}
+ @Override
public void setUp() throws Exception
{
}
@@ -51,6 +52,7 @@ public class ContainsTagTest extends TestCase {
assertEquals("TRUE", containsExpTag.getContext().getVariable("testvar").toString().toUpperCase());
}
+ @Override
public void tearDown()
{
}
diff --git a/jelly-tags/regexp/src/test/java/org/apache/commons/jelly/tags/regexp/MatchTagTest.java b/jelly-tags/regexp/src/test/java/org/apache/commons/jelly/tags/regexp/MatchTagTest.java
index d849ac9d..bde657d9 100644
--- a/jelly-tags/regexp/src/test/java/org/apache/commons/jelly/tags/regexp/MatchTagTest.java
+++ b/jelly-tags/regexp/src/test/java/org/apache/commons/jelly/tags/regexp/MatchTagTest.java
@@ -33,7 +33,8 @@ public class MatchTagTest extends TestCase {
super(name);
}
- public void setUp() throws Exception
+ @Override
+public void setUp() throws Exception
{
}
@@ -51,7 +52,8 @@ public class MatchTagTest extends TestCase {
assertEquals("TRUE", matchExpTag.getContext().getVariable("testvar").toString().toUpperCase());
}
- public void tearDown()
+ @Override
+public void tearDown()
{
}
}
\ No newline at end of file
diff --git a/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/InvokeRawTag.java b/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/InvokeRawTag.java
index 241e9edf..e14544a4 100644
--- a/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/InvokeRawTag.java
+++ b/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/InvokeRawTag.java
@@ -48,6 +48,7 @@ public class InvokeRawTag extends TagSupport
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output)
throws MissingAttributeException, JellyTagException
{
diff --git a/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/InvokeTag.java b/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/InvokeTag.java
index 5112c108..75546f1a 100644
--- a/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/InvokeTag.java
+++ b/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/InvokeTag.java
@@ -51,6 +51,7 @@ public class InvokeTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
if (endpoint == null) {
throw new MissingAttributeException("endpoint");
diff --git a/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/StringInputStream.java b/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/StringInputStream.java
index 0df4acf8..c2af5cdc 100644
--- a/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/StringInputStream.java
+++ b/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/StringInputStream.java
@@ -54,6 +54,7 @@ public class StringInputStream
*
* @throws IOException if the original StringReader fails to be read
*/
+ @Override
public int read() throws IOException
{
return in.read();
@@ -64,6 +65,7 @@ public class StringInputStream
*
* @throws IOException if the original StringReader fails to be closed
*/
+ @Override
public void close() throws IOException
{
in.close();
@@ -75,6 +77,7 @@ public class StringInputStream
* @param limit the maximum limit of bytes that can be read before the
* mark position becomes invalid
*/
+ @Override
public synchronized void mark( final int limit )
{
try
@@ -92,6 +95,7 @@ public class StringInputStream
*
* @throws IOException if the StringReader fails to be reset
*/
+ @Override
public synchronized void reset() throws IOException
{
in.reset();
@@ -100,6 +104,7 @@ public class StringInputStream
/**
* @see InputStream#markSupported
*/
+ @Override
public boolean markSupported()
{
return in.markSupported();
diff --git a/jelly-tags/sql/src/main/java/javax/servlet/jsp/jstl/sql/ResultImpl.java b/jelly-tags/sql/src/main/java/javax/servlet/jsp/jstl/sql/ResultImpl.java
index 6ef9fbda..91713adb 100644
--- a/jelly-tags/sql/src/main/java/javax/servlet/jsp/jstl/sql/ResultImpl.java
+++ b/jelly-tags/sql/src/main/java/javax/servlet/jsp/jstl/sql/ResultImpl.java
@@ -103,6 +103,7 @@ class ResultImpl implements Result {
*
* @return an array of Map, or null if there are no rows
*/
+ @Override
public SortedMap[] getRows() {
if (rowMap == null) {
return null;
@@ -120,6 +121,7 @@ class ResultImpl implements Result {
*
* @return an array of Object[], or null if there are no rows
*/
+ @Override
public Object[][] getRowsByIndex() {
if (rowByIndex == null) {
return null;
@@ -136,6 +138,7 @@ class ResultImpl implements Result {
*
* @return an array of String[]
*/
+ @Override
public String[] getColumnNames() {
return columnNames;
}
@@ -146,6 +149,7 @@ class ResultImpl implements Result {
* @return the number of cached rows, or -1 if the Result could
* not be initialized due to SQLExceptions
*/
+ @Override
public int getRowCount() {
if (rowMap == null) {
return -1;
@@ -158,6 +162,7 @@ class ResultImpl implements Result {
*
* @return true if the query was limited by a MaxRows attribute
*/
+ @Override
public boolean isLimitedByMaxRows() {
return isLimited;
}
diff --git a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/DataSourceWrapper.java b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/DataSourceWrapper.java
index 1f1f946f..4fca3b4d 100644
--- a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/DataSourceWrapper.java
+++ b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/DataSourceWrapper.java
@@ -66,6 +66,7 @@ public class DataSourceWrapper implements DataSource {
throw new SQLException(Resources.getMessage("NOT_SUPPORTED"));
}
+ @Override
public boolean isWrapperFor(Class<?> aClass) throws SQLException {
return false;
}
@@ -82,6 +83,7 @@ public class DataSourceWrapper implements DataSource {
* Returns a Connection using the DriverManager and all
* set properties.
*/
+ @Override
public Connection getConnection() throws SQLException {
Connection conn = null;
if (userName != null) {
@@ -110,6 +112,7 @@ public class DataSourceWrapper implements DataSource {
* Always throws a SQLException. Username and password are set
* in the constructor and can not be changed.
*/
+ @Override
public Connection getConnection(String username, String password)
throws SQLException {
throw new SQLException(Resources.getMessage("NOT_SUPPORTED"));
@@ -118,6 +121,7 @@ public class DataSourceWrapper implements DataSource {
/**
* Always throws a SQLException. Not supported.
*/
+ @Override
public int getLoginTimeout() throws SQLException {
throw new SQLException(Resources.getMessage("NOT_SUPPORTED"));
}
@@ -125,6 +129,7 @@ public class DataSourceWrapper implements DataSource {
/**
* Always throws a SQLException. Not supported.
*/
+ @Override
public PrintWriter getLogWriter() throws SQLException {
throw new SQLException(Resources.getMessage("NOT_SUPPORTED"));
}
@@ -132,6 +137,7 @@ public class DataSourceWrapper implements DataSource {
/**
* Always throws a SQLException. Not supported.
*/
+ @Override
public void setLoginTimeout(int seconds) throws SQLException {
throw new SQLException(Resources.getMessage("NOT_SUPPORTED"));
}
@@ -139,6 +145,7 @@ public class DataSourceWrapper implements DataSource {
/**
* Always throws a SQLException. Not supported.
*/
+ @Override
public synchronized void setLogWriter(PrintWriter out) throws SQLException {
throw new SQLException(Resources.getMessage("NOT_SUPPORTED"));
}
diff --git a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/DateParamTag.java b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/DateParamTag.java
index 2c8796d1..bc8c019b 100644
--- a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/DateParamTag.java
+++ b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/DateParamTag.java
@@ -67,6 +67,7 @@ public class DateParamTag extends TagSupport {
//*********************************************************************
// Tag logic
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
SQLExecutionTag parent =
(SQLExecutionTag) findAncestorWithClass(this, SQLExecutionTag.class);
diff --git a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/DriverTag.java b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/DriverTag.java
index 3be7d475..c33a990a 100644
--- a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/DriverTag.java
+++ b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/DriverTag.java
@@ -71,6 +71,7 @@ public class DriverTag extends TagSupport {
//*********************************************************************
// Tag logic
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
DataSourceWrapper ds = new DataSourceWrapper();
try {
diff --git a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/ParamTag.java b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/ParamTag.java
index f962a3de..8e8e8b78 100644
--- a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/ParamTag.java
+++ b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/ParamTag.java
@@ -41,6 +41,7 @@ public class ParamTag extends TagSupport {
//*********************************************************************
// Tag logic
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
SQLExecutionTag parent =
(SQLExecutionTag) findAncestorWithClass(this, SQLExecutionTag.class);
diff --git a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/QueryTag.java b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/QueryTag.java
index 9676a385..671bba73 100644
--- a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/QueryTag.java
+++ b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/QueryTag.java
@@ -100,6 +100,7 @@ public class QueryTag extends SqlTagSupport {
* element, or is retrieved from a JSP scope attribute
* named <code>javax.servlet.jstl.sql.dataSource</code>.
*/
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
if (!maxRowsSpecified) {
diff --git a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/ResultImpl.java b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/ResultImpl.java
index 3faa915f..d72d4546 100644
--- a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/ResultImpl.java
+++ b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/ResultImpl.java
@@ -151,6 +151,7 @@ public class ResultImpl implements Result {
*
* @return an array of Map, or null if there are no rows
*/
+ @Override
public SortedMap[] getRows() {
if (rowMap == null) {
return null;
@@ -168,6 +169,7 @@ public class ResultImpl implements Result {
*
* @return an array of Object[], or null if there are no rows
*/
+ @Override
public Object[][] getRowsByIndex() {
if (rowByIndex == null) {
return null;
@@ -184,6 +186,7 @@ public class ResultImpl implements Result {
*
* @return an array of String[]
*/
+ @Override
public String[] getColumnNames() {
return columnNames;
}
@@ -194,6 +197,7 @@ public class ResultImpl implements Result {
* @return the number of cached rows, or -1 if the Result could
* not be initialized due to SQLExceptions
*/
+ @Override
public int getRowCount() {
if (rowMap == null) {
return -1;
@@ -206,6 +210,7 @@ public class ResultImpl implements Result {
*
* @return true if the query was limited by a MaxRows attribute
*/
+ @Override
public boolean isLimitedByMaxRows() {
return isLimited;
}
diff --git a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/ResultSetTag.java b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/ResultSetTag.java
index c4104d88..613482d1 100644
--- a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/ResultSetTag.java
+++ b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/ResultSetTag.java
@@ -43,6 +43,7 @@ public class ResultSetTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
if (var == null) {
throw new MissingAttributeException( "var" );
diff --git a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/RowTag.java b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/RowTag.java
index df63b37c..0177271d 100644
--- a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/RowTag.java
+++ b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/RowTag.java
@@ -28,6 +28,7 @@ public class RowTag extends MapTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
ResultSetTag tag = (ResultSetTag) findAncestorWithClass( ResultSetTag.class );
if ( tag == null ) {
diff --git a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/SetDataSourceTag.java b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/SetDataSourceTag.java
index 67332a2a..b71fb229 100644
--- a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/SetDataSourceTag.java
+++ b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/SetDataSourceTag.java
@@ -94,6 +94,7 @@ public class SetDataSourceTag extends TagSupport {
//*********************************************************************
// Tag logic
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
DataSource ds = null;
diff --git a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/SqlTagSupport.java b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/SqlTagSupport.java
index 5c139706..85b5bc09 100644
--- a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/SqlTagSupport.java
+++ b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/SqlTagSupport.java
@@ -111,6 +111,7 @@ public abstract class SqlTagSupport extends TagSupport implements SQLExecutionTa
* Called by nested parameter elements to add PreparedStatement
* parameter values.
*/
+ @Override
public void addSQLParameter(Object o) {
if (parameters == null) {
parameters = new ArrayList();
diff --git a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/TransactionTag.java b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/TransactionTag.java
index 1c1bbef1..2c750012 100644
--- a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/TransactionTag.java
+++ b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/TransactionTag.java
@@ -80,6 +80,7 @@ public class TransactionTag extends TagSupport {
* getting the <code>Connection</code> and preparing it for
* the transaction.
*/
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
if ((rawDataSource == null) && dataSourceSpecified) {
diff --git a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/UpdateTag.java b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/UpdateTag.java
index d1e7b18c..3e277c9d 100644
--- a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/UpdateTag.java
+++ b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/UpdateTag.java
@@ -67,6 +67,7 @@ public class UpdateTag extends SqlTagSupport {
* element, or is retrieved from a JSP scope attribute
* named <code>javax.servlet.jsp.jstl.sql.dataSource</code>.
*/
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
try {
conn = getConnection();
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ActionTag.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ActionTag.java
index 00a3a467..6f6f4544 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ActionTag.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ActionTag.java
@@ -67,6 +67,7 @@ public class ActionTag extends UseBeanTag {
* An existing Action could be specified via the 'action' attribute or an action class
* may be specified via the 'class' attribute, otherwise a default Action class is created.
*/
+ @Override
protected Class convertToClass(Object classObject) throws MissingAttributeException, ClassNotFoundException {
if (classObject == null) {
return null;
@@ -80,6 +81,7 @@ public class ActionTag extends UseBeanTag {
* An existing Action could be specified via the 'action' attribute or an action class
* may be specified via the 'class' attribute, otherwise a default Action class is created.
*/
+ @Override
protected Object newInstance(Class theClass, Map attributes, final XMLOutput output) throws JellyTagException {
Action action = (Action) attributes.remove( "action" );
if ( action == null ) {
@@ -96,6 +98,7 @@ public class ActionTag extends UseBeanTag {
}
else {
action = new AbstractAction() {
+ @Override
public void actionPerformed(ActionEvent event) {
context.setVariable( "event", event );
try {
@@ -111,7 +114,8 @@ public class ActionTag extends UseBeanTag {
return action;
}
- public void invokeBody(XMLOutput output) {
+ @Override
+ public void invokeBody(XMLOutput output) {
// do nothing
}
@@ -119,6 +123,7 @@ public class ActionTag extends UseBeanTag {
/**
* Either defines a variable or adds the current component to the parent
*/
+ @Override
protected void processBean(String var, Object bean) throws JellyTagException {
if (var != null) {
context.setVariable(var, bean);
@@ -138,6 +143,7 @@ public class ActionTag extends UseBeanTag {
/**
* Perform the strange setting of Action properties using its custom API
*/
+ @Override
protected void setBeanProperties(Object bean, Map attributes) throws JellyTagException {
Action action = getAction();
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/BeanFactory.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/BeanFactory.java
index 645048dd..5101b156 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/BeanFactory.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/BeanFactory.java
@@ -32,6 +32,7 @@ public class BeanFactory implements Factory {
/**
* Create a new component instance
*/
+ @Override
public Object newInstance() throws InstantiationException {
try {
return beanClass.newInstance();
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/BorderAlignTag.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/BorderAlignTag.java
index e8bf09f4..2d948c44 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/BorderAlignTag.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/BorderAlignTag.java
@@ -38,6 +38,7 @@ public class BorderAlignTag extends TagSupport implements ContainerTag {
/**
* Adds a child component to this parent
*/
+ @Override
public void addChild(Component component, Object constraints) throws JellyTagException {
BorderLayoutTag tag = (BorderLayoutTag) findAncestorWithClass( BorderLayoutTag.class );
if (tag == null) {
@@ -48,6 +49,7 @@ public class BorderAlignTag extends TagSupport implements ContainerTag {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(final XMLOutput output) throws JellyTagException {
invokeBody(output);
}
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/BorderLayoutTag.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/BorderLayoutTag.java
index 6a50ec53..72ef1050 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/BorderLayoutTag.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/BorderLayoutTag.java
@@ -77,6 +77,7 @@ public class BorderLayoutTag extends LayoutTagSupport {
/**
* Creates a BorderLayout
*/
+ @Override
protected LayoutManager createLayoutManager() {
return new BorderLayout(hgap, vgap);
}
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/BorderTagSupport.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/BorderTagSupport.java
index a1c12e68..b41524ae 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/BorderTagSupport.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/BorderTagSupport.java
@@ -42,6 +42,7 @@ public abstract class BorderTagSupport extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(final XMLOutput output) throws JellyTagException {
Border border = createBorder();
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ButtonGroupTag.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ButtonGroupTag.java
index 84131e8e..ade11b87 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ButtonGroupTag.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ButtonGroupTag.java
@@ -69,6 +69,7 @@ public class ButtonGroupTag extends ComponentTag {
* @throws JellyTagException
* @see org.apache.commons.jelly.tags.swing.ContainerTag#addChild(java.awt.Component, java.lang.Object)
*/
+ @Override
public void addChild(Component component, Object constraints) throws JellyTagException {
if (component instanceof AbstractButton) {
getButtonGroup().add((AbstractButton) component);
@@ -88,6 +89,7 @@ public class ButtonGroupTag extends ComponentTag {
/**Creates a new buttonGroup.
* @see org.apache.commons.jelly.tags.core.UseBeanTag#newInstance(java.lang.Class, java.util.Map, org.apache.commons.jelly.XMLOutput)
*/
+ @Override
protected Object newInstance(Class theClass, Map attributes,
XMLOutput output) throws JellyTagException {
return new ButtonGroup();
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/CardLayoutTag.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/CardLayoutTag.java
index fe2fc3ad..4c83619e 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/CardLayoutTag.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/CardLayoutTag.java
@@ -32,6 +32,7 @@ public class CardLayoutTag extends LayoutTagSupport {
private int vgap;
private boolean vgapSet = false;
+ @Override
protected LayoutManager createLayoutManager() {
CardLayout cl = new CardLayout();
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ComponentTag.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ComponentTag.java
index ca8dac2e..364400a6 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ComponentTag.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ComponentTag.java
@@ -83,6 +83,7 @@ public class ComponentTag extends UseBeanTag implements ContainerTag {
this.factory = factory;
}
+ @Override
public String toString() {
Component comp = getComponent();
String componentName = (comp!=null) ? comp.getName() : null;
@@ -234,6 +235,7 @@ public class ComponentTag extends UseBeanTag implements ContainerTag {
/**
* Adds a child component to this parent
*/
+ @Override
public void addChild(Component component, Object constraints) throws JellyTagException {
Object parent = getBean();
if ( parent instanceof JFrame && component instanceof JMenuBar ) {
@@ -294,6 +296,7 @@ public class ComponentTag extends UseBeanTag implements ContainerTag {
/**
* A class may be specified otherwise the Factory will be used.
*/
+ @Override
protected Class convertToClass(Object classObject) throws MissingAttributeException, ClassNotFoundException {
if (classObject == null) {
return null;
@@ -306,6 +309,7 @@ public class ComponentTag extends UseBeanTag implements ContainerTag {
/**
* A class may be specified otherwise the Factory will be used.
*/
+ @Override
protected Object newInstance(Class theClass, Map attributes, XMLOutput output) throws JellyTagException {
if (attributes.containsKey("tagName")) {
this.setTagName((String)attributes.get("tagName"));
@@ -332,6 +336,7 @@ public class ComponentTag extends UseBeanTag implements ContainerTag {
/**
* Either defines a variable or adds the current component to the parent
*/
+ @Override
protected void processBean(String var, Object bean) throws JellyTagException {
if (var != null) {
context.setVariable(var, bean);
@@ -353,6 +358,7 @@ public class ComponentTag extends UseBeanTag implements ContainerTag {
/**
* Handles wierd properties that don't quite match the Java Beans contract
*/
+ @Override
protected void setBeanProperties(Object bean, Map attributes) throws JellyTagException {
Component component = getComponent();
@@ -423,6 +429,7 @@ public class ComponentTag extends UseBeanTag implements ContainerTag {
* around for longer than they are needed.
* @see org.apache.commons.jelly.Tag#doTag(org.apache.commons.jelly.XMLOutput)
*/
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
super.doTag(output);
clearBean();
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ConstraintTag.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ConstraintTag.java
index a0254a1b..9fabbb05 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ConstraintTag.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ConstraintTag.java
@@ -58,6 +58,7 @@ public class ConstraintTag extends DynaBeanTagSupport {
public static class HereFactory extends BeanFactory implements TagFactory {
public HereFactory(Class c) { super(c); }
+ @Override
public Tag createTag(String name, Attributes attributes) {
return new ConstraintTag ( this );
// still scratching my head about "this" usage...
@@ -66,7 +67,9 @@ public class ConstraintTag extends DynaBeanTagSupport {
public static class ConstantFactory implements TagFactory, Factory {
public ConstantFactory(Object c) { this.constant = c;}
private Object constant;
+ @Override
public Object newInstance() { return constant; }
+ @Override
public Tag createTag(String name, Attributes attributes) throws JellyException {
return new ConstraintTag ( this );
}
@@ -87,6 +90,7 @@ public class ConstraintTag extends DynaBeanTagSupport {
// --------------------------------------------- ATTRIBUTES
+ @Override
public void beforeSetAttributes ( ) throws JellyTagException {
try {
createBean(factory);
@@ -96,6 +100,7 @@ public class ConstraintTag extends DynaBeanTagSupport {
}
+ @Override
public void setAttribute ( String name, Object value ) throws JellyTagException {
// no real need for DynaBeans or ?
if ( "var".equals(name) ) {
@@ -115,6 +120,7 @@ public class ConstraintTag extends DynaBeanTagSupport {
// --------------------------------------------------
/** Children invocation... just nothing...
*/
+ @Override
public void doTag ( XMLOutput output ) throws JellyTagException {
if ( var != null ) context.setVariable ( var, getBean() );
invokeBody ( output );
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/DialogTag.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/DialogTag.java
index 11f743b6..0a249a94 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/DialogTag.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/DialogTag.java
@@ -50,6 +50,7 @@ public class DialogTag extends UseBeanTag implements ContainerTag {
/**
* Creates a JDialog. The constructor used depends on the value of the owner attribute.
*/
+ @Override
protected Object newInstance(Class theClass, Map attributes, XMLOutput output)
throws JellyTagException {
Object owner = attributes.remove( "owner" );
@@ -68,6 +69,7 @@ public class DialogTag extends UseBeanTag implements ContainerTag {
/**
* Adds a component to the dialog.
*/
+ @Override
public void addChild(Component component, Object constraints) {
Container contentPane = ((JDialog) getBean()).getContentPane();
if (constraints != null) {
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/EmptyBorderTag.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/EmptyBorderTag.java
index a87f1722..fc5fa869 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/EmptyBorderTag.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/EmptyBorderTag.java
@@ -44,6 +44,7 @@ public class EmptyBorderTag extends BorderTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(final XMLOutput output) throws MissingAttributeException, JellyTagException {
if ( left == -1) {
throw new MissingAttributeException("left");
@@ -97,6 +98,7 @@ public class EmptyBorderTag extends BorderTagSupport {
/**
* Factory method to create a new EmptyBorder instance.
*/
+ @Override
protected Border createBorder() {
return BorderFactory.createEmptyBorder( top, left, bottom, right);
}
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/EtchedBorderTag.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/EtchedBorderTag.java
index ac9be661..1c46d274 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/EtchedBorderTag.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/EtchedBorderTag.java
@@ -45,6 +45,7 @@ public class EtchedBorderTag extends BorderTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(final XMLOutput output) throws MissingAttributeException, JellyTagException {
if ( highlight != null && shadow == null ) {
throw new MissingAttributeException("shadow must be supplied when highlight is supplied");
@@ -87,6 +88,7 @@ public class EtchedBorderTag extends BorderTagSupport {
/**
* Factory method to create a new EtchedBorder instance.
*/
+ @Override
protected Border createBorder() {
if ( etchType == -1 && shadow == null && highlight == null) {
return BorderFactory.createEtchedBorder();
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/FocusListenerTag.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/FocusListenerTag.java
index 3fed12ac..96026170 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/FocusListenerTag.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/FocusListenerTag.java
@@ -66,7 +66,8 @@ public class FocusListenerTag extends TagSupport
this.lost = lost;
}
- public void doTag(final XMLOutput output) throws JellyTagException
+ @Override
+public void doTag(final XMLOutput output) throws JellyTagException
{
// now lets add this action to its parent if we have one
ComponentTag tag = (ComponentTag)findAncestorWithClass(ComponentTag.class);
@@ -74,11 +75,13 @@ public class FocusListenerTag extends TagSupport
{
FocusListener listener = new FocusListener()
{
+ @Override
public void focusGained(FocusEvent e)
{
invokeScript(output, e, gained);
}
+ @Override
public void focusLost(FocusEvent e)
{
invokeScript(output, e, lost);
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/FontTag.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/FontTag.java
index 0b3f8c4e..c2ce1769 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/FontTag.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/FontTag.java
@@ -58,6 +58,7 @@ public class FontTag extends MapTagSupport {
}
*/
+ @Override
public void doTag(final XMLOutput output) throws JellyTagException {
Map attributes = getAttributes();
String var = (String) attributes.remove("var");
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/GbcTag.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/GbcTag.java
index abbc9c88..c4d3eaca 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/GbcTag.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/GbcTag.java
@@ -70,6 +70,7 @@ public class GbcTag extends UseBeanTag implements ContainerTag {
* @param component the child to add
* @param constraints the constraints to use
*/
+ @Override
public void addChild(Component component, Object constraints) throws JellyTagException {
GridBagLayoutTag tag = (GridBagLayoutTag) findAncestorWithClass( GridBagLayoutTag.class );
if (tag == null) {
@@ -85,6 +86,7 @@ public class GbcTag extends UseBeanTag implements ContainerTag {
* A class may be specified otherwise the Factory will be used.
* @param classObject the object to be converted
*/
+ @Override
protected Class convertToClass(Object classObject)
throws MissingAttributeException, ClassNotFoundException {
if (classObject == null) {
@@ -98,6 +100,7 @@ public class GbcTag extends UseBeanTag implements ContainerTag {
/**
* A class may be specified otherwise the Factory will be used.
*/
+ @Override
protected Object newInstance(Class theClass, Map attributes, XMLOutput output) throws JellyTagException {
if (theClass != null ) {
try {
@@ -113,6 +116,7 @@ public class GbcTag extends UseBeanTag implements ContainerTag {
}
}
+ @Override
protected void setBeanProperties(Object bean, Map attributes)
throws JellyTagException {
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/GridBagLayoutTag.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/GridBagLayoutTag.java
index f4a73a98..d4ef8e71 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/GridBagLayoutTag.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/GridBagLayoutTag.java
@@ -41,6 +41,7 @@ public class GridBagLayoutTag extends LayoutTagSupport {
/**
* Creates a GridBagLayout
*/
+ @Override
protected LayoutManager createLayoutManager() {
return new GridBagLayout();
}
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/KeyListenerTag.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/KeyListenerTag.java
index d5f89cf1..4f6e9498 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/KeyListenerTag.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/KeyListenerTag.java
@@ -60,7 +60,8 @@ public class KeyListenerTag extends TagSupport
this.typed = typed;
}
- public void doTag(final XMLOutput output) throws JellyTagException
+ @Override
+public void doTag(final XMLOutput output) throws JellyTagException
{
// now lets add this action to its parent if we have one
ComponentTag tag = (ComponentTag)findAncestorWithClass(ComponentTag.class);
@@ -68,16 +69,19 @@ public class KeyListenerTag extends TagSupport
{
KeyListener listener = new KeyListener()
{
+ @Override
public void keyTyped(KeyEvent e)
{
invokeScript(output, e, typed);
}
+ @Override
public void keyPressed(KeyEvent e)
{
invokeScript(output, e, pressed);
}
+ @Override
public void keyReleased(KeyEvent e)
{
invokeScript(output, e, released);
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/LayoutTagSupport.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/LayoutTagSupport.java
index 4ab8557e..be75d4cf 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/LayoutTagSupport.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/LayoutTagSupport.java
@@ -51,6 +51,7 @@ public abstract class LayoutTagSupport extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(final XMLOutput output) throws JellyTagException {
LayoutManager layout = createLayoutManager();
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/SwingTagLibrary.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/SwingTagLibrary.java
index a8364724..40ba3c02 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/SwingTagLibrary.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/SwingTagLibrary.java
@@ -172,6 +172,7 @@ public class SwingTagLibrary extends TagLibrary {
}
/** Creates a new script to execute the given tag name and attributes */
+ @Override
public TagScript createTagScript(String name, Attributes attributes) throws JellyException {
TagScript answer = super.createTagScript(name, attributes);
if ( answer == null ) {
@@ -179,6 +180,7 @@ public class SwingTagLibrary extends TagLibrary {
if ( factory != null ) {
return new TagScript(
new TagFactory() {
+ @Override
public Tag createTag(String name, Attributes attributes) throws JellyException {
if ( factory instanceof TagFactory ) {
return ((TagFactory) factory).createTag(name, attributes);
@@ -239,6 +241,7 @@ public class SwingTagLibrary extends TagLibrary {
registerFactory(
"splitPane",
new Factory() {
+ @Override
public Object newInstance() {
JSplitPane answer = new JSplitPane();
answer.setLeftComponent(null);
@@ -254,6 +257,7 @@ public class SwingTagLibrary extends TagLibrary {
registerFactory(
"hbox",
new Factory() {
+ @Override
public Object newInstance() {
return Box.createHorizontalBox();
}
@@ -262,6 +266,7 @@ public class SwingTagLibrary extends TagLibrary {
registerFactory(
"vbox",
new Factory() {
+ @Override
public Object newInstance() {
return Box.createVerticalBox();
}
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/TableLayoutTag.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/TableLayoutTag.java
index 1ffb3e23..a27cebed 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/TableLayoutTag.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/TableLayoutTag.java
@@ -57,6 +57,7 @@ public class TableLayoutTag extends LayoutTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(final XMLOutput output) throws JellyTagException {
rowCount = 0;
super.doTag(output);
@@ -69,6 +70,7 @@ public class TableLayoutTag extends LayoutTagSupport {
/**
* Creates a GridBagLayout
*/
+ @Override
protected LayoutManager createLayoutManager() {
return new GridBagLayout();
}
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/TableModelColumnTag.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/TableModelColumnTag.java
index 24458b0f..77a85938 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/TableModelColumnTag.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/TableModelColumnTag.java
@@ -32,6 +32,7 @@ public class TableModelColumnTag extends UseBeanTag {
return (ExpressionTableColumn) getBean();
}
+ @Override
public Class getAttributeType(String name) throws JellyTagException {
if (name.equals("value")) {
return Expression.class;
@@ -41,6 +42,7 @@ public class TableModelColumnTag extends UseBeanTag {
// Implementation methods
//-------------------------------------------------------------------------
+ @Override
protected void processBean(String var, Object bean) throws JellyTagException {
super.processBean(var, bean);
@@ -51,6 +53,7 @@ public class TableModelColumnTag extends UseBeanTag {
tag.getTableModel().addColumn( getColumn() );
}
+ @Override
protected Class getDefaultClass() {
return ExpressionTableColumn.class;
}
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/TableModelTag.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/TableModelTag.java
index 4734f84f..55450caa 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/TableModelTag.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/TableModelTag.java
@@ -36,6 +36,7 @@ public class TableModelTag extends UseBeanTag {
// Implementation methods
//-------------------------------------------------------------------------
+ @Override
protected void processBean(String var, Object bean) throws JellyTagException {
super.processBean(var, bean);
@@ -56,6 +57,7 @@ public class TableModelTag extends UseBeanTag {
}
}
+ @Override
protected Class getDefaultClass() {
return ExpressionTableModel.class;
}
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/TdTag.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/TdTag.java
index 828c6f3b..794121ec 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/TdTag.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/TdTag.java
@@ -52,6 +52,7 @@ public class TdTag extends TagSupport implements ContainerTag {
/**
* Adds a child component to this parent
*/
+ @Override
public void addChild(Component component, Object constraints) throws JellyTagException {
// add my child component to the layout manager
TrTag tag = (TrTag) findAncestorWithClass( TrTag.class );
@@ -64,6 +65,7 @@ public class TdTag extends TagSupport implements ContainerTag {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(final XMLOutput output) throws JellyTagException {
invokeBody(output);
}
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/TitledBorderTag.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/TitledBorderTag.java
index d3a13836..425c0807 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/TitledBorderTag.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/TitledBorderTag.java
@@ -51,6 +51,7 @@ public class TitledBorderTag extends BorderTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(final XMLOutput output) throws MissingAttributeException, JellyTagException {
if ( title == null) {
throw new MissingAttributeException("title");
@@ -106,6 +107,7 @@ public class TitledBorderTag extends BorderTagSupport {
/**
* Factory method to create a new Border instance.
*/
+ @Override
protected Border createBorder() {
if (border != null) {
if (titleJustification != null && titlePosition != null) {
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/TrTag.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/TrTag.java
index 3a46eee3..57e446a3 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/TrTag.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/TrTag.java
@@ -58,6 +58,7 @@ public class TrTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(final XMLOutput output) throws JellyTagException {
tableLayoutTag = (TableLayoutTag) findAncestorWithClass( TableLayoutTag.class );
if (tableLayoutTag == null) {
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/WindowListenerTag.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/WindowListenerTag.java
index cebb2fbd..2c4a015a 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/WindowListenerTag.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/WindowListenerTag.java
@@ -52,6 +52,7 @@ public class WindowListenerTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(final XMLOutput output) throws JellyTagException {
// now lets add this action to its parent if we have one
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/converters/ColorConverter.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/converters/ColorConverter.java
index 77dc491c..89b3f1a5 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/converters/ColorConverter.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/converters/ColorConverter.java
@@ -39,6 +39,7 @@ public class ColorConverter implements Converter {
private static String usageText =
"A color is encoded as a java.awt.Color name or a #xxxxxx triple of hex-bytes.";
+ @Override
public Object convert(Class type, Object value) {
if (value != null) {
String s = value.toString();
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/converters/DebugGraphicsConverter.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/converters/DebugGraphicsConverter.java
index 5009ac89..f293b0b9 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/converters/DebugGraphicsConverter.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/converters/DebugGraphicsConverter.java
@@ -42,6 +42,7 @@ public class DebugGraphicsConverter implements Converter {
/** Part of the Converter interface.
* @see org.apache.commons.beanutils.Converter#convert(java.lang.Class, java.lang.Object)
*/
+ @Override
public Object convert(Class type, Object value) {
return convert(value);
}
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/converters/DimensionConverter.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/converters/DimensionConverter.java
index 6afb5741..69084021 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/converters/DimensionConverter.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/converters/DimensionConverter.java
@@ -28,6 +28,7 @@ import org.apache.commons.beanutils.Converter;
*/
public class DimensionConverter implements Converter {
+ @Override
public Object convert(Class type, Object value) {
if ( value != null ) {
String text = value.toString();
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/converters/PointConverter.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/converters/PointConverter.java
index 07bb8fc6..f3a51086 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/converters/PointConverter.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/converters/PointConverter.java
@@ -28,6 +28,7 @@ import org.apache.commons.beanutils.Converter;
*/
public class PointConverter implements Converter {
+ @Override
public Object convert(Class type, Object value) {
if ( value != null ) {
String text = value.toString();
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/impl/GridBagConstraintBean.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/impl/GridBagConstraintBean.java
index fd9aa816..e9a59513 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/impl/GridBagConstraintBean.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/impl/GridBagConstraintBean.java
@@ -304,6 +304,7 @@ public class GridBagConstraintBean extends GridBagConstraints {
}
}
+ @Override
public String toString() {
return "GridBagConstraintBean["
+ "gridx="
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/model/ExpressionTableColumn.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/model/ExpressionTableColumn.java
index fd16e530..04796fea 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/model/ExpressionTableColumn.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/model/ExpressionTableColumn.java
@@ -40,6 +40,7 @@ public class ExpressionTableColumn extends TableColumn {
public ExpressionTableColumn() {
}
+ @Override
public String toString() {
return super.toString() + "[value:" + value + "]";
}
diff --git a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/model/ExpressionTableModel.java b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/model/ExpressionTableModel.java
index a0b7e8c5..8bae3675 100644
--- a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/model/ExpressionTableModel.java
+++ b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/model/ExpressionTableModel.java
@@ -72,14 +72,17 @@ public class ExpressionTableModel extends AbstractTableModel {
// TableModel interface
//-------------------------------------------------------------------------
+ @Override
public int getRowCount() {
return rows.size();
}
+ @Override
public int getColumnCount() {
return columnModel.getColumnCount();
}
+ @Override
public String getColumnName(int columnIndex) {
String answer = null;
if (columnIndex < 0 || columnIndex >= columnModel.getColumnCount()) {
@@ -92,6 +95,7 @@ public class ExpressionTableModel extends AbstractTableModel {
return answer;
}
+ @Override
public Object getValueAt(int rowIndex, int columnIndex) {
Object answer = null;
if (rowIndex < 0 || rowIndex >= rows.size()) {
diff --git a/jelly-tags/swing/src/test/java/org/apache/commons/jelly/core/BaseJellyTest.java b/jelly-tags/swing/src/test/java/org/apache/commons/jelly/core/BaseJellyTest.java
index 1495a81f..3ff6dc68 100644
--- a/jelly-tags/swing/src/test/java/org/apache/commons/jelly/core/BaseJellyTest.java
+++ b/jelly-tags/swing/src/test/java/org/apache/commons/jelly/core/BaseJellyTest.java
@@ -33,6 +33,7 @@ public abstract class BaseJellyTest extends TestCase {
super(name);
}
+ @Override
public void setUp() throws Exception {
super.setUp();
jelly = new Jelly();
diff --git a/jelly-tags/swing/src/test/java/org/apache/commons/jelly/demos/HomepageBuilder.java b/jelly-tags/swing/src/test/java/org/apache/commons/jelly/demos/HomepageBuilder.java
index be9df4c5..c41d21bc 100644
--- a/jelly-tags/swing/src/test/java/org/apache/commons/jelly/demos/HomepageBuilder.java
+++ b/jelly-tags/swing/src/test/java/org/apache/commons/jelly/demos/HomepageBuilder.java
@@ -98,6 +98,7 @@ public class HomepageBuilder extends JPanel {
JButton addButton = new JButton("Add >>>");
addButton.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
listModel.addElement(addField.getText());
}
@@ -113,6 +114,7 @@ public class HomepageBuilder extends JPanel {
JButton submit = new JButton("Build and preview your page!");
submit.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
buildPage(templateList.getSelectedItem().toString(),new JellyContext());
showPage();
diff --git a/jelly-tags/swing/src/test/java/org/apache/commons/jelly/swing/MyTableModel.java b/jelly-tags/swing/src/test/java/org/apache/commons/jelly/swing/MyTableModel.java
index d8bfbc20..32a583c7 100644
--- a/jelly-tags/swing/src/test/java/org/apache/commons/jelly/swing/MyTableModel.java
+++ b/jelly-tags/swing/src/test/java/org/apache/commons/jelly/swing/MyTableModel.java
@@ -55,18 +55,22 @@ public class MyTableModel extends AbstractTableModel {
"Teaching high school", new Integer(4), new Boolean(false)}
};
+ @Override
public int getColumnCount() {
return columnNames.length;
}
+ @Override
public int getRowCount() {
return data.length;
}
+ @Override
public String getColumnName(int col) {
return columnNames[col];
}
+ @Override
public Object getValueAt(int row, int col) {
return data[row][col];
}
@@ -77,6 +81,7 @@ public class MyTableModel extends AbstractTableModel {
* then the last column would contain text ("true"/"false"),
* rather than a check box.
*/
+ @Override
public Class getColumnClass(int c) {
return getValueAt(0, c).getClass();
}
@@ -85,6 +90,7 @@ public class MyTableModel extends AbstractTableModel {
* Don't need to implement this method unless your table's
* editable.
*/
+ @Override
public boolean isCellEditable(int row, int col) {
//Note that the data/cell address is constant,
//no matter where the cell appears onscreen.
@@ -99,6 +105,7 @@ public class MyTableModel extends AbstractTableModel {
* Don't need to implement this method unless your table's
* data can change.
*/
+ @Override
public void setValueAt(Object value, int row, int col) {
if (log.isDebugEnabled()) {
log.debug("Setting value at " + row + "," + col
diff --git a/jelly-tags/swing/src/test/java/org/apache/commons/jelly/swing/TestSwingTags.java b/jelly-tags/swing/src/test/java/org/apache/commons/jelly/swing/TestSwingTags.java
index ec0aa71f..2a753d1e 100644
--- a/jelly-tags/swing/src/test/java/org/apache/commons/jelly/swing/TestSwingTags.java
+++ b/jelly-tags/swing/src/test/java/org/apache/commons/jelly/swing/TestSwingTags.java
@@ -199,6 +199,7 @@ public class TestSwingTags extends BaseJellyTest {
/* (non-Javadoc)
* @see org.apache.commons.jelly.core.BaseJellyTest#getXMLOutput()
*/
+ @Override
protected XMLOutput getXMLOutput() {
try {
return XMLOutput.createXMLOutput(System.out);
diff --git a/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/ColorTag.java b/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/ColorTag.java
index 591dee27..5b68be04 100644
--- a/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/ColorTag.java
+++ b/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/ColorTag.java
@@ -97,6 +97,7 @@ public class ColorTag extends TagSupport {
* @throws JellyTagException if an error occurs
* @see org.apache.commons.jelly.Tag#doTag(org.apache.commons.jelly.XMLOutput)
*/
+ @Override
public void doTag(final XMLOutput output) throws JellyTagException {
// invoke by body just in case some nested tag configures me
invokeBody(output);
diff --git a/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/DialogTag.java b/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/DialogTag.java
index ead0a88f..8b284314 100644
--- a/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/DialogTag.java
+++ b/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/DialogTag.java
@@ -52,6 +52,7 @@ public class DialogTag extends WidgetTag {
/**
* Factory method to create a new dialog
*/
+ @Override
protected Object newInstance(Class theClass, Map attributes, XMLOutput output)
throws JellyTagException {
int style = getStyle(attributes);
diff --git a/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/FontTag.java b/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/FontTag.java
index 2d1742f0..21412c2c 100644
--- a/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/FontTag.java
+++ b/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/FontTag.java
@@ -146,6 +146,7 @@ public class FontTag extends TagSupport {
* @throws JellyTagException if an error occurs
* @see org.apache.commons.jelly.Tag#doTag(org.apache.commons.jelly.XMLOutput)
*/
+ @Override
public void doTag(final XMLOutput output) throws JellyTagException {
// invoke by body just in case some nested tag configures me
invokeBody(output);
diff --git a/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/GCTag.java b/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/GCTag.java
index e59377cb..63895a8d 100644
--- a/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/GCTag.java
+++ b/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/GCTag.java
@@ -84,6 +84,7 @@ public class GCTag extends TagSupport {
* @throws JellyTagException if an error occurs
* @see org.apache.commons.jelly.Tag#doTag(org.apache.commons.jelly.XMLOutput)
*/
+ @Override
public void doTag(final XMLOutput output) throws JellyTagException {
// invoke by body just in case some nested tag configures me
invokeBody(output);
diff --git a/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/ImageTag.java b/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/ImageTag.java
index 3fd5eba7..8d6606c9 100644
--- a/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/ImageTag.java
+++ b/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/ImageTag.java
@@ -110,6 +110,7 @@ public class ImageTag extends TagSupport {
/**
* @see org.apache.commons.jelly.Tag#doTag(org.apache.commons.jelly.XMLOutput)
*/
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
// invoke by body just in case some nested tag configures me
invokeBody(output);
diff --git a/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/LayoutDataTag.java b/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/LayoutDataTag.java
index 264175b4..1cb3483e 100644
--- a/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/LayoutDataTag.java
+++ b/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/LayoutDataTag.java
@@ -49,6 +49,7 @@ public class LayoutDataTag extends LayoutTagSupport {
/**
* Either defines a variable or adds the current component to the parent
*/
+ @Override
protected void processBean(String var, Object bean)
throws JellyTagException {
super.processBean(var, bean);
@@ -66,6 +67,7 @@ public class LayoutDataTag extends LayoutTagSupport {
/**
* @see org.apache.commons.jelly.tags.core.UseBeanTag#newInstance(java.lang.Class, java.util.Map, org.apache.commons.jelly.XMLOutput)
*/
+ @Override
protected Object newInstance(
Class theClass,
Map attributes,
@@ -101,6 +103,7 @@ public class LayoutDataTag extends LayoutTagSupport {
/**
* @see org.apache.commons.jelly.tags.swt.LayoutTagSupport#convertValue(java.lang.Object, java.lang.String, java.lang.Object)
*/
+ @Override
protected Object convertValue(Object bean, String name, Object value)
throws JellyTagException {
diff --git a/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/LayoutTag.java b/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/LayoutTag.java
index 2939d4e6..25e210c5 100644
--- a/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/LayoutTag.java
+++ b/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/LayoutTag.java
@@ -60,6 +60,7 @@ public class LayoutTag extends LayoutTagSupport {
/**
* Either defines a variable or adds the current component to the parent
*/
+ @Override
protected void processBean(String var, Object bean)
throws JellyTagException {
super.processBean(var, bean);
@@ -78,6 +79,7 @@ public class LayoutTag extends LayoutTagSupport {
/**
* @see org.apache.commons.jelly.tags.swt.LayoutTagSupport#convertValue(java.lang.Object, java.lang.String, java.lang.Object)
*/
+ @Override
protected Object convertValue(Object bean, String name, Object value)
throws JellyTagException {
diff --git a/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/LayoutTagSupport.java b/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/LayoutTagSupport.java
index 65583f96..92925a5d 100644
--- a/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/LayoutTagSupport.java
+++ b/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/LayoutTagSupport.java
@@ -74,6 +74,7 @@ public abstract class LayoutTagSupport extends UseBeanTag {
/**
* Either defines a variable or adds the current component to the parent
*/
+ @Override
protected void processBean(String var, Object bean) throws JellyTagException {
if (var != null) {
context.setVariable(var, bean);
@@ -83,6 +84,7 @@ public abstract class LayoutTagSupport extends UseBeanTag {
/**
* @see org.apache.commons.jelly.tags.core.UseBeanTag#setBeanProperties(java.lang.Object, java.util.Map)
*/
+ @Override
protected void setBeanProperties(Object bean, Map attributes) throws JellyTagException {
if (bean != null) {
diff --git a/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/MenuTag.java b/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/MenuTag.java
index ce10a860..a8382ff0 100644
--- a/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/MenuTag.java
+++ b/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/MenuTag.java
@@ -54,6 +54,7 @@ public class MenuTag extends WidgetTag {
* @param parent is the parent widget which is never null
* @param widget is the new child widget to be attached to the parent
*/
+ @Override
protected void attachWidgets(Object parent, Widget widget) {
Menu menu = (Menu) widget;
if (parent instanceof Decorations) {
@@ -73,6 +74,7 @@ public class MenuTag extends WidgetTag {
/**
* @see org.apache.commons.jelly.tags.swt.WidgetTag#createWidget(java.lang.Class, org.eclipse.swt.widgets.Widget, int)
*/
+ @Override
protected Object createWidget(Class theClass, Widget parent, int style)
throws JellyTagException {
diff --git a/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/OnEventTag.java b/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/OnEventTag.java
index c6956f1d..aa189dff 100644
--- a/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/OnEventTag.java
+++ b/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/OnEventTag.java
@@ -52,6 +52,7 @@ public class OnEventTag extends TagSupport implements Listener {
/**
* @see org.apache.commons.jelly.Tag#doTag(org.apache.commons.jelly.XMLOutput)
*/
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
if (var == null) {
throw new MissingAttributeException("var");
@@ -80,6 +81,7 @@ public class OnEventTag extends TagSupport implements Listener {
/**
* @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
*/
+ @Override
public void handleEvent(Event event) {
try {
context.setVariable(var, event);
diff --git a/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/SwtTagLibrary.java b/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/SwtTagLibrary.java
index 9e54844d..d69b480f 100644
--- a/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/SwtTagLibrary.java
+++ b/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/SwtTagLibrary.java
@@ -169,6 +169,7 @@ public class SwtTagLibrary extends TagLibrary {
/**
* @see org.apache.commons.jelly.impl.TagFactory#createTag(java.lang.String, org.xml.sax.Attributes)
*/
+ @Override
public Tag createTag(String name, Attributes attributes)
throws JellyException {
return new LayoutTag(layoutClass);
@@ -187,6 +188,7 @@ public class SwtTagLibrary extends TagLibrary {
/**
* @see org.apache.commons.jelly.impl.TagFactory#createTag(java.lang.String, org.xml.sax.Attributes)
*/
+ @Override
public Tag createTag(String name, Attributes attributes)
throws JellyException {
return new LayoutDataTag(layoutDataClass);
@@ -212,6 +214,7 @@ public class SwtTagLibrary extends TagLibrary {
/**
* @see org.apache.commons.jelly.impl.TagFactory#createTag(java.lang.String, org.xml.sax.Attributes)
*/
+ @Override
public Tag createTag(String name, Attributes attributes)
throws JellyException {
return new WidgetTag(widgetClass, style);
@@ -237,7 +240,8 @@ public class SwtTagLibrary extends TagLibrary {
/**
* @see org.apache.commons.jelly.impl.TagFactory#createTag(java.lang.String, org.xml.sax.Attributes)
*/
- public Tag createTag(String name, Attributes attributes)
+ @Override
+ public Tag createTag(String name, Attributes attributes)
throws JellyException {
return new DialogTag(widgetClass, style);
}
@@ -255,6 +259,7 @@ public class SwtTagLibrary extends TagLibrary {
/**
* @see org.apache.commons.jelly.impl.TagFactory#createTag(java.lang.String, org.xml.sax.Attributes)
*/
+ @Override
public Tag createTag(String name, Attributes attributes)
throws JellyException {
return new MenuTag(style);
diff --git a/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/WidgetTag.java b/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/WidgetTag.java
index 89bf5b51..813c0a31 100644
--- a/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/WidgetTag.java
+++ b/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/WidgetTag.java
@@ -60,6 +60,7 @@ public class WidgetTag extends UseBeanTag {
this.style = style;
}
+ @Override
public String toString() {
return "WidgetTag[widget=" + getWidget() + "]";
}
@@ -95,6 +96,7 @@ public class WidgetTag extends UseBeanTag {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
Map attributes = getAttributes();
Object parent = attributes.remove("parent");
@@ -119,6 +121,7 @@ public class WidgetTag extends UseBeanTag {
/**
* Factory method to create a new widget
*/
+ @Override
protected Object newInstance(Class theClass, Map attributes, XMLOutput output)
throws JellyTagException {
int style = getStyle(attributes);
@@ -137,6 +140,7 @@ public class WidgetTag extends UseBeanTag {
/*
* @see org.apache.commons.jelly.tags.core.UseBeanTag#setBeanProperties(java.lang.Object, java.util.Map)
*/
+ @Override
protected void setBeanProperties(Object bean, Map attributes) throws JellyTagException {
if (bean instanceof Control) {
diff --git a/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/converters/ColorConverter.java b/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/converters/ColorConverter.java
index 7c8e72a1..8cb9e00d 100644
--- a/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/converters/ColorConverter.java
+++ b/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/converters/ColorConverter.java
@@ -101,6 +101,7 @@ public class ColorConverter implements Converter {
// Converter interface
//-------------------------------------------------------------------------
+ @Override
public Object convert(Class type, Object value) {
Object answer = null;
if (value != null) {
diff --git a/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/converters/PointConverter.java b/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/converters/PointConverter.java
index 4610cc70..ee83d457 100644
--- a/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/converters/PointConverter.java
+++ b/jelly-tags/swt/src/main/java/org/apache/commons/jelly/tags/swt/converters/PointConverter.java
@@ -55,6 +55,7 @@ public class PointConverter implements Converter {
// Converter interface
//-------------------------------------------------------------------------
+ @Override
public Object convert(Class type, Object value) {
Object answer = null;
if ( value != null ) {
diff --git a/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/GroupTag.java b/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/GroupTag.java
index 15b952e4..319b40df 100644
--- a/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/GroupTag.java
+++ b/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/GroupTag.java
@@ -40,6 +40,7 @@ public class GroupTag extends TagSupport {
private List threads = new ArrayList();
/** Child threads will add themselves and will then all be started together */
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
invokeBody(output);
diff --git a/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/JellyThread.java b/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/JellyThread.java
index 1c7f0ad6..28a521c8 100644
--- a/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/JellyThread.java
+++ b/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/JellyThread.java
@@ -58,6 +58,7 @@ public class JellyThread extends Thread {
/**
* Run the thread
*/
+ @Override
public void run() {
log.debug("Starting thread \"" + getName() + "\"");
diff --git a/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/MutexTag.java b/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/MutexTag.java
index 167c2248..87454dcd 100644
--- a/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/MutexTag.java
+++ b/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/MutexTag.java
@@ -32,6 +32,7 @@ public class MutexTag extends TagSupport {
private String var = null;
/** Create and set the mutex */
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
if (var == null) {
throw new JellyTagException("mutexes require a var attribute");
diff --git a/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/RunnableStatus.java b/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/RunnableStatus.java
index 888b2ede..00964287 100644
--- a/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/RunnableStatus.java
+++ b/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/RunnableStatus.java
@@ -153,6 +153,7 @@ public class RunnableStatus {
}
}
+ @Override
public String toString() {
return getStatusString(status);
}
diff --git a/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/SleepTag.java b/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/SleepTag.java
index b44616d4..6578e8e3 100644
--- a/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/SleepTag.java
+++ b/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/SleepTag.java
@@ -31,6 +31,7 @@ public class SleepTag extends TagSupport {
private long howLong = 0;
/** Put the thread to sleep */
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
try {
Thread.sleep(howLong);
diff --git a/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/ThreadTag.java b/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/ThreadTag.java
index e73b5dac..77e95afb 100644
--- a/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/ThreadTag.java
+++ b/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/ThreadTag.java
@@ -70,6 +70,7 @@ public class ThreadTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(final XMLOutput output) throws JellyTagException {
if (xmlOutput == null) {
// lets default to system.out
@@ -86,6 +87,7 @@ public class ThreadTag extends TagSupport {
// set the target to run
thread.setTarget(new Runnable() {
+ @Override
public void run() {
try {
getBody().run(useThisContext, xmlOutput);
diff --git a/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/UseMutexTag.java b/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/UseMutexTag.java
index 655b4c7b..ec2d52e1 100644
--- a/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/UseMutexTag.java
+++ b/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/UseMutexTag.java
@@ -32,6 +32,7 @@ public abstract class UseMutexTag extends TagSupport {
private Object mutex = null;
/** Calls useMutex after checking to make sure that <i>setMutex</i> was called */
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
// either use the set thread or search for a parent thread to use
if (mutex == null) {
diff --git a/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/UseThreadTag.java b/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/UseThreadTag.java
index bd484f08..83830248 100644
--- a/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/UseThreadTag.java
+++ b/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/UseThreadTag.java
@@ -41,6 +41,7 @@ public abstract class UseThreadTag extends TagSupport {
* The default behavior is to either use the set thread or to
* search for a parent thread to use.
*/
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
try {
// either use the set thread or search for a parent thread to use
diff --git a/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/WaitForTag.java b/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/WaitForTag.java
index d3bbfff3..1917ff0d 100644
--- a/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/WaitForTag.java
+++ b/jelly-tags/threads/src/main/java/org/apache/commons/jelly/tags/threads/WaitForTag.java
@@ -73,6 +73,7 @@ public class WaitForTag extends TagSupport {
* @throws TimeoutException If the call to waitUntilDone(onlyWait) times out
* @throws RequirementException If a threads status doesn't match the setStatus() value
*/
+ @Override
public void doTag(XMLOutput output) throws TimeoutException, RequirementException, JellyTagException {
if (thread == null && group == null) {
throw new JellyTagException("This tag requires that you set the thread or group attribute");
diff --git a/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/AvailableTag.java b/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/AvailableTag.java
index 92e31bd4..5197d64e 100644
--- a/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/AvailableTag.java
+++ b/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/AvailableTag.java
@@ -44,6 +44,7 @@ public class AvailableTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(final XMLOutput output) throws JellyTagException {
boolean available = false;
diff --git a/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/FileTag.java b/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/FileTag.java
index fbe9474a..c623835e 100644
--- a/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/FileTag.java
+++ b/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/FileTag.java
@@ -39,6 +39,7 @@ public class FileTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(final XMLOutput output) throws MissingAttributeException, JellyTagException {
boolean available = false;
diff --git a/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/LoadTextTag.java b/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/LoadTextTag.java
index fc8c461d..4fb641f9 100644
--- a/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/LoadTextTag.java
+++ b/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/LoadTextTag.java
@@ -53,6 +53,7 @@ public class LoadTextTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
if (var == null) {
throw new MissingAttributeException("var");
diff --git a/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/PropertiesTag.java b/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/PropertiesTag.java
index cdbcd948..df781389 100644
--- a/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/PropertiesTag.java
+++ b/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/PropertiesTag.java
@@ -45,6 +45,7 @@ public class PropertiesTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(final XMLOutput output) throws JellyTagException {
if (file == null && uri == null) {
throw new JellyTagException("This tag must define a 'file' or 'uri' attribute");
diff --git a/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/ReplaceTag.java b/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/ReplaceTag.java
index 606681c8..2c66fc15 100644
--- a/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/ReplaceTag.java
+++ b/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/ReplaceTag.java
@@ -59,6 +59,7 @@ public class ReplaceTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
// check required properties
if (oldChar != null) {
diff --git a/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/SleepTag.java b/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/SleepTag.java
index 53265d50..601f0a97 100644
--- a/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/SleepTag.java
+++ b/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/SleepTag.java
@@ -33,6 +33,7 @@ public class SleepTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(final XMLOutput output) throws JellyTagException {
if (millis > 0) {
try {
diff --git a/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/SortTag.java b/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/SortTag.java
index 74252827..d22b711d 100644
--- a/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/SortTag.java
+++ b/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/SortTag.java
@@ -40,6 +40,7 @@ public class SortTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(final XMLOutput output) throws JellyTagException {
if (var == null)
{
diff --git a/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/TokenizeTag.java b/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/TokenizeTag.java
index 39e66248..a247d68d 100644
--- a/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/TokenizeTag.java
+++ b/jelly-tags/util/src/main/java/org/apache/commons/jelly/tags/util/TokenizeTag.java
@@ -39,6 +39,7 @@ public class TokenizeTag extends TagSupport
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(final XMLOutput output) throws MissingAttributeException, JellyTagException {
if ( this.var == null )
{
diff --git a/jelly-tags/util/src/test/java/org/apache/commons/jelly/tags/util/Customer.java b/jelly-tags/util/src/test/java/org/apache/commons/jelly/tags/util/Customer.java
index 6397b454..c294a588 100644
--- a/jelly-tags/util/src/test/java/org/apache/commons/jelly/tags/util/Customer.java
+++ b/jelly-tags/util/src/test/java/org/apache/commons/jelly/tags/util/Customer.java
@@ -47,6 +47,7 @@ public class Customer {
setLocation(cust.getLocation());
}
+ @Override
public String toString() {
return super.toString() + "[name=" + name + ";city=" + city + "]";
}
diff --git a/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/AssertValidTag.java b/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/AssertValidTag.java
index ad401fab..1a852500 100644
--- a/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/AssertValidTag.java
+++ b/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/AssertValidTag.java
@@ -56,6 +56,7 @@ public class AssertValidTag extends ValidateTag {
*/
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(final XMLOutput output) throws JellyTagException {
buffer.setLength(0);
super.doTag(output);
@@ -69,6 +70,7 @@ public class AssertValidTag extends ValidateTag {
* Derived classes can overload this method to do different things, such
* as to throw assertion exceptions etc.
*/
+ @Override
protected void handleValid(boolean valid) {
super.handleValid(valid);
@@ -81,6 +83,7 @@ public class AssertValidTag extends ValidateTag {
/**
* Outputs the given validation exception as XML to the output
*/
+ @Override
protected void outputException(XMLOutput output, String name, SAXParseException e) throws SAXException {
buffer.append( name );
buffer.append( " : line: " );
diff --git a/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/ValidateTag.java b/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/ValidateTag.java
index f009b5b1..25d4f611 100644
--- a/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/ValidateTag.java
+++ b/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/ValidateTag.java
@@ -50,6 +50,7 @@ public class ValidateTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(final XMLOutput output) throws MissingAttributeException, JellyTagException {
if ( verifier == null ) {
throw new MissingAttributeException("verifier");
@@ -81,10 +82,12 @@ public class ValidateTag extends TagSupport {
// outputting the errors to the current output
verifier.setErrorHandler(
new ErrorHandler() {
+ @Override
public void error(SAXParseException exception) throws SAXException {
outputException(output, "error", exception);
}
+ @Override
public void fatalError(SAXParseException exception) throws SAXException {
outputException(output, "fatalError", exception);
}
diff --git a/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/VerifierTag.java b/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/VerifierTag.java
index 114e3730..cd638385 100644
--- a/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/VerifierTag.java
+++ b/jelly-tags/validate/src/main/java/org/apache/commons/jelly/tags/validate/VerifierTag.java
@@ -59,6 +59,7 @@ public class VerifierTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(final XMLOutput output) throws MissingAttributeException, JellyTagException {
if ( var == null ) {
throw new MissingAttributeException("var");
diff --git a/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapter.java b/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapter.java
index dfc5f426..9858a46d 100644
--- a/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapter.java
+++ b/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapter.java
@@ -82,6 +82,7 @@ public class JellyContextAdapter implements Context
return readOnly;
}
+ @Override
public boolean containsKey( Object key )
{
if ( key == null )
@@ -97,6 +98,7 @@ public class JellyContextAdapter implements Context
return jellyContext.getVariable( key.toString() ) != null ? true : false;
}
+ @Override
public Object get( String key )
{
if ( key == null )
@@ -112,6 +114,7 @@ public class JellyContextAdapter implements Context
return jellyContext.getVariable( key );
}
+ @Override
public Object[] getKeys()
{
Set keys = jellyContext.getVariables().keySet();
@@ -126,6 +129,7 @@ public class JellyContextAdapter implements Context
return keys.toArray();
}
+ @Override
public Object put( String key, Object value )
{
Object oldValue;
@@ -148,6 +152,7 @@ public class JellyContextAdapter implements Context
return oldValue;
}
+ @Override
public Object remove( Object key )
{
Object oldValue;
diff --git a/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/MergeTag.java b/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/MergeTag.java
index d8120f0b..1c19e8d1 100644
--- a/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/MergeTag.java
+++ b/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/MergeTag.java
@@ -50,6 +50,7 @@ public class MergeTag extends VelocityTagSupport
// -- Tag interface -----------------------------------------------------
+ @Override
public void doTag( final XMLOutput output ) throws JellyTagException
{
if ( basedir == null || template == null )
diff --git a/jelly-tags/velocity/src/test/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapterTest.java b/jelly-tags/velocity/src/test/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapterTest.java
index 972dbffd..d2f90705 100644
--- a/jelly-tags/velocity/src/test/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapterTest.java
+++ b/jelly-tags/velocity/src/test/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapterTest.java
@@ -55,6 +55,7 @@ public class JellyContextAdapterTest extends TestCase
return new TestSuite( JellyContextAdapterTest.class );
}
+ @Override
public void setUp()
{
jellyContext = new JellyContext();
diff --git a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/AttributeTag.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/AttributeTag.java
index c28d8fa9..467c41ae 100644
--- a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/AttributeTag.java
+++ b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/AttributeTag.java
@@ -38,6 +38,7 @@ public class AttributeTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
ElementTag tag = (ElementTag) findAncestorWithClass( ElementTag.class );
if (tag == null) {
diff --git a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/CommentTag.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/CommentTag.java
index 1b9be25b..8671a9eb 100644
--- a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/CommentTag.java
+++ b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/CommentTag.java
@@ -37,6 +37,7 @@ public class CommentTag extends XPathTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
String text = getText();
if (text == null) {
diff --git a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/CopyOfTag.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/CopyOfTag.java
index 24873a04..2838cffc 100644
--- a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/CopyOfTag.java
+++ b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/CopyOfTag.java
@@ -48,6 +48,7 @@ public class CopyOfTag extends XPathTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
Object xpathContext = getXPathContext();
diff --git a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/CopyTag.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/CopyTag.java
index 28e942af..d77ebae9 100644
--- a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/CopyTag.java
+++ b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/CopyTag.java
@@ -45,6 +45,7 @@ public class CopyTag extends XPathTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
Object xpathContext = getXPathContext();
diff --git a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/DoctypeTag.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/DoctypeTag.java
index cbe58113..96dc92c7 100644
--- a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/DoctypeTag.java
+++ b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/DoctypeTag.java
@@ -41,6 +41,7 @@ public class DoctypeTag extends XPathTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
if (name == null) {
throw new MissingAttributeException( "name" );
diff --git a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ElementTag.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ElementTag.java
index 6feb0cd3..6776ea51 100644
--- a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ElementTag.java
+++ b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ElementTag.java
@@ -88,6 +88,7 @@ public class ElementTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
int idx = name.indexOf(':');
final String localName = (idx >= 0)
@@ -100,6 +101,7 @@ public class ElementTag extends TagSupport {
// add an initialize hook to the core content-generating methods
+ @Override
public void startElement(
String uri,
String localName,
@@ -110,29 +112,34 @@ public class ElementTag extends TagSupport {
super.startElement(uri, localName, qName, atts);
}
+ @Override
public void endElement(String uri, String localName, String qName)
throws SAXException {
initialize();
super.endElement(uri, localName, qName);
}
+ @Override
public void characters(char[] ch, int start, int length) throws SAXException {
initialize();
super.characters(ch, start, length);
}
+ @Override
public void ignorableWhitespace(char[] ch, int start, int length)
throws SAXException {
initialize();
super.ignorableWhitespace(ch, start, length);
}
+ @Override
public void objectData(Object object)
throws SAXException {
initialize();
super.objectData(object);
}
+ @Override
public void processingInstruction(String target, String data)
throws SAXException {
initialize();
diff --git a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ExprTag.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ExprTag.java
index 8269bb52..7059c067 100644
--- a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ExprTag.java
+++ b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ExprTag.java
@@ -39,6 +39,7 @@ public class ExprTag extends XPathTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
Object xpathContext = getXPathContext();
diff --git a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ForEachTag.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ForEachTag.java
index b95c602b..b1eab2b3 100644
--- a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ForEachTag.java
+++ b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ForEachTag.java
@@ -54,6 +54,7 @@ public class ForEachTag extends XPathTagSupport implements XPathSource {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
if (select != null) {
List nodes = null;
@@ -87,6 +88,7 @@ public class ForEachTag extends XPathTagSupport implements XPathSource {
* @return the current XPath iteration value
* so that any other XPath aware child tags to use
*/
+ @Override
public Object getXPathSource() {
return iterationValue;
}
@@ -123,6 +125,7 @@ public class ForEachTag extends XPathTagSupport implements XPathSource {
/*
* Override superclass so method can be access by IfTag
*/
+ @Override
protected Object getXPathContext() {
return super.getXPathContext();
}
diff --git a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/IfTag.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/IfTag.java
index 06118c9c..944afb6f 100644
--- a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/IfTag.java
+++ b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/IfTag.java
@@ -38,6 +38,7 @@ public class IfTag extends XPathTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
if (select == null) {
throw new MissingAttributeException( "select" );
@@ -64,6 +65,7 @@ public class IfTag extends XPathTagSupport {
// Implementation methods
//-------------------------------------------------------------------------
+ @Override
protected Object getXPathContext() {
ForEachTag tag = (ForEachTag) findAncestorWithClass( ForEachTag.class );
if ( tag != null ) {
diff --git a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ParamTag.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ParamTag.java
index a3a36171..feb0dfdd 100644
--- a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ParamTag.java
+++ b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ParamTag.java
@@ -38,6 +38,7 @@ public class ParamTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
TransformTag tag = (TransformTag) this.findAncestorWithClass( TransformTag.class );
if ( tag == null ) {
diff --git a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ParseTag.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ParseTag.java
index ccbfeea8..64006c2b 100644
--- a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ParseTag.java
+++ b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ParseTag.java
@@ -47,6 +47,7 @@ public class ParseTag extends ParseTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
if (getVar() == null) {
throw new MissingAttributeException("The var attribute cannot be null");
@@ -85,6 +86,7 @@ public class ParseTag extends ParseTagSupport {
/**
* Factory method to create a new SAXReader
*/
+ @Override
protected SAXReader createSAXReader() {
return new SAXReader(validate);
}
diff --git a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ReplaceNamespaceTag.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ReplaceNamespaceTag.java
index 1b6c4734..73d8b70f 100644
--- a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ReplaceNamespaceTag.java
+++ b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ReplaceNamespaceTag.java
@@ -40,6 +40,7 @@ public class ReplaceNamespaceTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
final String fromURI = (fromNamespace != null) ? fromNamespace : "";
final String toURI = (toNamespace != null) ? toNamespace : "";
@@ -47,16 +48,19 @@ public class ReplaceNamespaceTag extends TagSupport {
if (!toURI.equals(fromURI)) {
newOutput = new XMLOutput(output) {
+ @Override
public void startElement(String uri, String localName, String qName, Attributes atts)
throws SAXException {
super.startElement(replaceURI(uri), localName, qName, replaceURI(atts));
}
+ @Override
public void endElement(String uri, String localName, String qName)
throws SAXException {
super.endElement(replaceURI(uri), localName, qName);
}
+ @Override
public void startPrefixMapping(String prefix, String uri)
throws SAXException {
super.startPrefixMapping(prefix, replaceURI(uri));
diff --git a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/SetTag.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/SetTag.java
index 822663ec..e27cb7a0 100644
--- a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/SetTag.java
+++ b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/SetTag.java
@@ -78,6 +78,7 @@ public class SetTag extends XPathTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
if (var == null) {
throw new MissingAttributeException( "var" );
diff --git a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/SortTag.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/SortTag.java
index e07a7a27..a7ded1cf 100644
--- a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/SortTag.java
+++ b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/SortTag.java
@@ -41,6 +41,7 @@ public class SortTag extends XPathTagSupport {
/** Xpath comparator for sorting */
private XPathComparator xpCmp = null;
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
if (xpCmp == null) {
throw new MissingAttributeException( "xpCmp" );
diff --git a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/TransformTag.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/TransformTag.java
index 989f2f1e..8c5281d6 100644
--- a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/TransformTag.java
+++ b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/TransformTag.java
@@ -111,6 +111,7 @@ public class TransformTag extends ParseTag {
* @param output The pipeline for xml events
* @throws MissingAttributeException Thrown when required attributes are missing
*/
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
if (null == this.getXslt()) {
@@ -202,6 +203,7 @@ public class TransformTag extends ParseTag {
*/
protected URIResolver createURIResolver() {
return new URIResolver() {
+ @Override
public Source resolve(String href, String base)
throws TransformerException {
@@ -430,6 +432,7 @@ public class TransformTag extends ParseTag {
* An IO exception from the parser, possibly from a byte
stream or character stream supplied by the application.
*/
+ @Override
public void parse(InputSource input)
throws IOException, SAXException
{
@@ -451,6 +454,7 @@ public class TransformTag extends ParseTag {
* An IO exception from the parser, possibly from a byte
stream or character stream supplied by the application.
*/
+ @Override
public void parse(String systemId)
throws IOException, SAXException
{
@@ -518,6 +522,7 @@ public class TransformTag extends ParseTag {
*
* @return the SAX ContentHandler to use to feed SAX events into
*/
+ @Override
public ContentHandler getContentHandler() {
return this.xmlOutput.getContentHandler();
}
@@ -528,6 +533,7 @@ public class TransformTag extends ParseTag {
* @param contentHandler is the ContentHandler to use.
* This value cannot be null.
*/
+ @Override
public void setContentHandler(ContentHandler contentHandler) {
this.xmlOutput.setContentHandler(contentHandler);
// often classes will implement LexicalHandler as well
@@ -541,6 +547,7 @@ public class TransformTag extends ParseTag {
*
* @return the DTD Handler to use to feed SAX events into
*/
+ @Override
public DTDHandler getDTDHandler() {
return this.dtdHandler;
}
@@ -550,6 +557,7 @@ public class TransformTag extends ParseTag {
*
* @param the DTD Handler to use to feed SAX events into
*/
+ @Override
public void setDTDHandler(DTDHandler dtdHandler) {
this.dtdHandler = dtdHandler;
}
@@ -559,6 +567,7 @@ public class TransformTag extends ParseTag {
*
* @return the Error Handler to use to feed SAX events into
*/
+ @Override
public ErrorHandler getErrorHandler() {
return this.errorHandler;
}
@@ -568,6 +577,7 @@ public class TransformTag extends ParseTag {
*
* @param the Error Handler to use to feed SAX events into
*/
+ @Override
public void setErrorHandler(ErrorHandler errorHandler) {
// save the error handler
this.errorHandler = errorHandler;
@@ -578,6 +588,7 @@ public class TransformTag extends ParseTag {
*
* @return the Entity Resolver to use to feed SAX events into
*/
+ @Override
public EntityResolver getEntityResolver() {
return this.entityResolver;
}
@@ -587,6 +598,7 @@ public class TransformTag extends ParseTag {
*
* @param the Entity Resolver to use to feed SAX events into
*/
+ @Override
public void setEntityResolver(EntityResolver entityResolver) {
this.entityResolver = entityResolver;
}
@@ -602,6 +614,7 @@ public class TransformTag extends ParseTag {
* When the XMLReader recognizes the property name but
* cannot determine its value at this time.
*/
+ @Override
public Object getProperty(String name)
throws SAXNotRecognizedException, SAXNotSupportedException
{
@@ -625,6 +638,7 @@ public class TransformTag extends ParseTag {
* When the XMLReader recognizes the property name but
* cannot determine its value at this time.
*/
+ @Override
public void setProperty(String name, Object value)
throws SAXNotRecognizedException, SAXNotSupportedException
{
@@ -645,6 +659,7 @@ public class TransformTag extends ParseTag {
* When the XMLReader recognizes the feature name but
* cannot determine its value at this time.
*/
+ @Override
public boolean getFeature(String name)
throws SAXNotRecognizedException, SAXNotSupportedException
{
@@ -663,6 +678,7 @@ public class TransformTag extends ParseTag {
* When the XMLReader recognizes the feature name but
* cannot determine its value at this time.
*/
+ @Override
public void setFeature(String name, boolean value)
throws SAXNotRecognizedException, SAXNotSupportedException
{
diff --git a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/XMLTagLibrary.java b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/XMLTagLibrary.java
index 12d93b23..2b1826aa 100644
--- a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/XMLTagLibrary.java
+++ b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/XMLTagLibrary.java
@@ -63,6 +63,7 @@ public class XMLTagLibrary extends TagLibrary {
this.jexlFactory = new JexlExpressionFactory();
}
+ @Override
public Expression createExpression(
ExpressionFactory factory,
TagScript tagScript,
diff --git a/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/ActualTag.java b/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/ActualTag.java
index e873ef65..ff2e0e85 100644
--- a/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/ActualTag.java
+++ b/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/ActualTag.java
@@ -24,6 +24,7 @@ import org.dom4j.io.SAXReader;
public class ActualTag extends XMLUnitTagSupport {
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
Document actualDocument = parseBody();
@@ -33,6 +34,7 @@ public class ActualTag extends XMLUnitTagSupport {
assertTag.setActual(actualDocument);
}
+ @Override
protected SAXReader createSAXReader() {
return new SAXReader();
}
diff --git a/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/AssertDocumentsEqualTag.java b/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/AssertDocumentsEqualTag.java
index 7c7ee4ee..29e3b0f9 100644
--- a/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/AssertDocumentsEqualTag.java
+++ b/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/AssertDocumentsEqualTag.java
@@ -47,6 +47,7 @@ public class AssertDocumentsEqualTag extends XMLUnitTagSupport {
*/
private boolean ignoreWhitespace = false;
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
invokeBody(output);
@@ -116,6 +117,7 @@ public class AssertDocumentsEqualTag extends XMLUnitTagSupport {
this.ignoreWhitespace = ignoreWhitespace;
}
+ @Override
protected SAXReader createSAXReader() {
return new SAXReader();
}
diff --git a/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/ExpectedTag.java b/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/ExpectedTag.java
index 61b5e565..0e121ba7 100644
--- a/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/ExpectedTag.java
+++ b/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/ExpectedTag.java
@@ -24,6 +24,7 @@ import org.dom4j.io.SAXReader;
public class ExpectedTag extends XMLUnitTagSupport {
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
Document expectedDocument = parseBody();
@@ -33,6 +34,7 @@ public class ExpectedTag extends XMLUnitTagSupport {
assertTag.setExpected(expectedDocument);
}
+ @Override
protected SAXReader createSAXReader() {
return new SAXReader();
}
[commons-jelly] 01/03: Add missing @Override
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jelly.git
commit a0669b9fb98578844feb12154894f9d8bb2f7d44
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Aug 22 14:56:03 2023 -0400
Add missing @Override
---
.../org/apache/commons/jelly/DynaBeanTagSupport.java | 3 +++
.../org/apache/commons/jelly/DynaTagSupport.java | 1 +
.../org/apache/commons/jelly/JellyException.java | 13 +++++++++++++
.../java/org/apache/commons/jelly/MapTagSupport.java | 1 +
.../java/org/apache/commons/jelly/TagLibrary.java | 1 +
.../java/org/apache/commons/jelly/TagSupport.java | 13 +++++++++++--
.../java/org/apache/commons/jelly/XMLOutput.java | 20 ++++++++++++++++++++
.../jelly/expression/CompositeExpression.java | 5 +++++
.../commons/jelly/expression/ConstantExpression.java | 3 +++
.../commons/jelly/expression/ExpressionSupport.java | 4 ++++
.../jelly/expression/jexl/JexlExpression.java | 17 +++++++++++++++++
.../jelly/expression/jexl/JexlExpressionFactory.java | 4 ++++
.../jelly/expression/xpath/XPathExpression.java | 4 ++++
.../commons/jelly/impl/CompositeTextScriptBlock.java | 1 +
.../apache/commons/jelly/impl/DefaultTagFactory.java | 1 +
.../jelly/impl/DefaultTagLibraryResolver.java | 1 +
.../apache/commons/jelly/impl/DynamicBeanTag.java | 4 ++++
.../commons/jelly/impl/DynamicDynaBeanTag.java | 4 ++++
.../org/apache/commons/jelly/impl/DynamicTag.java | 2 ++
.../apache/commons/jelly/impl/DynamicTagLibrary.java | 3 +++
.../apache/commons/jelly/impl/ExpressionScript.java | 3 +++
.../org/apache/commons/jelly/impl/ScriptBlock.java | 3 +++
.../org/apache/commons/jelly/impl/StaticTag.java | 3 +++
.../apache/commons/jelly/impl/StaticTagScript.java | 1 +
.../org/apache/commons/jelly/impl/TagScript.java | 3 +++
.../org/apache/commons/jelly/impl/TextScript.java | 3 +++
.../commons/jelly/parser/DefaultNamespaceFilter.java | 3 +++
.../org/apache/commons/jelly/parser/XMLParser.java | 17 +++++++++++++++++
.../apache/commons/jelly/servlet/JellyServlet.java | 2 ++
.../commons/jelly/servlet/JellyServletContext.java | 3 +++
.../org/apache/commons/jelly/tags/core/ArgTag.java | 7 +++++++
.../org/apache/commons/jelly/tags/core/BreakTag.java | 1 +
.../org/apache/commons/jelly/tags/core/CaseTag.java | 1 +
.../org/apache/commons/jelly/tags/core/CatchTag.java | 1 +
.../apache/commons/jelly/tags/core/ChooseTag.java | 1 +
.../apache/commons/jelly/tags/core/DefaultTag.java | 1 +
.../org/apache/commons/jelly/tags/core/ExprTag.java | 1 +
.../org/apache/commons/jelly/tags/core/FileTag.java | 2 ++
.../apache/commons/jelly/tags/core/ForEachTag.java | 9 +++++++++
.../apache/commons/jelly/tags/core/GetStaticTag.java | 1 +
.../org/apache/commons/jelly/tags/core/IfTag.java | 1 +
.../apache/commons/jelly/tags/core/ImportTag.java | 1 +
.../apache/commons/jelly/tags/core/IncludeTag.java | 1 +
.../commons/jelly/tags/core/InvokeStaticTag.java | 2 ++
.../apache/commons/jelly/tags/core/InvokeTag.java | 2 ++
.../org/apache/commons/jelly/tags/core/JellyTag.java | 1 +
.../org/apache/commons/jelly/tags/core/MuteTag.java | 2 ++
.../org/apache/commons/jelly/tags/core/NewTag.java | 2 ++
.../apache/commons/jelly/tags/core/OtherwiseTag.java | 1 +
.../org/apache/commons/jelly/tags/core/ParseTag.java | 1 +
.../apache/commons/jelly/tags/core/RemoveTag.java | 1 +
.../org/apache/commons/jelly/tags/core/ScopeTag.java | 1 +
.../commons/jelly/tags/core/SetPropertiesTag.java | 1 +
.../org/apache/commons/jelly/tags/core/SetTag.java | 1 +
.../apache/commons/jelly/tags/core/SwitchTag.java | 1 +
.../apache/commons/jelly/tags/core/ThreadTag.java | 2 ++
.../apache/commons/jelly/tags/core/UseBeanTag.java | 2 ++
.../apache/commons/jelly/tags/core/UseListTag.java | 5 +++++
.../org/apache/commons/jelly/tags/core/WhenTag.java | 1 +
.../org/apache/commons/jelly/tags/core/WhileTag.java | 1 +
.../commons/jelly/tags/core/WhitespaceTag.java | 1 +
.../org/apache/commons/jelly/test/BaseJellyTest.java | 1 +
.../apache/commons/jelly/util/CommandLineParser.java | 4 +++-
.../commons/jelly/util/SafeContentHandler.java | 11 +++++++++++
.../apache/commons/jelly/xpath/XPathComparator.java | 1 +
.../test/java/org/apache/commons/jelly/TJEcho.java | 3 ++-
.../java/org/apache/commons/jelly/TJTagLibrary.java | 6 ++++--
.../test/java/org/apache/commons/jelly/TJTest.java | 3 ++-
.../java/org/apache/commons/jelly/core/Customer.java | 1 +
.../java/org/apache/commons/jelly/core/Order.java | 1 +
.../java/org/apache/commons/jelly/core/Product.java | 1 +
.../org/apache/commons/jelly/core/TestArgTag.java | 6 ++++++
.../apache/commons/jelly/core/TestIncludeTag.java | 1 +
.../commons/jelly/core/TestInvokeStaticTag.java | 2 ++
.../org/apache/commons/jelly/core/TestInvokeTag.java | 2 ++
.../commons/jelly/core/TestNamespacePrefixes.java | 1 +
.../org/apache/commons/jelly/core/TestSwitchTag.java | 2 ++
.../commons/jelly/core/TestUnexpectedTagCaching.java | 2 ++
.../apache/commons/jelly/core/TestUnknownTags.java | 1 +
.../expression/TestCustomExpressionFactory.java | 1 +
.../commons/jelly/tags/junit/AssertEqualsTag.java | 1 +
.../apache/commons/jelly/tags/junit/AssertTag.java | 1 +
.../commons/jelly/tags/junit/AssertThrowsTag.java | 1 +
.../org/apache/commons/jelly/tags/junit/CaseTag.java | 2 ++
.../org/apache/commons/jelly/tags/junit/FailTag.java | 1 +
.../commons/jelly/tags/junit/JUnitTagLibrary.java | 1 +
.../jelly/tags/junit/JellyAssertionFailedError.java | 13 +++++++++++++
.../org/apache/commons/jelly/tags/junit/RunTag.java | 5 +++++
.../apache/commons/jelly/tags/junit/SuiteTag.java | 1 +
.../org/apache/commons/jelly/test/impl/DummyTag.java | 1 +
.../jelly/test/xml/TestDefaultNamespaceFilter.java | 1 +
91 files changed, 273 insertions(+), 7 deletions(-)
diff --git a/core/src/main/java/org/apache/commons/jelly/DynaBeanTagSupport.java b/core/src/main/java/org/apache/commons/jelly/DynaBeanTagSupport.java
index bb45a20f..713a227d 100644
--- a/core/src/main/java/org/apache/commons/jelly/DynaBeanTagSupport.java
+++ b/core/src/main/java/org/apache/commons/jelly/DynaBeanTagSupport.java
@@ -42,6 +42,7 @@ public abstract class DynaBeanTagSupport extends DynaTagSupport {
}
/** Sets the context in which the tag will be run. */
+ @Override
public void setContext(JellyContext context) throws JellyTagException {
this.context = context;
beforeSetAttributes();
@@ -49,6 +50,7 @@ public abstract class DynaBeanTagSupport extends DynaTagSupport {
/** Sets an attribute value of this tag before the tag is invoked
*/
+ @Override
public void setAttribute(String name, Object value) throws JellyTagException {
getDynaBean().set(name, value);
}
@@ -57,6 +59,7 @@ public abstract class DynaBeanTagSupport extends DynaTagSupport {
* @return the type of the given attribute. By default just return
* Object.class if this is not known.
*/
+ @Override
public Class getAttributeType(String name) throws JellyTagException {
DynaProperty property = getDynaBean().getDynaClass().getDynaProperty(name);
if (property != null) {
diff --git a/core/src/main/java/org/apache/commons/jelly/DynaTagSupport.java b/core/src/main/java/org/apache/commons/jelly/DynaTagSupport.java
index eb5bb69c..956b479a 100644
--- a/core/src/main/java/org/apache/commons/jelly/DynaTagSupport.java
+++ b/core/src/main/java/org/apache/commons/jelly/DynaTagSupport.java
@@ -31,6 +31,7 @@ public abstract class DynaTagSupport extends TagSupport implements DynaTag {
* @return the type of the given attribute. By default just return
* Object.class if this is not known.
*/
+ @Override
public Class getAttributeType(String name) throws JellyTagException {
return Object.class;
}
diff --git a/core/src/main/java/org/apache/commons/jelly/JellyException.java b/core/src/main/java/org/apache/commons/jelly/JellyException.java
index cac39d42..3fd5bc50 100644
--- a/core/src/main/java/org/apache/commons/jelly/JellyException.java
+++ b/core/src/main/java/org/apache/commons/jelly/JellyException.java
@@ -81,6 +81,7 @@ public class JellyException extends Exception implements LocationAware {
this.lineNumber = lineNumber;
}
+ @Override
public Throwable getCause() {
return cause;
}
@@ -89,6 +90,7 @@ public class JellyException extends Exception implements LocationAware {
/**
* @return the line number of the tag
*/
+ @Override
public int getLineNumber() {
return lineNumber;
}
@@ -96,6 +98,7 @@ public class JellyException extends Exception implements LocationAware {
/**
* Sets the line number of the tag
*/
+ @Override
public void setLineNumber(int lineNumber) {
this.lineNumber = lineNumber;
}
@@ -103,6 +106,7 @@ public class JellyException extends Exception implements LocationAware {
/**
* @return the column number of the tag
*/
+ @Override
public int getColumnNumber() {
return columnNumber;
}
@@ -110,6 +114,7 @@ public class JellyException extends Exception implements LocationAware {
/**
* Sets the column number of the tag
*/
+ @Override
public void setColumnNumber(int columnNumber) {
this.columnNumber = columnNumber;
}
@@ -117,6 +122,7 @@ public class JellyException extends Exception implements LocationAware {
/**
* @return the Jelly file which caused the problem
*/
+ @Override
public String getFileName() {
return fileName;
}
@@ -124,6 +130,7 @@ public class JellyException extends Exception implements LocationAware {
/**
* Sets the Jelly file which caused the problem
*/
+ @Override
public void setFileName(String fileName) {
this.fileName = fileName;
}
@@ -132,6 +139,7 @@ public class JellyException extends Exception implements LocationAware {
/**
* @return the element name which caused the problem
*/
+ @Override
public String getElementName() {
return elementName;
}
@@ -139,11 +147,13 @@ public class JellyException extends Exception implements LocationAware {
/**
* Sets the element name which caused the problem
*/
+ @Override
public void setElementName(String elementName) {
this.elementName = elementName;
}
+ @Override
public String getMessage() {
if (fileName == null && lineNumber == -1 && columnNumber == -1 && elementName == null) {
return getReason();
@@ -157,6 +167,7 @@ public class JellyException extends Exception implements LocationAware {
}
// #### overload the printStackTrace methods...
+ @Override
public void printStackTrace(PrintWriter s) {
synchronized (s) {
super.printStackTrace(s);
@@ -167,6 +178,7 @@ public class JellyException extends Exception implements LocationAware {
}
}
+ @Override
public void printStackTrace(PrintStream s) {
synchronized (s) {
super.printStackTrace(s);
@@ -177,6 +189,7 @@ public class JellyException extends Exception implements LocationAware {
}
}
+ @Override
public void printStackTrace() {
super.printStackTrace();
if (cause != null) {
diff --git a/core/src/main/java/org/apache/commons/jelly/MapTagSupport.java b/core/src/main/java/org/apache/commons/jelly/MapTagSupport.java
index 82de6713..7237144b 100644
--- a/core/src/main/java/org/apache/commons/jelly/MapTagSupport.java
+++ b/core/src/main/java/org/apache/commons/jelly/MapTagSupport.java
@@ -36,6 +36,7 @@ public abstract class MapTagSupport extends DynaTagSupport {
/** Sets an attribute value of this tag before the tag is invoked
*/
+ @Override
public void setAttribute(String name, Object value) {
getAttributes().put(name, value);
}
diff --git a/core/src/main/java/org/apache/commons/jelly/TagLibrary.java b/core/src/main/java/org/apache/commons/jelly/TagLibrary.java
index 567a0f01..107a5a1f 100644
--- a/core/src/main/java/org/apache/commons/jelly/TagLibrary.java
+++ b/core/src/main/java/org/apache/commons/jelly/TagLibrary.java
@@ -47,6 +47,7 @@ public abstract class TagLibrary {
ConvertUtils.register(
new Converter() {
+ @Override
public Object convert(Class type, Object value) {
if ( value instanceof File ) {
return (File) value;
diff --git a/core/src/main/java/org/apache/commons/jelly/TagSupport.java b/core/src/main/java/org/apache/commons/jelly/TagSupport.java
index 0668c267..ec13adf6 100644
--- a/core/src/main/java/org/apache/commons/jelly/TagSupport.java
+++ b/core/src/main/java/org/apache/commons/jelly/TagSupport.java
@@ -146,11 +146,13 @@ public abstract class TagSupport implements Tag {
}
/** @return the parent of this tag */
+ @Override
public Tag getParent() {
return parent;
}
/** Sets the parent of this tag */
+ @Override
public void setParent(Tag parent) {
this.parent = parent;
}
@@ -158,20 +160,23 @@ public abstract class TagSupport implements Tag {
/* (non-Javadoc)
* @see org.apache.commons.jelly.Tag#getTagLib()
*/
- public TagLibrary getTagLib() {
+ @Override
+ public TagLibrary getTagLib() {
return tagLibrary;
}
/* (non-Javadoc)
* @see org.apache.commons.jelly.Tag#setTagLib(org.apache.commons.jelly.TagLibrary)
*/
- public void setTagLib(TagLibrary tagLibrary) {
+ @Override
+ public void setTagLib(TagLibrary tagLibrary) {
if (this.tagLibrary != null && tagLibrary != this.tagLibrary)
throw new IllegalArgumentException("Cannot setTagLib once set");
this.tagLibrary = tagLibrary;
}
/** @return the body of the tag */
+ @Override
public Script getBody() {
if (! hasTrimmed) {
hasTrimmed = true;
@@ -183,17 +188,20 @@ public abstract class TagSupport implements Tag {
}
/** Sets the body of the tag */
+ @Override
public void setBody(Script body) {
this.body = body;
this.hasTrimmed = false;
}
/** @return the context in which the tag will be run */
+ @Override
public JellyContext getContext() {
return context;
}
/** Sets the context in which the tag will be run */
+ @Override
public void setContext(JellyContext context) throws JellyTagException {
this.context = context;
}
@@ -201,6 +209,7 @@ public abstract class TagSupport implements Tag {
/**
* Invokes the body of this tag using the given output
*/
+ @Override
public void invokeBody(XMLOutput output) throws JellyTagException {
getBody().run(context, output);
}
diff --git a/core/src/main/java/org/apache/commons/jelly/XMLOutput.java b/core/src/main/java/org/apache/commons/jelly/XMLOutput.java
index 1eb55baa..9549c672 100644
--- a/core/src/main/java/org/apache/commons/jelly/XMLOutput.java
+++ b/core/src/main/java/org/apache/commons/jelly/XMLOutput.java
@@ -98,6 +98,7 @@ public class XMLOutput implements ContentHandler, LexicalHandler {
this.lexicalHandler = lexicalHandler;
}
+ @Override
public String toString() {
return super.toString()
+ "[contentHandler="
@@ -300,6 +301,7 @@ public class XMLOutput implements ContentHandler, LexicalHandler {
* any SAX document event.
* @see org.xml.sax.Locator
*/
+ @Override
public void setDocumentLocator(Locator locator) {
contentHandler.setDocumentLocator(locator);
}
@@ -315,6 +317,7 @@ public class XMLOutput implements ContentHandler, LexicalHandler {
* wrapping another exception.
* @see #endDocument
*/
+ @Override
public void startDocument() throws SAXException {
contentHandler.startDocument();
}
@@ -332,6 +335,7 @@ public class XMLOutput implements ContentHandler, LexicalHandler {
* wrapping another exception.
* @see #startDocument
*/
+ @Override
public void endDocument() throws SAXException {
contentHandler.endDocument();
}
@@ -374,6 +378,7 @@ public class XMLOutput implements ContentHandler, LexicalHandler {
* @see #endPrefixMapping
* @see #startElement
*/
+ @Override
public void startPrefixMapping(String prefix, String uri) throws SAXException {
namespaceStack.pushNamespace(prefix, uri);
// contentHandler.startPrefixMapping(prefix, uri) will be called if needed
@@ -396,6 +401,7 @@ public class XMLOutput implements ContentHandler, LexicalHandler {
* @see #startPrefixMapping
* @see #endElement
*/
+ @Override
public void endPrefixMapping(String prefix) throws SAXException {
// End prefix mapping was already called after endElement
// contentHandler.endPrefixMapping(prefix);
@@ -463,6 +469,7 @@ public class XMLOutput implements ContentHandler, LexicalHandler {
* @see #endElement
* @see org.xml.sax.Attributes
*/
+ @Override
public void startElement(
String uri,
String localName,
@@ -514,6 +521,7 @@ public class XMLOutput implements ContentHandler, LexicalHandler {
* @throws org.xml.sax.SAXException Any SAX exception, possibly
* wrapping another exception.
*/
+ @Override
public void endElement(String uri, String localName, String qName)
throws SAXException {
contentHandler.endElement(uri, localName, qName);
@@ -565,6 +573,7 @@ public class XMLOutput implements ContentHandler, LexicalHandler {
* @see #ignorableWhitespace
* @see org.xml.sax.Locator
*/
+ @Override
public void characters(char[] ch, int start, int length) throws SAXException {
contentHandler.characters(ch, start, length);
}
@@ -593,6 +602,7 @@ public class XMLOutput implements ContentHandler, LexicalHandler {
* wrapping another exception.
* @see #characters
*/
+ @Override
public void ignorableWhitespace(char[] ch, int start, int length)
throws SAXException {
contentHandler.ignorableWhitespace(ch, start, length);
@@ -620,6 +630,7 @@ public class XMLOutput implements ContentHandler, LexicalHandler {
* @throws org.xml.sax.SAXException Any SAX exception, possibly
* wrapping another exception.
*/
+ @Override
public void processingInstruction(String target, String data)
throws SAXException {
contentHandler.processingInstruction(target, data);
@@ -650,6 +661,7 @@ public class XMLOutput implements ContentHandler, LexicalHandler {
* @throws org.xml.sax.SAXException Any SAX exception, possibly
* wrapping another exception.
*/
+ @Override
public void skippedEntity(String name) throws SAXException {
contentHandler.skippedEntity(name);
}
@@ -696,6 +708,7 @@ public class XMLOutput implements ContentHandler, LexicalHandler {
* @see #endDTD
* @see #startEntity
*/
+ @Override
public void startDTD(String name, String publicId, String systemId)
throws SAXException {
if (lexicalHandler != null) {
@@ -713,6 +726,7 @@ public class XMLOutput implements ContentHandler, LexicalHandler {
* @throws SAXException The application may raise an exception.
* @see #startDTD
*/
+ @Override
public void endDTD() throws SAXException {
if (lexicalHandler != null) {
lexicalHandler.endDTD();
@@ -768,6 +782,7 @@ public class XMLOutput implements ContentHandler, LexicalHandler {
* @see org.xml.sax.ext.DeclHandler#internalEntityDecl
* @see org.xml.sax.ext.DeclHandler#externalEntityDecl
*/
+ @Override
public void startEntity(String name) throws SAXException {
if (lexicalHandler != null) {
lexicalHandler.startEntity(name);
@@ -781,6 +796,7 @@ public class XMLOutput implements ContentHandler, LexicalHandler {
* @throws SAXException The application may raise an exception.
* @see #startEntity
*/
+ @Override
public void endEntity(String name) throws SAXException {
if (lexicalHandler != null) {
lexicalHandler.endEntity(name);
@@ -798,6 +814,7 @@ public class XMLOutput implements ContentHandler, LexicalHandler {
* @throws SAXException The application may raise an exception.
* @see #endCDATA
*/
+ @Override
public void startCDATA() throws SAXException {
if (lexicalHandler != null) {
lexicalHandler.startCDATA();
@@ -810,6 +827,7 @@ public class XMLOutput implements ContentHandler, LexicalHandler {
* @throws SAXException The application may raise an exception.
* @see #startCDATA
*/
+ @Override
public void endCDATA() throws SAXException {
if (lexicalHandler != null) {
lexicalHandler.endCDATA();
@@ -830,6 +848,7 @@ public class XMLOutput implements ContentHandler, LexicalHandler {
* @param length The number of characters to use from the array.
* @throws SAXException The application may raise an exception.
*/
+ @Override
public void comment(char ch[], int start, int length) throws SAXException {
if (lexicalHandler != null) {
lexicalHandler.comment(ch, start, length);
@@ -904,6 +923,7 @@ public class XMLOutput implements ContentHandler, LexicalHandler {
*/
protected static XMLOutput createXMLOutput(final XMLWriter xmlWriter) {
XMLOutput answer = new XMLOutput() {
+ @Override
public void close() throws IOException {
xmlWriter.close();
}
diff --git a/core/src/main/java/org/apache/commons/jelly/expression/CompositeExpression.java b/core/src/main/java/org/apache/commons/jelly/expression/CompositeExpression.java
index 2a6ea826..59b74dbf 100644
--- a/core/src/main/java/org/apache/commons/jelly/expression/CompositeExpression.java
+++ b/core/src/main/java/org/apache/commons/jelly/expression/CompositeExpression.java
@@ -44,6 +44,7 @@ public class CompositeExpression extends ExpressionSupport {
this.expressions = expressions;
}
+ @Override
public String toString() {
return super.toString() + "[expressions=" + expressions +"]";
}
@@ -240,6 +241,7 @@ public class CompositeExpression extends ExpressionSupport {
// Expression interface
//-------------------------------------------------------------------------
+ @Override
public String getExpressionText() {
StringBuilder buffer = new StringBuilder();
for (Iterator iter = expressions.iterator(); iter.hasNext(); ) {
@@ -251,11 +253,13 @@ public class CompositeExpression extends ExpressionSupport {
// inherit javadoc from interface
+ @Override
public Object evaluate(JellyContext context) {
return evaluateAsString(context);
}
// inherit javadoc from interface
+ @Override
public String evaluateAsString(JellyContext context) {
StringBuilder buffer = new StringBuilder();
for (Iterator iter = expressions.iterator(); iter.hasNext(); ) {
@@ -270,6 +274,7 @@ public class CompositeExpression extends ExpressionSupport {
}
// inherit javadoc from interface
+ @Override
public Iterator evaluateAsIterator(JellyContext context) {
String value = evaluateAsString(context);
if ( value == null ) {
diff --git a/core/src/main/java/org/apache/commons/jelly/expression/ConstantExpression.java b/core/src/main/java/org/apache/commons/jelly/expression/ConstantExpression.java
index 5a7dc7c6..0575c0b3 100644
--- a/core/src/main/java/org/apache/commons/jelly/expression/ConstantExpression.java
+++ b/core/src/main/java/org/apache/commons/jelly/expression/ConstantExpression.java
@@ -40,10 +40,12 @@ public class ConstantExpression extends ExpressionSupport {
this.value = value;
}
+ @Override
public String toString() {
return super.toString() + "[value=" + value +"]";
}
+ @Override
public String getExpressionText() {
return value == null ? "null" : value.toString();
}
@@ -54,6 +56,7 @@ public class ConstantExpression extends ExpressionSupport {
* @param context evaluate expression against this context
* @return current value of <code>value</code> property
*/
+ @Override
public Object evaluate(JellyContext context) {
return value;
}
diff --git a/core/src/main/java/org/apache/commons/jelly/expression/ExpressionSupport.java b/core/src/main/java/org/apache/commons/jelly/expression/ExpressionSupport.java
index 6f98727e..89afdfe9 100644
--- a/core/src/main/java/org/apache/commons/jelly/expression/ExpressionSupport.java
+++ b/core/src/main/java/org/apache/commons/jelly/expression/ExpressionSupport.java
@@ -41,6 +41,7 @@ public abstract class ExpressionSupport implements Expression {
protected static final Iterator EMPTY_ITERATOR = Collections.EMPTY_LIST.iterator();
// inherit javadoc from interface
+ @Override
public String evaluateAsString(JellyContext context) {
Object value = evaluateRecurse(context);
// sometimes when Jelly is used inside Maven the value
@@ -56,6 +57,7 @@ public abstract class ExpressionSupport implements Expression {
// inherit javadoc from interface
+ @Override
public Object evaluateRecurse(JellyContext context) {
Object value = evaluate(context);
if (value instanceof Expression) {
@@ -66,6 +68,7 @@ public abstract class ExpressionSupport implements Expression {
}
// inherit javadoc from interface
+ @Override
public boolean evaluateAsBoolean(JellyContext context) {
Object value = evaluateRecurse(context);
if ( value instanceof Boolean ) {
@@ -89,6 +92,7 @@ public abstract class ExpressionSupport implements Expression {
}
// inherit javadoc from interface
+ @Override
public Iterator evaluateAsIterator(JellyContext context) {
Object value = evaluateRecurse(context);
if ( value == null ) {
diff --git a/core/src/main/java/org/apache/commons/jelly/expression/jexl/JexlExpression.java b/core/src/main/java/org/apache/commons/jelly/expression/jexl/JexlExpression.java
index cfc9a32d..747f74bc 100644
--- a/core/src/main/java/org/apache/commons/jelly/expression/jexl/JexlExpression.java
+++ b/core/src/main/java/org/apache/commons/jelly/expression/jexl/JexlExpression.java
@@ -48,16 +48,19 @@ public class JexlExpression extends ExpressionSupport {
this.expression = expression;
}
+ @Override
public String toString() {
return super.toString() + "[" + expression.getExpression() + "]";
}
// Expression interface
//-------------------------------------------------------------------------
+ @Override
public String getExpressionText() {
return "${" + expression.getExpression() + "}";
}
+ @Override
public Object evaluate(JellyContext context) {
try {
JexlContext jexlContext = new JellyJexlContext( context );
@@ -95,11 +98,13 @@ class JellyJexlContext implements JexlContext {
this.vars = new JellyMap( context );
}
+ @Override
public void setVars(Map vars) {
this.vars.clear();
this.vars.putAll( vars );
}
+ @Override
public Map getVars() {
return this.vars;
}
@@ -114,50 +119,62 @@ class JellyMap implements Map {
this.context = context;
}
+ @Override
public Object get(Object key) {
return context.getVariable( (String) key );
}
+ @Override
public void clear() {
// not implemented
}
+ @Override
public boolean containsKey(Object key) {
return ( get( key ) != null );
}
+ @Override
public boolean containsValue(Object value) {
return false;
}
+ @Override
public Set entrySet() {
return null;
}
+ @Override
public boolean isEmpty() {
return false;
}
+ @Override
public Set keySet() {
return null;
}
+ @Override
public Object put(Object key, Object value) {
return null;
}
+ @Override
public void putAll(Map t) {
// not implemented
}
+ @Override
public Object remove(Object key) {
return null;
}
+ @Override
public int size() {
return -1;
}
+ @Override
public Collection values() {
return null;
}
diff --git a/core/src/main/java/org/apache/commons/jelly/expression/jexl/JexlExpressionFactory.java b/core/src/main/java/org/apache/commons/jelly/expression/jexl/JexlExpressionFactory.java
index cf205186..6ad2511f 100644
--- a/core/src/main/java/org/apache/commons/jelly/expression/jexl/JexlExpressionFactory.java
+++ b/core/src/main/java/org/apache/commons/jelly/expression/jexl/JexlExpressionFactory.java
@@ -41,6 +41,7 @@ public class JexlExpressionFactory implements ExpressionFactory {
// ExpressionFactory interface
//-------------------------------------------------------------------------
+ @Override
public Expression createExpression(String text) throws JellyException {
/*
@@ -118,6 +119,7 @@ public class JexlExpressionFactory implements ExpressionFactory {
this.text = text;
}
+ @Override
public Object evaluate(JellyContext context) {
Object answer = jexlExpression.evaluate(context);
@@ -128,10 +130,12 @@ public class JexlExpressionFactory implements ExpressionFactory {
return answer;
}
+ @Override
public String getExpressionText() {
return "${" + text + "}";
}
+ @Override
public String toString() {
return super.toString() + "[expression:" + text + "]";
}
diff --git a/core/src/main/java/org/apache/commons/jelly/expression/xpath/XPathExpression.java b/core/src/main/java/org/apache/commons/jelly/expression/xpath/XPathExpression.java
index 0393a4a6..76979ce1 100644
--- a/core/src/main/java/org/apache/commons/jelly/expression/xpath/XPathExpression.java
+++ b/core/src/main/java/org/apache/commons/jelly/expression/xpath/XPathExpression.java
@@ -60,16 +60,19 @@ public class XPathExpression extends ExpressionSupport implements VariableContex
this.uris = createUriMap(namespaceContext);
}
+ @Override
public String toString() {
return getExpressionText();
}
// Expression interface
//-------------------------------------------------------------------------
+ @Override
public String getExpressionText() {
return this.text;
}
+ @Override
public Object evaluate(JellyContext context) {
this.context = context;
@@ -100,6 +103,7 @@ public class XPathExpression extends ExpressionSupport implements VariableContex
// VariableContext interface
//-------------------------------------------------------------------------
+ @Override
public Object getVariableValue(
String namespaceURI,
String prefix,
diff --git a/core/src/main/java/org/apache/commons/jelly/impl/CompositeTextScriptBlock.java b/core/src/main/java/org/apache/commons/jelly/impl/CompositeTextScriptBlock.java
index b7f3f1fe..ee4ba784 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/CompositeTextScriptBlock.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/CompositeTextScriptBlock.java
@@ -42,6 +42,7 @@ public class CompositeTextScriptBlock extends ScriptBlock {
* In this case, trim the whitespace from the start of the first element
* and from the end of the last element.
*/
+ @Override
public void trimWhitespace() {
List list = getScriptList();
int size = list.size();
diff --git a/core/src/main/java/org/apache/commons/jelly/impl/DefaultTagFactory.java b/core/src/main/java/org/apache/commons/jelly/impl/DefaultTagFactory.java
index a6da6ffd..8ec959d6 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/DefaultTagFactory.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/DefaultTagFactory.java
@@ -39,6 +39,7 @@ public class DefaultTagFactory implements TagFactory {
// TagFactory interface
//-------------------------------------------------------------------------
+ @Override
public Tag createTag(String name, Attributes attributes) throws JellyException {
try {
return (Tag) tagClass.newInstance();
diff --git a/core/src/main/java/org/apache/commons/jelly/impl/DefaultTagLibraryResolver.java b/core/src/main/java/org/apache/commons/jelly/impl/DefaultTagLibraryResolver.java
index 153ec8b9..0bed2bda 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/DefaultTagLibraryResolver.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/DefaultTagLibraryResolver.java
@@ -69,6 +69,7 @@ public class DefaultTagLibraryResolver implements TagLibraryResolver {
* otherwise null is returned to indicate no tag library could be found
* so that the namespace URI should be treated as just vanilla XML.
*/
+ @Override
public TagLibrary resolveTagLibrary(String uri) {
DiscoverClasses discovery = getDiscoverClasses();
String name = uri;
diff --git a/core/src/main/java/org/apache/commons/jelly/impl/DynamicBeanTag.java b/core/src/main/java/org/apache/commons/jelly/impl/DynamicBeanTag.java
index 0b7f1ac1..00531d6a 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/DynamicBeanTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/DynamicBeanTag.java
@@ -91,6 +91,7 @@ public class DynamicBeanTag extends DynaBeanTagSupport implements BeanSource {
this.variableNameAttribute = variableNameAttribute;
}
+ @Override
public void beforeSetAttributes() throws JellyTagException {
// create a new dynabean before the attributes are set
try {
@@ -105,6 +106,7 @@ public class DynamicBeanTag extends DynaBeanTagSupport implements BeanSource {
setAttributesSet.clear();
}
+ @Override
public void setAttribute(String name, Object value) throws JellyTagException {
boolean isVariableName = false;
if (variableNameAttribute != null ) {
@@ -133,6 +135,7 @@ public class DynamicBeanTag extends DynaBeanTagSupport implements BeanSource {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
// lets find any attributes that are not set and
@@ -227,6 +230,7 @@ public class DynamicBeanTag extends DynaBeanTagSupport implements BeanSource {
/**
* @return the bean that has just been created
*/
+ @Override
public Object getBean() {
return bean;
}
diff --git a/core/src/main/java/org/apache/commons/jelly/impl/DynamicDynaBeanTag.java b/core/src/main/java/org/apache/commons/jelly/impl/DynamicDynaBeanTag.java
index ea6965c9..c269f08a 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/DynamicDynaBeanTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/DynamicDynaBeanTag.java
@@ -62,6 +62,7 @@ public class DynamicDynaBeanTag extends DynaBeanTagSupport implements BeanSource
this.variableNameAttribute = variableNameAttribute;
}
+ @Override
public void beforeSetAttributes() throws JellyTagException {
// create a new dynabean before the attributes are set
try {
@@ -75,6 +76,7 @@ public class DynamicDynaBeanTag extends DynaBeanTagSupport implements BeanSource
setAttributesSet.clear();
}
+ @Override
public void setAttribute(String name, Object value) throws JellyTagException {
boolean isVariableName = false;
if (variableNameAttribute != null ) {
@@ -103,6 +105,7 @@ public class DynamicDynaBeanTag extends DynaBeanTagSupport implements BeanSource
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
// lets find any attributes that are not set and
@@ -140,6 +143,7 @@ public class DynamicDynaBeanTag extends DynaBeanTagSupport implements BeanSource
/**
* @return the bean that has just been created
*/
+ @Override
public Object getBean() {
return getDynaBean();
}
diff --git a/core/src/main/java/org/apache/commons/jelly/impl/DynamicTag.java b/core/src/main/java/org/apache/commons/jelly/impl/DynamicTag.java
index 29fe3801..54bdea03 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/DynamicTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/DynamicTag.java
@@ -57,6 +57,7 @@ public class DynamicTag extends DynaTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
if ( log.isDebugEnabled() ) {
log.debug("Invoking dynamic tag with attributes: " + attributes);
@@ -81,6 +82,7 @@ public class DynamicTag extends DynaTagSupport {
// DynaTag interface
//-------------------------------------------------------------------------
+ @Override
public void setAttribute(String name, Object value) {
attributes.put(name, value);
attributes.put(name + "Attr", value);
diff --git a/core/src/main/java/org/apache/commons/jelly/impl/DynamicTagLibrary.java b/core/src/main/java/org/apache/commons/jelly/impl/DynamicTagLibrary.java
index 1cd4d626..a94e9d55 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/DynamicTagLibrary.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/DynamicTagLibrary.java
@@ -45,11 +45,13 @@ public class DynamicTagLibrary extends TagLibrary {
}
/** Creates a new script to execute the given tag name and attributes */
+ @Override
public TagScript createTagScript(final String name, final Attributes attributes)
throws JellyException {
return new TagScript(
new TagFactory() {
+ @Override
public Tag createTag(String name, Attributes attributes) throws JellyException {
return DynamicTagLibrary.this.createTag(name, attributes);
}
@@ -58,6 +60,7 @@ public class DynamicTagLibrary extends TagLibrary {
}
/** Creates a new Tag for the given tag name if it exists */
+ @Override
public Tag createTag(String name, Attributes attributes)
throws JellyException {
diff --git a/core/src/main/java/org/apache/commons/jelly/impl/ExpressionScript.java b/core/src/main/java/org/apache/commons/jelly/impl/ExpressionScript.java
index 483cbe07..c1440fab 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/ExpressionScript.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/ExpressionScript.java
@@ -40,6 +40,7 @@ public class ExpressionScript implements Script {
this.expression = expression;
}
+ @Override
public String toString() {
return super.toString() + "[expression=" + expression + "]";
}
@@ -56,11 +57,13 @@ public class ExpressionScript implements Script {
// Script interface
//-------------------------------------------------------------------------
+ @Override
public Script compile() {
return this;
}
/** Evaluates the body of a tag */
+ @Override
public void run(JellyContext context, XMLOutput output) throws JellyTagException {
Object result = expression.evaluate(context);
if (result != null) {
diff --git a/core/src/main/java/org/apache/commons/jelly/impl/ScriptBlock.java b/core/src/main/java/org/apache/commons/jelly/impl/ScriptBlock.java
index 0401bdef..f0fa9f8a 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/ScriptBlock.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/ScriptBlock.java
@@ -44,6 +44,7 @@ public class ScriptBlock implements Script {
/**
* @see Object#toString()
*/
+ @Override
public String toString() {
return super.toString() + "[scripts=" + list + "]";
}
@@ -68,6 +69,7 @@ public class ScriptBlock implements Script {
// Script interface
//-------------------------------------------------------------------------
+ @Override
public Script compile() throws JellyException {
int size = list.size();
if (size == 1) {
@@ -83,6 +85,7 @@ public class ScriptBlock implements Script {
}
/** Evaluates the body of a tag */
+ @Override
public void run(JellyContext context, XMLOutput output) throws JellyTagException {
/*
for (int i = 0, size = scripts.length; i < size; i++) {
diff --git a/core/src/main/java/org/apache/commons/jelly/impl/StaticTag.java b/core/src/main/java/org/apache/commons/jelly/impl/StaticTag.java
index bc77de71..5b8a0e5b 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/StaticTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/StaticTag.java
@@ -52,12 +52,14 @@ public class StaticTag extends DynaTagSupport {
this.qname = qname;
}
+ @Override
public String toString() {
return super.toString() + "[qname=" + qname + ";attributes=" + attributes + "]";
}
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
try {
output.startElement(uri, localName, qname, attributes);
@@ -81,6 +83,7 @@ public class StaticTag extends DynaTagSupport {
// DynaTag interface
//-------------------------------------------------------------------------
+ @Override
public void setAttribute(String name, Object value) throws JellyTagException {
// ### we'll assume that all attributes are in no namespace!
// ### this is severely limiting!
diff --git a/core/src/main/java/org/apache/commons/jelly/impl/StaticTagScript.java b/core/src/main/java/org/apache/commons/jelly/impl/StaticTagScript.java
index 56ac708d..f1edcdd4 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/StaticTagScript.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/StaticTagScript.java
@@ -50,6 +50,7 @@ public class StaticTagScript extends TagScript {
// Script interface
//-------------------------------------------------------------------------
+ @Override
public void run(JellyContext context, XMLOutput output) throws JellyTagException {
try {
startNamespacePrefixes(output);
diff --git a/core/src/main/java/org/apache/commons/jelly/impl/TagScript.java b/core/src/main/java/org/apache/commons/jelly/impl/TagScript.java
index 48132194..47979cc9 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/TagScript.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/TagScript.java
@@ -128,6 +128,7 @@ public class TagScript implements Script {
this.tagFactory = tagFactory;
}
+ @Override
public String toString() {
return super.toString() + "[tag=" + elementName + ";at=" + lineNumber + ":" + columnNumber + "]";
}
@@ -135,6 +136,7 @@ public class TagScript implements Script {
/**
* Compiles the tags body
*/
+ @Override
public Script compile() throws JellyException {
if (tagBody != null) {
tagBody = tagBody.compile();
@@ -201,6 +203,7 @@ public class TagScript implements Script {
//-------------------------------------------------------------------------
/** Evaluates the body of a tag */
+ @Override
public void run(JellyContext context, XMLOutput output) throws JellyTagException {
URL rootURL = context.getRootURL();
URL currentURL = context.getCurrentURL();
diff --git a/core/src/main/java/org/apache/commons/jelly/impl/TextScript.java b/core/src/main/java/org/apache/commons/jelly/impl/TextScript.java
index 389fdb9e..81f09607 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/TextScript.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/TextScript.java
@@ -38,6 +38,7 @@ public class TextScript implements Script {
this.text = text;
}
+ @Override
public String toString() {
return super.toString() + "[text=" + text + "]";
}
@@ -94,11 +95,13 @@ public class TextScript implements Script {
// Script interface
//-------------------------------------------------------------------------
+ @Override
public Script compile() {
return this;
}
/** Evaluates the body of a tag */
+ @Override
public void run(JellyContext context, XMLOutput output) throws JellyTagException {
if (text != null) {
try {
diff --git a/core/src/main/java/org/apache/commons/jelly/parser/DefaultNamespaceFilter.java b/core/src/main/java/org/apache/commons/jelly/parser/DefaultNamespaceFilter.java
index ecbad1b2..bc376ee6 100644
--- a/core/src/main/java/org/apache/commons/jelly/parser/DefaultNamespaceFilter.java
+++ b/core/src/main/java/org/apache/commons/jelly/parser/DefaultNamespaceFilter.java
@@ -51,6 +51,7 @@ public class DefaultNamespaceFilter extends XMLFilterImpl {
* @param uri URI to check and potentially replace
* @throws SAXException
*/
+ @Override
public void startPrefixMapping(java.lang.String prefix,
java.lang.String uri)
throws SAXException {
@@ -71,6 +72,7 @@ public class DefaultNamespaceFilter extends XMLFilterImpl {
* @param atts
* @throws SAXException
*/
+ @Override
public void startElement(java.lang.String uri,
java.lang.String localName,
java.lang.String qName,
@@ -94,6 +96,7 @@ public class DefaultNamespaceFilter extends XMLFilterImpl {
* @param qName
* @throws SAXException
*/
+ @Override
public void endElement(String namespaceURI, String localName, String qName)
throws SAXException {
if (namespaceURI.equals("")) {
diff --git a/core/src/main/java/org/apache/commons/jelly/parser/XMLParser.java b/core/src/main/java/org/apache/commons/jelly/parser/XMLParser.java
index 8bf3a24b..7c79c4ba 100644
--- a/core/src/main/java/org/apache/commons/jelly/parser/XMLParser.java
+++ b/core/src/main/java/org/apache/commons/jelly/parser/XMLParser.java
@@ -615,6 +615,7 @@ public class XMLParser extends DefaultHandler {
*
* @throws SAXException if a parsing error is to be reported
*/
+ @Override
public void startDocument() throws SAXException {
script = new ScriptBlock();
textBuffer = new StringBuffer();
@@ -628,6 +629,7 @@ public class XMLParser extends DefaultHandler {
*
* @throws SAXException if a parsing error is to be reported
*/
+ @Override
public void endDocument() throws SAXException {
textBuffer = null;
}
@@ -671,6 +673,7 @@ public class XMLParser extends DefaultHandler {
* no attributes, it shall be an empty Attributes object.
* @throws SAXException if a parsing error is to be reported
*/
+ @Override
public void startElement(
String namespaceURI,
String localName,
@@ -748,6 +751,7 @@ public class XMLParser extends DefaultHandler {
*
* @throws SAXException if a parsing error is to be reported
*/
+ @Override
public void characters(char buffer[], int start, int length)
throws SAXException {
textBuffer.append(buffer, start, length);
@@ -765,6 +769,7 @@ public class XMLParser extends DefaultHandler {
* empty string if qualified names are not available.
* @throws SAXException if a parsing error is to be reported
*/
+ @Override
public void endElement(String namespaceURI, String localName, String qName)
throws SAXException {
try {
@@ -803,6 +808,7 @@ public class XMLParser extends DefaultHandler {
*
* @throws SAXException if a parsing error is to be reported
*/
+ @Override
public void startPrefixMapping(String prefix, String namespaceURI)
throws SAXException {
// Register this prefix mapping
@@ -826,6 +832,7 @@ public class XMLParser extends DefaultHandler {
*
* @throws SAXException if a parsing error is to be reported
*/
+ @Override
public void endPrefixMapping(String prefix) throws SAXException {
// Deregister this prefix mapping
ArrayStack stack = (ArrayStack) namespaces.get(prefix);
@@ -853,6 +860,7 @@ public class XMLParser extends DefaultHandler {
*
* @throws SAXException if a parsing error is to be reported
*/
+ @Override
public void ignorableWhitespace(char buffer[], int start, int len)
throws SAXException {
; // No processing required
@@ -866,6 +874,7 @@ public class XMLParser extends DefaultHandler {
*
* @throws SAXException if a parsing error is to be reported
*/
+ @Override
public void processingInstruction(String target, String data)
throws SAXException {
; // No processing is required
@@ -876,6 +885,7 @@ public class XMLParser extends DefaultHandler {
*
* @param locator The new locator
*/
+ @Override
public void setDocumentLocator(Locator locator) {
this.locator = locator;
}
@@ -887,6 +897,7 @@ public class XMLParser extends DefaultHandler {
*
* @throws SAXException if a parsing error is to be reported
*/
+ @Override
public void skippedEntity(String name) throws SAXException {
; // No processing required
}
@@ -902,6 +913,7 @@ public class XMLParser extends DefaultHandler {
* @param publicId The public identifier (if any)
* @param systemId The system identifier (if any)
*/
+ @Override
public void notationDecl(String name, String publicId, String systemId) {
}
@@ -913,6 +925,7 @@ public class XMLParser extends DefaultHandler {
* @param systemId The system identifier (if any)
* @param notation The name of the associated notation
*/
+ @Override
public void unparsedEntityDecl(
String name,
String publicId,
@@ -932,6 +945,7 @@ public class XMLParser extends DefaultHandler {
*
* @throws SAXException if a parsing exception occurs
*/
+ @Override
public void error(SAXParseException exception) throws SAXException {
log.error(
"Parse Error at line "
@@ -956,6 +970,7 @@ public class XMLParser extends DefaultHandler {
*
* @throws SAXException if a parsing exception occurs
*/
+ @Override
public void fatalError(SAXParseException exception) throws SAXException {
log.error(
"Parse Fatal Error at line "
@@ -982,6 +997,7 @@ public class XMLParser extends DefaultHandler {
*
* @throws SAXException if a parsing exception occurs
*/
+ @Override
public void warning(SAXParseException exception) throws SAXException {
log.error(
"Parse Warning at line "
@@ -1157,6 +1173,7 @@ public class XMLParser extends DefaultHandler {
//StaticTag tag = new StaticTag( namespaceURI, localName, qName );
StaticTagScript script = new StaticTagScript(
new TagFactory() {
+ @Override
public Tag createTag(String name, Attributes attributes) {
return new StaticTag( namespaceURI, localName, qName );
}
diff --git a/core/src/main/java/org/apache/commons/jelly/servlet/JellyServlet.java b/core/src/main/java/org/apache/commons/jelly/servlet/JellyServlet.java
index 062cadd5..a5382bb2 100644
--- a/core/src/main/java/org/apache/commons/jelly/servlet/JellyServlet.java
+++ b/core/src/main/java/org/apache/commons/jelly/servlet/JellyServlet.java
@@ -50,6 +50,7 @@ public class JellyServlet extends HttpServlet {
*/
public static final String RESPONSE = "response";
+ @Override
protected void doGet(
HttpServletRequest request,
HttpServletResponse response)
@@ -58,6 +59,7 @@ public class JellyServlet extends HttpServlet {
doRequest(request, response);
}
+ @Override
protected void doPost(
HttpServletRequest request,
HttpServletResponse response)
diff --git a/core/src/main/java/org/apache/commons/jelly/servlet/JellyServletContext.java b/core/src/main/java/org/apache/commons/jelly/servlet/JellyServletContext.java
index dfc17960..101f045f 100644
--- a/core/src/main/java/org/apache/commons/jelly/servlet/JellyServletContext.java
+++ b/core/src/main/java/org/apache/commons/jelly/servlet/JellyServletContext.java
@@ -53,6 +53,7 @@ public class JellyServletContext extends JellyContext {
* @return
* @throws MalformedURLException
*/
+ @Override
public URL getResource(String s) throws MalformedURLException {
return ctx.getResource(s);
}
@@ -62,10 +63,12 @@ public class JellyServletContext extends JellyContext {
* @param s
* @return
*/
+ @Override
public InputStream getResourceAsStream(String s) {
return ctx.getResourceAsStream(s);
}
+ @Override
protected JellyContext createChildContext()
{
return new JellyServletContext(this, ctx);
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/ArgTag.java b/core/src/main/java/org/apache/commons/jelly/tags/core/ArgTag.java
index 14da6e09..12095bbd 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/ArgTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/ArgTag.java
@@ -68,6 +68,7 @@ public class ArgTag extends BaseClassLoaderTag {
// tag methods
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
invokeBody(output);
@@ -193,6 +194,7 @@ public class ArgTag extends BaseClassLoaderTag {
}
{
Converter c = new Converter() {
+ @Override
public Object convert(Class klass, Object value) {
if (value instanceof Number) {
return new Byte(((Number) value).byteValue());
@@ -208,6 +210,7 @@ public class ArgTag extends BaseClassLoaderTag {
}
{
Converter c = new Converter() {
+ @Override
public Object convert(Class klass, Object value) {
if (value instanceof Number) {
return new Short(((Number) value).shortValue());
@@ -223,6 +226,7 @@ public class ArgTag extends BaseClassLoaderTag {
}
{
Converter c = new Converter() {
+ @Override
public Object convert(Class klass, Object value) {
if (value instanceof Number) {
return new Integer(((Number) value).intValue());
@@ -238,6 +242,7 @@ public class ArgTag extends BaseClassLoaderTag {
}
{
Converter c = new Converter() {
+ @Override
public Object convert(Class klass, Object value) {
if (value instanceof Number) {
return new Long(((Number) value).longValue());
@@ -253,6 +258,7 @@ public class ArgTag extends BaseClassLoaderTag {
}
{
Converter c = new Converter() {
+ @Override
public Object convert(Class klass, Object value) {
if (value instanceof Number) {
return new Float(((Number) value).floatValue());
@@ -268,6 +274,7 @@ public class ArgTag extends BaseClassLoaderTag {
}
{
Converter c = new Converter() {
+ @Override
public Object convert(Class klass, Object value) {
if (value instanceof Number) {
return new Double(((Number) value).doubleValue());
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/BreakTag.java b/core/src/main/java/org/apache/commons/jelly/tags/core/BreakTag.java
index 5b0d3323..aa22a5cb 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/BreakTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/BreakTag.java
@@ -45,6 +45,7 @@ public class BreakTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws BreakException, JellyTagException {
boolean broken = false;
if (test == null || test.evaluateAsBoolean(context)) {
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/CaseTag.java b/core/src/main/java/org/apache/commons/jelly/tags/core/CaseTag.java
index 1d70a964..70e0201e 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/CaseTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/CaseTag.java
@@ -50,6 +50,7 @@ public class CaseTag extends TagSupport {
this.fallThru = fallThru;
}
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
if (null == this.valueExpression) {
throw new MissingAttributeException("value");
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/CatchTag.java b/core/src/main/java/org/apache/commons/jelly/tags/core/CatchTag.java
index a9a8dff0..47b035f2 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/CatchTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/CatchTag.java
@@ -50,6 +50,7 @@ public class CatchTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
/**
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/ChooseTag.java b/core/src/main/java/org/apache/commons/jelly/tags/core/ChooseTag.java
index 86dabf91..8ddba688 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/ChooseTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/ChooseTag.java
@@ -33,6 +33,7 @@ public class ChooseTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
setBlockEvaluated(false);
invokeBody(output);
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/DefaultTag.java b/core/src/main/java/org/apache/commons/jelly/tags/core/DefaultTag.java
index d37974d3..8ceba647 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/DefaultTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/DefaultTag.java
@@ -45,6 +45,7 @@ public class DefaultTag extends TagSupport {
this.fallThru = fallThru;
}
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
SwitchTag tag = (SwitchTag)findAncestorWithClass(SwitchTag.class);
if (null == tag) {
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/ExprTag.java b/core/src/main/java/org/apache/commons/jelly/tags/core/ExprTag.java
index d2f30bc4..a76562cd 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/ExprTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/ExprTag.java
@@ -37,6 +37,7 @@ public class ExprTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
if (value != null) {
String text = value.evaluateAsString(context);
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/FileTag.java b/core/src/main/java/org/apache/commons/jelly/tags/core/FileTag.java
index 743c79d6..6621b2f8 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/FileTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/FileTag.java
@@ -53,6 +53,7 @@ public class FileTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(final XMLOutput output) throws JellyTagException {
try {
if ( name != null ) {
@@ -195,6 +196,7 @@ public class FileTag extends TagSupport {
xmlWriter.setEscapeText(isEscapeText());
XMLOutput answer = new XMLOutput() {
+ @Override
public void close() throws IOException {
xmlWriter.close();
}
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/ForEachTag.java b/core/src/main/java/org/apache/commons/jelly/tags/core/ForEachTag.java
index c1acf0e6..97421ab6 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/ForEachTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/ForEachTag.java
@@ -78,6 +78,7 @@ public class ForEachTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
if (log.isDebugEnabled()) {
@@ -282,48 +283,56 @@ public class ForEachTag extends TagSupport {
/**
* @return Returns the begin.
*/
+ @Override
public Integer getBegin() {
return begin;
}
/**
* @return Returns the count.
*/
+ @Override
public int getCount() {
return count;
}
/**
* @return Returns the current.
*/
+ @Override
public Object getCurrent() {
return current;
}
/**
* @return Returns the end.
*/
+ @Override
public Integer getEnd() {
return end;
}
/**
* @return Returns the first.
*/
+ @Override
public boolean isFirst() {
return first;
}
/**
* @return Returns the index.
*/
+ @Override
public int getIndex() {
return index;
}
/**
* @return Returns the last.
*/
+ @Override
public boolean isLast() {
return last;
}
/**
* @return Returns the step.
*/
+ @Override
public Integer getStep() {
return step;
}
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/GetStaticTag.java b/core/src/main/java/org/apache/commons/jelly/tags/core/GetStaticTag.java
index f0a12dbf..4bd0be5c 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/GetStaticTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/GetStaticTag.java
@@ -90,6 +90,7 @@ public class GetStaticTag extends TagSupport {
// Tag interface
//------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
String message = null;
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/IfTag.java b/core/src/main/java/org/apache/commons/jelly/tags/core/IfTag.java
index b3bf3934..d4164d41 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/IfTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/IfTag.java
@@ -36,6 +36,7 @@ public class IfTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
if (test != null) {
if (test.evaluateAsBoolean(context)) {
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/ImportTag.java b/core/src/main/java/org/apache/commons/jelly/tags/core/ImportTag.java
index 56e80c9b..bd538a77 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/ImportTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/ImportTag.java
@@ -68,6 +68,7 @@ public class ImportTag extends TagSupport {
* @throws MissingAttributeException if a required attribute is missing
* @throws JellyTagException on any other errors
*/
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
if (uri == null && file == null) {
throw new MissingAttributeException( "uri" );
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/IncludeTag.java b/core/src/main/java/org/apache/commons/jelly/tags/core/IncludeTag.java
index 38d41367..4e6f3ee2 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/IncludeTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/IncludeTag.java
@@ -85,6 +85,7 @@ public class IncludeTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output)
throws MissingAttributeException, JellyTagException {
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/InvokeStaticTag.java b/core/src/main/java/org/apache/commons/jelly/tags/core/InvokeStaticTag.java
index b39f7eb0..b9f47b66 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/InvokeStaticTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/InvokeStaticTag.java
@@ -105,6 +105,7 @@ public class InvokeStaticTag extends TagSupport implements ArgTagParent {
* @param type The Class type of the argument
* @param value The value of the argument
*/
+ @Override
public void addArgument(Class type, Object value) {
paramTypes.add(type);
paramValues.add(value);
@@ -112,6 +113,7 @@ public class InvokeStaticTag extends TagSupport implements ArgTagParent {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
try {
if ( null == methodName) {
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/InvokeTag.java b/core/src/main/java/org/apache/commons/jelly/tags/core/InvokeTag.java
index 27ee9a52..94df8cad 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/InvokeTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/InvokeTag.java
@@ -72,6 +72,7 @@ public class InvokeTag extends TagSupport implements ArgTagParent {
this.onInstance = instance;
}
+ @Override
public void addArgument(Class type, Object value) {
paramTypes.add(type);
paramValues.add(value);
@@ -79,6 +80,7 @@ public class InvokeTag extends TagSupport implements ArgTagParent {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
if ( null == methodName) {
throw new MissingAttributeException( "method" );
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/JellyTag.java b/core/src/main/java/org/apache/commons/jelly/tags/core/JellyTag.java
index da7b148d..69fdc45f 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/JellyTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/JellyTag.java
@@ -37,6 +37,7 @@ public class JellyTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
if ( log.isDebugEnabled() ) {
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/MuteTag.java b/core/src/main/java/org/apache/commons/jelly/tags/core/MuteTag.java
index 821a3cd6..c2cdd692 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/MuteTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/MuteTag.java
@@ -42,6 +42,7 @@ public class MuteTag extends TagSupport {
* Invoke the body and produce no output.
* @param output tag output, which is ignored.
*/
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
super.invokeBody(new MuteXMLOutput());
}
@@ -58,6 +59,7 @@ public class MuteTag extends TagSupport {
/**
* Do nothing, not even invoke the toString!
*/
+ @Override
public void objectData(Object o) {
}
} // class MuteXMLOutput
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/NewTag.java b/core/src/main/java/org/apache/commons/jelly/tags/core/NewTag.java
index f807a36b..3367b349 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/NewTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/NewTag.java
@@ -53,6 +53,7 @@ public class NewTag extends BaseClassLoaderTag implements ArgTagParent {
this.className = className;
}
+ @Override
public void addArgument(Class type, Object value) {
paramTypes.add(type);
paramValues.add(value);
@@ -60,6 +61,7 @@ public class NewTag extends BaseClassLoaderTag implements ArgTagParent {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
ArgTag parentArg = null;
if ( var == null ) {
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/OtherwiseTag.java b/core/src/main/java/org/apache/commons/jelly/tags/core/OtherwiseTag.java
index 2523ed6b..f1832a29 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/OtherwiseTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/OtherwiseTag.java
@@ -31,6 +31,7 @@ public class OtherwiseTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
ChooseTag tag = (ChooseTag) findAncestorWithClass( ChooseTag.class );
if ( tag == null ) {
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/ParseTag.java b/core/src/main/java/org/apache/commons/jelly/tags/core/ParseTag.java
index edbe16ff..383a2a7f 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/ParseTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/ParseTag.java
@@ -67,6 +67,7 @@ public class ParseTag extends TagSupport {
/* (non-Javadoc)
* @see org.apache.commons.jelly.Tag#doTag(org.apache.commons.jelly.XMLOutput)
*/
+ @Override
public void doTag(XMLOutput output)
throws MissingAttributeException, JellyTagException {
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/RemoveTag.java b/core/src/main/java/org/apache/commons/jelly/tags/core/RemoveTag.java
index bf94ede8..69bd4fb7 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/RemoveTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/RemoveTag.java
@@ -36,6 +36,7 @@ public class RemoveTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
if (var != null) {
context.removeVariable( var.evaluateAsString(context) );
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/ScopeTag.java b/core/src/main/java/org/apache/commons/jelly/tags/core/ScopeTag.java
index 5bfd8030..f2c3c5bc 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/ScopeTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/ScopeTag.java
@@ -32,6 +32,7 @@ public class ScopeTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
JellyContext newContext = context.newJellyContext();
getBody().run(newContext, output);
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/SetPropertiesTag.java b/core/src/main/java/org/apache/commons/jelly/tags/core/SetPropertiesTag.java
index 2af470d3..136e026b 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/SetPropertiesTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/SetPropertiesTag.java
@@ -50,6 +50,7 @@ public class SetPropertiesTag extends MapTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
Map attributes = getAttributes();
Object bean = attributes.remove( "object" );
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/SetTag.java b/core/src/main/java/org/apache/commons/jelly/tags/core/SetTag.java
index 5771555a..8c3d17c3 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/SetTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/SetTag.java
@@ -63,6 +63,7 @@ public class SetTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
// perform validation up front to fail fast
if ( var != null ) {
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/SwitchTag.java b/core/src/main/java/org/apache/commons/jelly/tags/core/SwitchTag.java
index 58ef05fc..b5a615ad 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/SwitchTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/SwitchTag.java
@@ -51,6 +51,7 @@ public class SwitchTag extends TagSupport {
this.on = on;
}
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
this.defaultEncountered = false;
this.someCaseMatched = false;
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/ThreadTag.java b/core/src/main/java/org/apache/commons/jelly/tags/core/ThreadTag.java
index 06333828..3047b410 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/ThreadTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/ThreadTag.java
@@ -46,6 +46,7 @@ public class ThreadTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(final XMLOutput output) throws JellyTagException {
if ( xmlOutput == null ) {
// lets default to system.out
@@ -61,6 +62,7 @@ public class ThreadTag extends TagSupport {
Thread thread = new Thread(
new Runnable() {
+ @Override
public void run() {
try {
getBody().run(newContext, xmlOutput);
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/UseBeanTag.java b/core/src/main/java/org/apache/commons/jelly/tags/core/UseBeanTag.java
index 01ab3331..06414f7d 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/UseBeanTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/UseBeanTag.java
@@ -84,6 +84,7 @@ public class UseBeanTag extends MapTagSupport implements BeanSource {
/**
* @return the bean that has just been created
*/
+ @Override
public Object getBean() {
return bean;
}
@@ -91,6 +92,7 @@ public class UseBeanTag extends MapTagSupport implements BeanSource {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
Map attributes = getAttributes();
String var = (String) attributes.get( "var" );
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/UseListTag.java b/core/src/main/java/org/apache/commons/jelly/tags/core/UseListTag.java
index 9269a90f..202dc43d 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/UseListTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/UseListTag.java
@@ -49,12 +49,14 @@ public class UseListTag extends UseBeanTag implements CollectionTag {
// CollectionTag interface
//-------------------------------------------------------------------------
+ @Override
public void addItem(Object value) {
getList().add(value);
}
// DynaTag interface
//-------------------------------------------------------------------------
+ @Override
public Class getAttributeType(String name) throws JellyTagException {
if (name.equals("items")) {
return Expression.class;
@@ -66,11 +68,13 @@ public class UseListTag extends UseBeanTag implements CollectionTag {
// Implementation methods
//-------------------------------------------------------------------------
+ @Override
protected void setBeanProperties(Object bean, Map attributes) throws JellyTagException {
items = (Expression) attributes.remove("items");
super.setBeanProperties(bean, attributes);
}
+ @Override
protected void processBean(String var, Object bean) throws JellyTagException {
super.processBean(var, bean);
@@ -85,6 +89,7 @@ public class UseListTag extends UseBeanTag implements CollectionTag {
}
}
+ @Override
protected Class getDefaultClass() {
return ArrayList.class;
}
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/WhenTag.java b/core/src/main/java/org/apache/commons/jelly/tags/core/WhenTag.java
index ac7f1734..8784ba55 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/WhenTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/WhenTag.java
@@ -35,6 +35,7 @@ public class WhenTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
ChooseTag tag = (ChooseTag) findAncestorWithClass( ChooseTag.class );
if ( tag == null ) {
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/WhileTag.java b/core/src/main/java/org/apache/commons/jelly/tags/core/WhileTag.java
index a5e3cb1e..def2bc93 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/WhileTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/WhileTag.java
@@ -52,6 +52,7 @@ public class WhileTag extends TagSupport {
* @throws MissingAttributeException when the test attribute is missing
* @throws RuntimeException for anything else
*/
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
if (test != null) {
try {
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/WhitespaceTag.java b/core/src/main/java/org/apache/commons/jelly/tags/core/WhitespaceTag.java
index ebc29656..d84a7c88 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/WhitespaceTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/WhitespaceTag.java
@@ -39,6 +39,7 @@ public class WhitespaceTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
if ( log.isDebugEnabled() ) {
diff --git a/core/src/main/java/org/apache/commons/jelly/test/BaseJellyTest.java b/core/src/main/java/org/apache/commons/jelly/test/BaseJellyTest.java
index 0c22586d..38ce5c6f 100644
--- a/core/src/main/java/org/apache/commons/jelly/test/BaseJellyTest.java
+++ b/core/src/main/java/org/apache/commons/jelly/test/BaseJellyTest.java
@@ -34,6 +34,7 @@ public abstract class BaseJellyTest extends TestCase {
super(name);
}
+ @Override
public void setUp() throws Exception {
super.setUp();
jelly = new Jelly();
diff --git a/core/src/main/java/org/apache/commons/jelly/util/CommandLineParser.java b/core/src/main/java/org/apache/commons/jelly/util/CommandLineParser.java
index 6e485686..494a620c 100644
--- a/core/src/main/java/org/apache/commons/jelly/util/CommandLineParser.java
+++ b/core/src/main/java/org/apache/commons/jelly/util/CommandLineParser.java
@@ -120,7 +120,8 @@ public class CommandLineParser {
context.setVariable("args", args);
context.setVariable("commandLine", cmdLine);
if (runInSwingThread) {
- javax.swing.SwingUtilities.invokeAndWait(new Runnable() { public void run() {
+ javax.swing.SwingUtilities.invokeAndWait(new Runnable() { @Override
+ public void run() {
try {
script.run(context, output);
} catch (Exception ex) {
@@ -132,6 +133,7 @@ public class CommandLineParser {
// now lets wait for all threads to close
Runtime.getRuntime().addShutdownHook(new Thread() {
+ @Override
public void run() {
try {
output.close();
diff --git a/core/src/main/java/org/apache/commons/jelly/util/SafeContentHandler.java b/core/src/main/java/org/apache/commons/jelly/util/SafeContentHandler.java
index 7b164756..8d60b75c 100644
--- a/core/src/main/java/org/apache/commons/jelly/util/SafeContentHandler.java
+++ b/core/src/main/java/org/apache/commons/jelly/util/SafeContentHandler.java
@@ -39,6 +39,7 @@ public class SafeContentHandler implements ContentHandler {
/**
* @throws org.xml.sax.SAXException
*/
+ @Override
public void startDocument() throws SAXException {
if (! documentStarted) {
handler.startDocument();
@@ -49,6 +50,7 @@ public class SafeContentHandler implements ContentHandler {
/**
* @throws org.xml.sax.SAXException
*/
+ @Override
public void endDocument() throws SAXException {
if (! documentEnded) {
handler.endDocument();
@@ -62,6 +64,7 @@ public class SafeContentHandler implements ContentHandler {
* @param arg2
* @throws org.xml.sax.SAXException
*/
+ @Override
public void characters(char[] arg0, int arg1, int arg2)
throws SAXException {
handler.characters(arg0, arg1, arg2);
@@ -73,6 +76,7 @@ public class SafeContentHandler implements ContentHandler {
* @param arg2
* @throws org.xml.sax.SAXException
*/
+ @Override
public void endElement(String arg0, String arg1, String arg2)
throws SAXException {
handler.endElement(arg0, arg1, arg2);
@@ -82,6 +86,7 @@ public class SafeContentHandler implements ContentHandler {
* @param arg0
* @throws org.xml.sax.SAXException
*/
+ @Override
public void endPrefixMapping(String arg0) throws SAXException {
handler.endPrefixMapping(arg0);
}
@@ -92,6 +97,7 @@ public class SafeContentHandler implements ContentHandler {
* @param arg2
* @throws org.xml.sax.SAXException
*/
+ @Override
public void ignorableWhitespace(char[] arg0, int arg1, int arg2)
throws SAXException {
handler.ignorableWhitespace(arg0, arg1, arg2);
@@ -102,6 +108,7 @@ public class SafeContentHandler implements ContentHandler {
* @param arg1
* @throws org.xml.sax.SAXException
*/
+ @Override
public void processingInstruction(String arg0, String arg1)
throws SAXException {
handler.processingInstruction(arg0, arg1);
@@ -110,6 +117,7 @@ public class SafeContentHandler implements ContentHandler {
/**
* @param arg0
*/
+ @Override
public void setDocumentLocator(Locator arg0) {
handler.setDocumentLocator(arg0);
}
@@ -118,6 +126,7 @@ public class SafeContentHandler implements ContentHandler {
* @param arg0
* @throws org.xml.sax.SAXException
*/
+ @Override
public void skippedEntity(String arg0) throws SAXException {
handler.skippedEntity(arg0);
}
@@ -129,6 +138,7 @@ public class SafeContentHandler implements ContentHandler {
* @param arg3
* @throws org.xml.sax.SAXException
*/
+ @Override
public void startElement(
String arg0,
String arg1,
@@ -143,6 +153,7 @@ public class SafeContentHandler implements ContentHandler {
* @param arg1
* @throws org.xml.sax.SAXException
*/
+ @Override
public void startPrefixMapping(String arg0, String arg1)
throws SAXException {
handler.startPrefixMapping(arg0, arg1);
diff --git a/core/src/main/java/org/apache/commons/jelly/xpath/XPathComparator.java b/core/src/main/java/org/apache/commons/jelly/xpath/XPathComparator.java
index ce964b28..0c777d0c 100644
--- a/core/src/main/java/org/apache/commons/jelly/xpath/XPathComparator.java
+++ b/core/src/main/java/org/apache/commons/jelly/xpath/XPathComparator.java
@@ -60,6 +60,7 @@ public class XPathComparator implements Comparator {
this.descending = descending;
}
+ @Override
public int compare(Object o1, Object o2) {
return compare((Node)o1, (Node)o2);
}
diff --git a/core/src/test/java/org/apache/commons/jelly/TJEcho.java b/core/src/test/java/org/apache/commons/jelly/TJEcho.java
index a22c316b..20e7684b 100644
--- a/core/src/test/java/org/apache/commons/jelly/TJEcho.java
+++ b/core/src/test/java/org/apache/commons/jelly/TJEcho.java
@@ -27,7 +27,8 @@ public class TJEcho extends TagSupport {
private String attr;
private String text;
- public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
+ @Override
+ public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
text = getBodyText();
String str = "id=" + id + "; attr=" + attr + "; text=" + text + "\n";
try {
diff --git a/core/src/test/java/org/apache/commons/jelly/TJTagLibrary.java b/core/src/test/java/org/apache/commons/jelly/TJTagLibrary.java
index 9a872f71..0f4384ba 100644
--- a/core/src/test/java/org/apache/commons/jelly/TJTagLibrary.java
+++ b/core/src/test/java/org/apache/commons/jelly/TJTagLibrary.java
@@ -30,7 +30,8 @@ public class TJTagLibrary extends TagLibrary {
/* (non-Javadoc)
* @see org.apache.commons.jelly.expression.ExpressionFactory#createExpression(java.lang.String)
*/
- public Expression createExpression(String text) throws JellyException {
+ @Override
+ public Expression createExpression(String text) throws JellyException {
return new ConstantExpression("${TEST FACTORY: " + text + "}");
}
};
@@ -44,7 +45,8 @@ public class TJTagLibrary extends TagLibrary {
/* (non-Javadoc)
* @see org.apache.commons.jelly.TagLibrary#getExpressionFactory()
*/
- public ExpressionFactory getExpressionFactory() {
+ @Override
+ public ExpressionFactory getExpressionFactory() {
return TEST_FACTORY;
}
diff --git a/core/src/test/java/org/apache/commons/jelly/TJTest.java b/core/src/test/java/org/apache/commons/jelly/TJTest.java
index a709046d..c4d2b45d 100644
--- a/core/src/test/java/org/apache/commons/jelly/TJTest.java
+++ b/core/src/test/java/org/apache/commons/jelly/TJTest.java
@@ -21,7 +21,8 @@ public class TJTest extends TagSupport {
public static final String TAG_NAME = "test";
- public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
+ @Override
+ public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
invokeBody(output);
}
}
diff --git a/core/src/test/java/org/apache/commons/jelly/core/Customer.java b/core/src/test/java/org/apache/commons/jelly/core/Customer.java
index b82e47d5..b08c7ccf 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/Customer.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/Customer.java
@@ -63,6 +63,7 @@ public class Customer {
}
}
+ @Override
public String toString() {
return super.toString() + "[name=" + name + ";city=" + city + "]";
}
diff --git a/core/src/test/java/org/apache/commons/jelly/core/Order.java b/core/src/test/java/org/apache/commons/jelly/core/Order.java
index 49cc1911..f267dd18 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/Order.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/Order.java
@@ -30,6 +30,7 @@ public class Order {
public Order() {
}
+ @Override
public String toString() {
return "Order[amount=" + amount + ";price=" + price + ";product=" + product + "]";
}
diff --git a/core/src/test/java/org/apache/commons/jelly/core/Product.java b/core/src/test/java/org/apache/commons/jelly/core/Product.java
index 4ddedb6b..e8aaf46c 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/Product.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/Product.java
@@ -29,6 +29,7 @@ public class Product {
public Product() {
}
+ @Override
public String toString() {
return "Product[id=" + id + ";name=" + name + "]";
}
diff --git a/core/src/test/java/org/apache/commons/jelly/core/TestArgTag.java b/core/src/test/java/org/apache/commons/jelly/core/TestArgTag.java
index abd73c2c..9a6ba33e 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestArgTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestArgTag.java
@@ -44,6 +44,7 @@ public class TestArgTag extends BaseJellyTest {
return new TestSuite(TestArgTag.class);
}
+ @Override
public void setUp() throws Exception {
super.setUp();
parentTag = new MockArgTagParent();
@@ -53,6 +54,7 @@ public class TestArgTag extends BaseJellyTest {
argTag.setBody(new MockScript());
}
+ @Override
public void tearDown() throws Exception {
super.tearDown();
parentTag = null;
@@ -218,11 +220,13 @@ public class TestArgTag extends BaseJellyTest {
private ArgTag argTag = null;
class MockArgTagParent extends TagSupport implements ArgTagParent {
+ @Override
public void addArgument(Class type, Object value) {
typeList.add(type);
valueList.add(value);
}
+ @Override
public void doTag(XMLOutput output) {
}
@@ -239,10 +243,12 @@ public class TestArgTag extends BaseJellyTest {
}
class MockScript implements Script {
+ @Override
public Script compile() throws JellyException {
return this;
}
+ @Override
public void run(JellyContext context, XMLOutput output) throws JellyTagException {
}
}
diff --git a/core/src/test/java/org/apache/commons/jelly/core/TestIncludeTag.java b/core/src/test/java/org/apache/commons/jelly/core/TestIncludeTag.java
index 56380f7c..3aafc89a 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestIncludeTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestIncludeTag.java
@@ -136,6 +136,7 @@ public class TestIncludeTag extends TestCase {
* @param namespaceURI
* @return
*/
+ @Override
public TagLibrary getTagLibrary(String namespaceURI) {
if (namespaceURI.equals("jelly:core")) {
return super.getTagLibrary(namespaceURI);
diff --git a/core/src/test/java/org/apache/commons/jelly/core/TestInvokeStaticTag.java b/core/src/test/java/org/apache/commons/jelly/core/TestInvokeStaticTag.java
index 8acc48d1..9c36ef08 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestInvokeStaticTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestInvokeStaticTag.java
@@ -35,10 +35,12 @@ public class TestInvokeStaticTag extends BaseJellyTest {
return new TestSuite(TestInvokeStaticTag.class);
}
+ @Override
public void setUp() throws Exception {
super.setUp();
}
+ @Override
public void tearDown() throws Exception {
super.tearDown();
}
diff --git a/core/src/test/java/org/apache/commons/jelly/core/TestInvokeTag.java b/core/src/test/java/org/apache/commons/jelly/core/TestInvokeTag.java
index 39dff2a3..eee2ab8d 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestInvokeTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestInvokeTag.java
@@ -35,10 +35,12 @@ public class TestInvokeTag extends BaseJellyTest {
return new TestSuite(TestInvokeTag.class);
}
+ @Override
public void setUp() throws Exception {
super.setUp();
}
+ @Override
public void tearDown() throws Exception {
super.tearDown();
}
diff --git a/core/src/test/java/org/apache/commons/jelly/core/TestNamespacePrefixes.java b/core/src/test/java/org/apache/commons/jelly/core/TestNamespacePrefixes.java
index e744519d..ab3c0e4e 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestNamespacePrefixes.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestNamespacePrefixes.java
@@ -49,6 +49,7 @@ public class TestNamespacePrefixes extends BaseJellyTest {
return new TestSuite(TestNamespacePrefixes.class);
}
+ @Override
protected void addCustomTagLib(JellyContext context) {
context.registerTagLibrary(TJTagLibrary.NS, TJTagLibrary.class.getName());
}
diff --git a/core/src/test/java/org/apache/commons/jelly/core/TestSwitchTag.java b/core/src/test/java/org/apache/commons/jelly/core/TestSwitchTag.java
index 4b660209..9da239b9 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestSwitchTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestSwitchTag.java
@@ -36,10 +36,12 @@ public class TestSwitchTag extends BaseJellyTest {
return new TestSuite(TestSwitchTag.class);
}
+ @Override
public void setUp() throws Exception {
super.setUp();
}
+ @Override
public void tearDown() throws Exception {
super.tearDown();
}
diff --git a/core/src/test/java/org/apache/commons/jelly/core/TestUnexpectedTagCaching.java b/core/src/test/java/org/apache/commons/jelly/core/TestUnexpectedTagCaching.java
index a6d2f639..1dab74fc 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestUnexpectedTagCaching.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestUnexpectedTagCaching.java
@@ -94,6 +94,7 @@ public class TestUnexpectedTagCaching extends TestCase
m_strings.add( string );
}
+ @Override
public void doTag( final XMLOutput output ) throws MissingAttributeException, JellyTagException
{
invokeBody( output );
@@ -111,6 +112,7 @@ public class TestUnexpectedTagCaching extends TestCase
public static class SetTag extends TagSupport
{
+ @Override
public void doTag( final XMLOutput output ) throws MissingAttributeException, JellyTagException
{
( (WriteTag)getParent() ).addString( getBodyText() );
diff --git a/core/src/test/java/org/apache/commons/jelly/core/TestUnknownTags.java b/core/src/test/java/org/apache/commons/jelly/core/TestUnknownTags.java
index 1134d020..f4bd6869 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestUnknownTags.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestUnknownTags.java
@@ -41,6 +41,7 @@ public class TestUnknownTags extends BaseJellyTest {
return new TestSuite(TestUnknownTags.class);
}
+ @Override
protected void addCustomTagLib(JellyContext context) {
context.registerTagLibrary(TJTagLibrary.NS, TJTagLibrary.class.getName());
}
diff --git a/core/src/test/java/org/apache/commons/jelly/expression/TestCustomExpressionFactory.java b/core/src/test/java/org/apache/commons/jelly/expression/TestCustomExpressionFactory.java
index e25534e6..7f1605d9 100644
--- a/core/src/test/java/org/apache/commons/jelly/expression/TestCustomExpressionFactory.java
+++ b/core/src/test/java/org/apache/commons/jelly/expression/TestCustomExpressionFactory.java
@@ -35,6 +35,7 @@ public class TestCustomExpressionFactory extends BaseJellyTest {
super("TestCustomExpressionFactory");
}
+ @Override
protected void addCustomTagLib(JellyContext context) {
context.registerTagLibrary(TJTagLibrary.NS, TJTagLibrary.class.getName());
}
diff --git a/core/src/test/java/org/apache/commons/jelly/tags/junit/AssertEqualsTag.java b/core/src/test/java/org/apache/commons/jelly/tags/junit/AssertEqualsTag.java
index d251037c..9ab4fea5 100644
--- a/core/src/test/java/org/apache/commons/jelly/tags/junit/AssertEqualsTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/tags/junit/AssertEqualsTag.java
@@ -34,6 +34,7 @@ public class AssertEqualsTag extends AssertTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
String message = getBodyText();
diff --git a/core/src/test/java/org/apache/commons/jelly/tags/junit/AssertTag.java b/core/src/test/java/org/apache/commons/jelly/tags/junit/AssertTag.java
index dc8e3ad4..b2327fa6 100644
--- a/core/src/test/java/org/apache/commons/jelly/tags/junit/AssertTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/tags/junit/AssertTag.java
@@ -42,6 +42,7 @@ public class AssertTag extends AssertTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
if (test == null && xpath == null) {
throw new MissingAttributeException( "test" );
diff --git a/core/src/test/java/org/apache/commons/jelly/tags/junit/AssertThrowsTag.java b/core/src/test/java/org/apache/commons/jelly/tags/junit/AssertThrowsTag.java
index 5515c58a..56955584 100644
--- a/core/src/test/java/org/apache/commons/jelly/tags/junit/AssertThrowsTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/tags/junit/AssertThrowsTag.java
@@ -55,6 +55,7 @@ public class AssertThrowsTag extends AssertTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
Class throwableClass = null;
try {
diff --git a/core/src/test/java/org/apache/commons/jelly/tags/junit/CaseTag.java b/core/src/test/java/org/apache/commons/jelly/tags/junit/CaseTag.java
index 271d50c8..43f88632 100644
--- a/core/src/test/java/org/apache/commons/jelly/tags/junit/CaseTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/tags/junit/CaseTag.java
@@ -37,6 +37,7 @@ public class CaseTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(final XMLOutput output) throws JellyTagException {
String name = getName();
if ( name == null ) {
@@ -46,6 +47,7 @@ public class CaseTag extends TagSupport {
// #### we need to redirect the output to a TestListener
// or something?
TestCase testCase = new TestCase(name) {
+ @Override
protected void runTest() throws Throwable {
// create a new child context so that each test case
// will have its own variable scopes
diff --git a/core/src/test/java/org/apache/commons/jelly/tags/junit/FailTag.java b/core/src/test/java/org/apache/commons/jelly/tags/junit/FailTag.java
index ba2d42b6..d52d7a6c 100644
--- a/core/src/test/java/org/apache/commons/jelly/tags/junit/FailTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/tags/junit/FailTag.java
@@ -34,6 +34,7 @@ public class FailTag extends AssertTagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
String message = getMessage();
if ( message == null ) {
diff --git a/core/src/test/java/org/apache/commons/jelly/tags/junit/JUnitTagLibrary.java b/core/src/test/java/org/apache/commons/jelly/tags/junit/JUnitTagLibrary.java
index 6796287e..e29997ca 100644
--- a/core/src/test/java/org/apache/commons/jelly/tags/junit/JUnitTagLibrary.java
+++ b/core/src/test/java/org/apache/commons/jelly/tags/junit/JUnitTagLibrary.java
@@ -44,6 +44,7 @@ public class JUnitTagLibrary extends TagLibrary {
registerTag("suite", SuiteTag.class );
}
+ @Override
public Expression createExpression(
ExpressionFactory factory,
TagScript tagScript,
diff --git a/core/src/test/java/org/apache/commons/jelly/tags/junit/JellyAssertionFailedError.java b/core/src/test/java/org/apache/commons/jelly/tags/junit/JellyAssertionFailedError.java
index d1593f68..d8d32e62 100644
--- a/core/src/test/java/org/apache/commons/jelly/tags/junit/JellyAssertionFailedError.java
+++ b/core/src/test/java/org/apache/commons/jelly/tags/junit/JellyAssertionFailedError.java
@@ -66,6 +66,7 @@ public class JellyAssertionFailedError extends AssertionFailedError implements L
this.cause = cause;
}
+ @Override
public Throwable getCause() {
return cause;
}
@@ -74,6 +75,7 @@ public class JellyAssertionFailedError extends AssertionFailedError implements L
/**
* @return the line number of the tag
*/
+ @Override
public int getLineNumber() {
return lineNumber;
}
@@ -81,6 +83,7 @@ public class JellyAssertionFailedError extends AssertionFailedError implements L
/**
* Sets the line number of the tag
*/
+ @Override
public void setLineNumber(int lineNumber) {
this.lineNumber = lineNumber;
}
@@ -88,6 +91,7 @@ public class JellyAssertionFailedError extends AssertionFailedError implements L
/**
* @return the column number of the tag
*/
+ @Override
public int getColumnNumber() {
return columnNumber;
}
@@ -95,6 +99,7 @@ public class JellyAssertionFailedError extends AssertionFailedError implements L
/**
* Sets the column number of the tag
*/
+ @Override
public void setColumnNumber(int columnNumber) {
this.columnNumber = columnNumber;
}
@@ -102,6 +107,7 @@ public class JellyAssertionFailedError extends AssertionFailedError implements L
/**
* @return the Jelly file which caused the problem
*/
+ @Override
public String getFileName() {
return fileName;
}
@@ -109,6 +115,7 @@ public class JellyAssertionFailedError extends AssertionFailedError implements L
/**
* Sets the Jelly file which caused the problem
*/
+ @Override
public void setFileName(String fileName) {
this.fileName = fileName;
}
@@ -117,6 +124,7 @@ public class JellyAssertionFailedError extends AssertionFailedError implements L
/**
* @return the element name which caused the problem
*/
+ @Override
public String getElementName() {
return elementName;
}
@@ -124,11 +132,13 @@ public class JellyAssertionFailedError extends AssertionFailedError implements L
/**
* Sets the element name which caused the problem
*/
+ @Override
public void setElementName(String elementName) {
this.elementName = elementName;
}
+ @Override
public String getMessage() {
return super.getMessage() + " File: " + fileName + " At tag <" + elementName + ">: line: "
+ lineNumber + " column: " + columnNumber;
@@ -139,6 +149,7 @@ public class JellyAssertionFailedError extends AssertionFailedError implements L
}
// #### overload the printStackTrace methods...
+ @Override
public void printStackTrace(PrintWriter s) {
synchronized (s) {
super.printStackTrace(s);
@@ -149,6 +160,7 @@ public class JellyAssertionFailedError extends AssertionFailedError implements L
}
}
+ @Override
public void printStackTrace(PrintStream s) {
synchronized (s) {
super.printStackTrace(s);
@@ -159,6 +171,7 @@ public class JellyAssertionFailedError extends AssertionFailedError implements L
}
}
+ @Override
public void printStackTrace() {
super.printStackTrace();
if (cause != null) {
diff --git a/core/src/test/java/org/apache/commons/jelly/tags/junit/RunTag.java b/core/src/test/java/org/apache/commons/jelly/tags/junit/RunTag.java
index 218c3289..8e01e79d 100644
--- a/core/src/test/java/org/apache/commons/jelly/tags/junit/RunTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/tags/junit/RunTag.java
@@ -51,6 +51,7 @@ public class RunTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
Test test = getTest();
if ( test == null ) {
@@ -141,6 +142,7 @@ public class RunTag extends TagSupport {
*/
protected TestListener createTestListener(final XMLOutput output) {
return new TestListener() {
+ @Override
public void addError(Test test, Throwable t) {
try {
output.startElement("error");
@@ -160,6 +162,7 @@ public class RunTag extends TagSupport {
}
}
+ @Override
public void addFailure(Test test, AssertionFailedError t) {
try {
output.startElement("failure");
@@ -179,6 +182,7 @@ public class RunTag extends TagSupport {
}
}
+ @Override
public void endTest(Test test) {
try {
output.endElement("test");
@@ -188,6 +192,7 @@ public class RunTag extends TagSupport {
}
}
+ @Override
public void startTest(Test test) {
try {
String name = test.toString();
diff --git a/core/src/test/java/org/apache/commons/jelly/tags/junit/SuiteTag.java b/core/src/test/java/org/apache/commons/jelly/tags/junit/SuiteTag.java
index 27c3d8f1..1811e409 100644
--- a/core/src/test/java/org/apache/commons/jelly/tags/junit/SuiteTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/tags/junit/SuiteTag.java
@@ -52,6 +52,7 @@ public class SuiteTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
suite = createSuite();
diff --git a/core/src/test/java/org/apache/commons/jelly/test/impl/DummyTag.java b/core/src/test/java/org/apache/commons/jelly/test/impl/DummyTag.java
index ff40f36e..4d75a064 100644
--- a/core/src/test/java/org/apache/commons/jelly/test/impl/DummyTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/test/impl/DummyTag.java
@@ -39,6 +39,7 @@ public class DummyTag extends TagSupport {
* @see org.apache.commons.jelly.Tag#doTag(XMLOutput)
* @see org.apache.commons.jelly.tags.core.JellyTag
*/
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
if (log.isDebugEnabled())
log.debug("********Executing DummyTag Body*********");
diff --git a/core/src/test/java/org/apache/commons/jelly/test/xml/TestDefaultNamespaceFilter.java b/core/src/test/java/org/apache/commons/jelly/test/xml/TestDefaultNamespaceFilter.java
index 7ea281bf..a0029a98 100644
--- a/core/src/test/java/org/apache/commons/jelly/test/xml/TestDefaultNamespaceFilter.java
+++ b/core/src/test/java/org/apache/commons/jelly/test/xml/TestDefaultNamespaceFilter.java
@@ -46,6 +46,7 @@ public class TestDefaultNamespaceFilter extends TestCase {
return new TestSuite(TestDefaultNamespaceFilter.class);
}
+ @Override
public void setUp() throws Exception {
context = new JellyContext();
xmlOutput = XMLOutput.createXMLOutput(new StringWriter());
[commons-jelly] 02/03: Add missing @Override
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jelly.git
commit 50230f2bace8be142a263717759a7a3c82e5f9c5
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Aug 22 14:57:42 2023 -0400
Add missing @Override
---
.../java/org/apache/commons/jelly/tags/ant/AntTag.java | 5 +++++
.../org/apache/commons/jelly/tags/ant/AntTagLibrary.java | 7 +++++++
.../apache/commons/jelly/tags/ant/DefaultPropsHandler.java | 13 +++++++++++++
.../org/apache/commons/jelly/tags/ant/FileIterator.java | 3 +++
.../org/apache/commons/jelly/tags/ant/FileScannerTag.java | 3 +++
.../org/apache/commons/jelly/tags/ant/GrantProject.java | 14 ++++++++++++++
.../apache/commons/jelly/tags/ant/JellyPropsHandler.java | 3 +++
.../org/apache/commons/jelly/tags/ant/SetPropertyTag.java | 1 +
.../org/apache/commons/jelly/task/AntJellyContext.java | 7 +++++++
.../main/java/org/apache/commons/jelly/task/JellyTask.java | 1 +
.../java/org/apache/commons/jelly/ant/tag/DummyTag.java | 2 ++
.../java/org/apache/commons/jelly/ant/task/DummyTask.java | 1 +
12 files changed, 60 insertions(+)
diff --git a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTag.java b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTag.java
index 6cac55f8..3d20eab7 100644
--- a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTag.java
+++ b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTag.java
@@ -79,6 +79,7 @@ public class AntTag extends MapTagSupport implements TaskSource {
this.tagName = tagName;
}
+ @Override
public String toString() {
return "[AntTag: name=" + getTagName() + "]";
}
@@ -90,6 +91,7 @@ public class AntTag extends MapTagSupport implements TaskSource {
*
* @return The object underlying this tag.
*/
+ @Override
public Object getTaskObject() {
return this.object;
}
@@ -97,6 +99,7 @@ public class AntTag extends MapTagSupport implements TaskSource {
/**
* Allows nested tags to set a property on the task object of this tag
*/
+ @Override
public void setTaskProperty(String name, Object value) throws JellyTagException {
Object object = getTaskObject();
if ( object != null ) {
@@ -106,6 +109,7 @@ public class AntTag extends MapTagSupport implements TaskSource {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
Project project = getAntProject();
@@ -333,6 +337,7 @@ public class AntTag extends MapTagSupport implements TaskSource {
}
}
+ @Override
public void setAttribute(String name, Object value) {
if ( value == null ) {
// should we send in null?
diff --git a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTagLibrary.java b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTagLibrary.java
index d831ef20..afcfd47c 100644
--- a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTagLibrary.java
+++ b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTagLibrary.java
@@ -49,6 +49,7 @@ public class AntTagLibrary extends TagLibrary {
ConvertUtils.register(
new Converter() {
+ @Override
public Object convert(Class type, Object value) {
if ( value instanceof Reference ) {
return (Reference) value;
@@ -65,6 +66,7 @@ public class AntTagLibrary extends TagLibrary {
ConvertUtils.register(
new Converter() {
+ @Override
public Object convert(Class type, Object value) {
if ( value instanceof EnumeratedAttribute ) {
return (EnumeratedAttribute) value;
@@ -136,11 +138,13 @@ public class AntTagLibrary extends TagLibrary {
/** Creates a new script to execute the given tag name and attributes */
+ @Override
public TagScript createTagScript(String name, Attributes attributes) throws JellyException {
TagScript answer = createCustomTagScript(name, attributes);
if ( answer == null ) {
answer = new TagScript(
new TagFactory() {
+ @Override
public Tag createTag(String name, Attributes attributes) throws JellyException {
return AntTagLibrary.this.createTag(name, attributes);
}
@@ -158,6 +162,7 @@ public class AntTagLibrary extends TagLibrary {
if ( name.equals("fileScanner") ) {
return new TagScript(
new TagFactory() {
+ @Override
public Tag createTag(String name, Attributes attributes) {
return new FileScannerTag(new FileScanner());
}
@@ -167,6 +172,7 @@ public class AntTagLibrary extends TagLibrary {
if ( name.equals("setProperty") ) {
return new TagScript(
new TagFactory() {
+ @Override
public Tag createTag(String name, Attributes attributes) {
return new SetPropertyTag();
}
@@ -179,6 +185,7 @@ public class AntTagLibrary extends TagLibrary {
/**
* A helper method which creates an AntTag instance for the given element name
*/
+ @Override
public Tag createTag(String name, Attributes attributes) throws JellyException {
AntTag tag = new AntTag( name );
if ( name.equals( "echo" ) ) {
diff --git a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/DefaultPropsHandler.java b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/DefaultPropsHandler.java
index 4b3090c6..a77ab191 100644
--- a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/DefaultPropsHandler.java
+++ b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/DefaultPropsHandler.java
@@ -66,6 +66,7 @@ public class DefaultPropsHandler implements PropsHandler {
/**
* @see PropsHandler#setProperty(String, String)
*/
+ @Override
public void setProperty(String key, String value) {
this.properties.put(key, value);
}
@@ -73,6 +74,7 @@ public class DefaultPropsHandler implements PropsHandler {
/**
* @see PropsHandler#setUserProperty(String, String)
*/
+ @Override
public void setUserProperty(String key, String value) {
this.userProperties.put(key, value);
this.setProperty(key, value);
@@ -81,6 +83,7 @@ public class DefaultPropsHandler implements PropsHandler {
/**
* @see PropsHandler#setNewProperty(String, String)
*/
+ @Override
public void setNewProperty(String key, String value) {
if (this.getProperty(key) == null) {
this.setProperty(key, value);
@@ -90,6 +93,7 @@ public class DefaultPropsHandler implements PropsHandler {
/**
* @see PropsHandler#setInheritedProperty(String, String)
*/
+ @Override
public void setInheritedProperty(String key, String value) {
this.inheritedProperties.put(key, value);
this.setUserProperty(key, value);
@@ -98,6 +102,7 @@ public class DefaultPropsHandler implements PropsHandler {
/**
* @see PropsHandler#setPropertyIfUndefinedByUser(String, String)
*/
+ @Override
public void setPropertyIfUndefinedByUser(String key, String value) {
if (!this.getUserProperties().contains(key)) {
this.setProperty(key, value);
@@ -107,6 +112,7 @@ public class DefaultPropsHandler implements PropsHandler {
/**
* @see PropsHandler#getProperty(String)
*/
+ @Override
public String getProperty(String key) {
if (key == null) {
return null;
@@ -117,6 +123,7 @@ public class DefaultPropsHandler implements PropsHandler {
/**
* @see PropsHandler#getUserProperty(String)
*/
+ @Override
public String getUserProperty(String key) {
if (key == null) {
return null;
@@ -127,6 +134,7 @@ public class DefaultPropsHandler implements PropsHandler {
/**
* @see PropsHandler#getProperties()
*/
+ @Override
public Hashtable getProperties() {
return new Hashtable(this.properties);
}
@@ -134,6 +142,7 @@ public class DefaultPropsHandler implements PropsHandler {
/**
* @see PropsHandler#getUserProperties()
*/
+ @Override
public Hashtable getUserProperties() {
return new Hashtable(this.userProperties);
}
@@ -145,6 +154,7 @@ public class DefaultPropsHandler implements PropsHandler {
/**
* @see PropsHandler#copyUserProperties(Project)
*/
+ @Override
public void copyUserProperties(Project other) {
Hashtable userProps = this.getUserProperties();
Hashtable inheritedProps = this.getInheritedProperties();
@@ -163,6 +173,7 @@ public class DefaultPropsHandler implements PropsHandler {
/**
* @see PropsHandler#copyInheritedProperties(Project)
*/
+ @Override
public void copyInheritedProperties(Project other) {
Hashtable inheritedProps = this.getInheritedProperties();
@@ -180,6 +191,7 @@ public class DefaultPropsHandler implements PropsHandler {
/**
* @see PropsHandler#setSystemProperties
*/
+ @Override
public void setSystemProperties() {
Properties systemProps = System.getProperties();
Enumeration e = systemProps.keys();
@@ -193,6 +205,7 @@ public class DefaultPropsHandler implements PropsHandler {
/**
* @see PropsHandler#setJavaVersionProperty
*/
+ @Override
public void setJavaVersionProperty() {
String javaVersion = JavaEnvUtils.getJavaVersion();
this.setPropertyIfUndefinedByUser("ant.java.version", javaVersion);
diff --git a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileIterator.java b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileIterator.java
index 6fa7a351..6a47b6de 100644
--- a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileIterator.java
+++ b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileIterator.java
@@ -73,6 +73,7 @@ public class FileIterator implements Iterator {
//-------------------------------------------------------------------------
/** @return true if there is another object that matches the given predicate */
+ @Override
public boolean hasNext() {
if ( nextObjectSet ) {
return true;
@@ -83,6 +84,7 @@ public class FileIterator implements Iterator {
}
/** @return the next object which matches the given predicate */
+ @Override
public Object next() {
if ( !nextObjectSet ) {
if (!setNextObject()) {
@@ -96,6 +98,7 @@ public class FileIterator implements Iterator {
/**
* throws UnsupportedOperationException
*/
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
diff --git a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileScannerTag.java b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileScannerTag.java
index b77dab0f..95c04d77 100644
--- a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileScannerTag.java
+++ b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileScannerTag.java
@@ -44,6 +44,7 @@ public class FileScannerTag extends TagSupport implements TaskSource {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
fileScanner.setProject(AntTagLibrary.getProject(context));
@@ -62,6 +63,7 @@ public class FileScannerTag extends TagSupport implements TaskSource {
// TaskSource interface
//-------------------------------------------------------------------------
+ @Override
public Object getTaskObject() {
return fileScanner;
}
@@ -69,6 +71,7 @@ public class FileScannerTag extends TagSupport implements TaskSource {
/**
* Allows nested tags to set a property on the task object of this tag
*/
+ @Override
public void setTaskProperty(String name, Object value) throws JellyTagException {
try {
BeanUtils.setProperty( fileScanner, name, value );
diff --git a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/GrantProject.java b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/GrantProject.java
index 19ce1700..f92d8893 100644
--- a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/GrantProject.java
+++ b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/GrantProject.java
@@ -99,10 +99,12 @@ public class GrantProject extends Project {
// the PropsHandler.
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ @Override
public String replaceProperties(String value) throws BuildException {
return ProjectHelper.replaceProperties(this, value, getProperties());
}
+ @Override
public synchronized void setProperty(String key, String value) {
if (this.propsHandler == null) {
super.setProperty(key, value);
@@ -112,6 +114,7 @@ public class GrantProject extends Project {
}
}
+ @Override
public synchronized void setUserProperty(String key, String value) {
if (this.propsHandler == null) {
super.setUserProperty(key, value);
@@ -121,6 +124,7 @@ public class GrantProject extends Project {
}
}
+ @Override
public synchronized void setNewProperty(String key, String value) {
if (this.propsHandler == null) {
super.setNewProperty(key, value);
@@ -130,6 +134,7 @@ public class GrantProject extends Project {
}
}
+ @Override
public void setInheritedProperty(String key, String value) {
if (this.propsHandler == null) {
super.setInheritedProperty(key, value);
@@ -139,6 +144,7 @@ public class GrantProject extends Project {
}
}
+ @Override
public String getProperty(String key) {
if (this.propsHandler == null) {
return super.getProperty(key);
@@ -147,6 +153,7 @@ public class GrantProject extends Project {
return this.propsHandler.getProperty(key);
}
+ @Override
public String getUserProperty(String key) {
if (this.propsHandler == null) {
return super.getUserProperty(key);
@@ -155,6 +162,7 @@ public class GrantProject extends Project {
return this.propsHandler.getUserProperty(key);
}
+ @Override
public Hashtable getUserProperties() {
if (this.propsHandler == null) {
return super.getUserProperties();
@@ -163,6 +171,7 @@ public class GrantProject extends Project {
return this.propsHandler.getUserProperties();
}
+ @Override
public Hashtable getProperties() {
if (this.propsHandler == null) {
return super.getProperties();
@@ -171,6 +180,7 @@ public class GrantProject extends Project {
return this.propsHandler.getProperties();
}
+ @Override
public void copyUserProperties(Project other) {
if (this.propsHandler == null) {
super.copyUserProperties(other);
@@ -180,6 +190,7 @@ public class GrantProject extends Project {
}
}
+ @Override
public void copyInheritedProperties(Project other) {
if (this.propsHandler == null) {
super.copyInheritedProperties(other);
@@ -189,6 +200,7 @@ public class GrantProject extends Project {
}
}
+ @Override
public void setSystemProperties() {
if (this.propsHandler == null) {
super.setSystemProperties();
@@ -198,6 +210,7 @@ public class GrantProject extends Project {
}
}
+ @Override
public void setJavaVersionProperty() throws BuildException {
// Always call the super, as they do some sanity checks
super.setJavaVersionProperty();
@@ -207,6 +220,7 @@ public class GrantProject extends Project {
}
}
+ @Override
public void setBaseDir(File baseDir) throws BuildException {
super.setBaseDir(baseDir);
diff --git a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/JellyPropsHandler.java b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/JellyPropsHandler.java
index 0f21b8f4..64d1f731 100644
--- a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/JellyPropsHandler.java
+++ b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/JellyPropsHandler.java
@@ -47,6 +47,7 @@ public class JellyPropsHandler extends DefaultPropsHandler {
* @param name The property name.
* @param value The property value.
*/
+ @Override
public void setProperty(String name, String value) {
this.context.setVariable(name, value);
}
@@ -57,6 +58,7 @@ public class JellyPropsHandler extends DefaultPropsHandler {
*
* @return The property value.
*/
+ @Override
public String getProperty(String name) {
if (name == null) {
return null;
@@ -81,6 +83,7 @@ public class JellyPropsHandler extends DefaultPropsHandler {
*
* @return A <code>Hashtable</code> of all properties.
*/
+ @Override
public Hashtable getProperties() {
Hashtable h = new Hashtable();
for (Iterator i = this.context.getVariableNames(); i.hasNext(); ) {
diff --git a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/SetPropertyTag.java b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/SetPropertyTag.java
index 33007c1a..85ccdfee 100644
--- a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/SetPropertyTag.java
+++ b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/SetPropertyTag.java
@@ -46,6 +46,7 @@ public class SetPropertyTag extends TagSupport {
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException {
if (name == null) {
throw new MissingAttributeException("name");
diff --git a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/AntJellyContext.java b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/AntJellyContext.java
index 25d12d3f..6d155342 100644
--- a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/AntJellyContext.java
+++ b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/AntJellyContext.java
@@ -45,6 +45,7 @@ public class AntJellyContext extends JellyContext {
}
/** @return the value of the given variable name */
+ @Override
public Object getVariable(String name) {
// look in parent first
Object answer = super.getVariable(name);
@@ -67,6 +68,7 @@ public class AntJellyContext extends JellyContext {
}
/** Sets the value of the given variable name */
+ @Override
public void setVariable(String name, Object value) {
if ( log.isDebugEnabled() ) {
log.debug( "Setting variable: " + name + " to: " + value );
@@ -81,6 +83,7 @@ public class AntJellyContext extends JellyContext {
}
/** Removes the given variable */
+ @Override
public void removeVariable(String name) {
super.removeVariable( name );
project.setProperty(name, null);
@@ -90,6 +93,7 @@ public class AntJellyContext extends JellyContext {
* @return an Iterator over the current variable names in this
* context
*/
+ @Override
public Iterator getVariableNames() {
return getVariables().keySet().iterator();
}
@@ -97,6 +101,7 @@ public class AntJellyContext extends JellyContext {
/**
* @return the Map of variables in this scope
*/
+ @Override
public Map getVariables() {
// we should add all the Project's properties
Map map = new HashMap( project.getProperties() );
@@ -110,6 +115,7 @@ public class AntJellyContext extends JellyContext {
* Sets the Map of variables to use
*/
+ @Override
public void setVariables(Map variables) {
super.setVariables(variables);
@@ -131,6 +137,7 @@ public class AntJellyContext extends JellyContext {
/**
* Factory method to create a new child of this context
*/
+ @Override
protected JellyContext createChildContext() {
return new AntJellyContext(project, this);
}
diff --git a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/JellyTask.java b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/JellyTask.java
index caa400f1..6522c679 100644
--- a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/JellyTask.java
+++ b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/JellyTask.java
@@ -70,6 +70,7 @@ public class JellyTask extends Task {
/**
* Executes the Jelly script
*/
+ @Override
public void execute() throws BuildException {
try {
log( "Running script: " + getUrl() );
diff --git a/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/tag/DummyTag.java b/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/tag/DummyTag.java
index a18f2c6f..1a86c3df 100644
--- a/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/tag/DummyTag.java
+++ b/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/tag/DummyTag.java
@@ -51,12 +51,14 @@ public class DummyTag extends TagSupport implements BeanSource {
// BeanSource interface
//-------------------------------------------------------------------------
+ @Override
public Object getBean() {
return this;
}
// Tag interface
//-------------------------------------------------------------------------
+ @Override
public void doTag(XMLOutput output) throws JellyTagException {
if (! calledSetFlag) {
diff --git a/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/task/DummyTask.java b/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/task/DummyTask.java
index f1eeafe6..7e8594d4 100644
--- a/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/task/DummyTask.java
+++ b/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/task/DummyTask.java
@@ -76,6 +76,7 @@ public class DummyTask extends Task {
private String[] messages = { "a", "b", "c", "d", "e", "f", "g", "h", "i" };
private boolean force;
+ @Override
public void execute() throws BuildException {
if (!force) {
throw new BuildException("Should have set force to be true!");