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 <garydgreg...@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());
