You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/07/08 15:26:43 UTC
[commons-jelly] branch master updated (0714196b -> 4cb157b2)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jelly.git
from 0714196b Fix formatting
new 56ad4205 Fix formatting
new 4cb157b2 Remove unused imports
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/apache/commons/jelly/Jelly.java | 17 ++--
.../org/apache/commons/jelly/JellyContext.java | 5 +-
.../apache/commons/jelly/JellyTagException.java | 25 ++---
.../org/apache/commons/jelly/MapTagSupport.java | 1 -
.../java/org/apache/commons/jelly/TagLibrary.java | 2 -
.../java/org/apache/commons/jelly/TagSupport.java | 4 +-
.../jelly/expression/CompositeExpression.java | 2 -
.../jelly/expression/ExpressionSupport.java | 4 +-
.../jelly/expression/jexl/JexlExpression.java | 5 +-
.../expression/jexl/JexlExpressionFactory.java | 5 +-
.../jelly/expression/xpath/XPathExpression.java | 3 +-
.../commons/jelly/impl/DefaultTagFactory.java | 1 -
.../apache/commons/jelly/impl/DynamicBeanTag.java | 6 +-
.../commons/jelly/impl/DynamicDynaBeanTag.java | 6 +-
.../org/apache/commons/jelly/impl/DynamicTag.java | 2 +-
.../org/apache/commons/jelly/impl/Embedded.java | 1 -
.../commons/jelly/impl/ExpressionScript.java | 7 +-
.../org/apache/commons/jelly/impl/StaticTag.java | 9 +-
.../apache/commons/jelly/impl/StaticTagScript.java | 37 ++++----
.../org/apache/commons/jelly/impl/TagFactory.java | 1 -
.../org/apache/commons/jelly/impl/TagScript.java | 27 +++---
.../org/apache/commons/jelly/impl/TextScript.java | 11 +--
.../jelly/parser/DefaultNamespaceFilter.java | 16 ++--
.../org/apache/commons/jelly/parser/XMLParser.java | 29 +++---
.../commons/jelly/servlet/JellyServletContext.java | 7 +-
.../org/apache/commons/jelly/tags/Resources.java | 5 +-
.../org/apache/commons/jelly/tags/core/ArgTag.java | 105 +++++++++++----------
.../apache/commons/jelly/tags/core/BreakTag.java | 2 +-
.../apache/commons/jelly/tags/core/ExprTag.java | 2 +-
.../apache/commons/jelly/tags/core/FileTag.java | 2 +-
.../apache/commons/jelly/tags/core/ImportTag.java | 2 +-
.../commons/jelly/tags/core/InvokeStaticTag.java | 2 +-
.../apache/commons/jelly/tags/core/InvokeTag.java | 6 +-
.../org/apache/commons/jelly/tags/core/NewTag.java | 4 +-
.../commons/jelly/tags/core/SetPropertiesTag.java | 7 +-
.../apache/commons/jelly/tags/core/UseBeanTag.java | 4 +-
.../apache/commons/jelly/test/BaseJellyTest.java | 13 +--
.../commons/jelly/util/CommandLineParser.java | 19 ++--
.../test/java/org/apache/commons/jelly/TJEcho.java | 4 -
.../org/apache/commons/jelly/TJTagLibrary.java | 2 -
.../test/java/org/apache/commons/jelly/TJTest.java | 5 -
.../org/apache/commons/jelly/TestCoreTags.java | 10 +-
.../commons/jelly/TestDoctypeDefinitionXXE.java | 4 +-
.../java/org/apache/commons/jelly/TestJelly.java | 4 +-
.../java/org/apache/commons/jelly/TestTrim.java | 4 +-
.../org/apache/commons/jelly/TestXMLOutput.java | 2 -
.../commons/jelly/core/BaseMemoryLeakTest.java | 4 +-
.../org/apache/commons/jelly/core/TestArgTag.java | 4 +-
.../apache/commons/jelly/core/TestBreakTag.java | 4 +-
.../apache/commons/jelly/core/TestCatchTag.java | 4 +-
.../apache/commons/jelly/core/TestChooseTag.java | 4 +-
.../org/apache/commons/jelly/core/TestFileTag.java | 4 +-
.../apache/commons/jelly/core/TestForEachTag.java | 4 +-
.../commons/jelly/core/TestGetStaticTag.java | 6 +-
.../apache/commons/jelly/core/TestIncludeTag.java | 6 +-
.../commons/jelly/core/TestInvokeStaticTag.java | 4 +-
.../apache/commons/jelly/core/TestInvokeTag.java | 5 +-
.../commons/jelly/core/TestNamespacePrefixes.java | 4 +-
.../commons/jelly/core/TestNestedExceptions.java | 4 +-
.../org/apache/commons/jelly/core/TestNewTag.java | 5 +-
.../apache/commons/jelly/core/TestSwitchTag.java | 4 +-
.../jelly/core/TestUnexpectedTagCaching.java | 6 +-
.../apache/commons/jelly/core/TestUnknownTags.java | 6 +-
.../apache/commons/jelly/core/TestUseBeanTag.java | 4 +-
.../expression/TestCustomExpressionFactory.java | 11 +--
.../commons/jelly/expression/TestDynaBeans.java | 11 +--
.../commons/jelly/expression/TestExpressions.java | 8 +-
.../apache/commons/jelly/tags/junit/AssertTag.java | 3 +-
.../apache/commons/jelly/tags/junit/CaseTag.java | 6 +-
.../commons/jelly/tags/junit/JUnitTagLibrary.java | 6 +-
.../tags/junit/JellyAssertionFailedError.java | 4 +-
.../commons/jelly/tags/junit/JellyTestSuite.java | 4 +-
.../apache/commons/jelly/tags/junit/RunTag.java | 10 +-
.../apache/commons/jelly/tags/junit/SuiteTag.java | 6 +-
.../commons/jelly/test/impl/TestEmbedded.java | 10 +-
.../apache/commons/jelly/test/xml/TestCData.java | 4 +-
.../jelly/test/xml/TestDefaultNamespaceFilter.java | 6 +-
.../commons/jelly/test/xml/TestDummyXMLOutput.java | 6 +-
.../jelly/test/xml/TestNonexistentTags.java | 6 +-
.../commons/jelly/test/xml/TestXMLParserCache.java | 6 +-
.../commons/jelly/test/xml/TestXMLValidation.java | 6 +-
81 files changed, 289 insertions(+), 347 deletions(-)
[commons-jelly] 02/02: Remove unused imports
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jelly.git
commit 4cb157b2829b2a795f8b70901911fe40dee1c18d
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 8 11:26:37 2023 -0400
Remove unused imports
Sort imports
---
.../src/main/java/org/apache/commons/jelly/Jelly.java | 3 +--
.../java/org/apache/commons/jelly/JellyContext.java | 1 -
.../java/org/apache/commons/jelly/MapTagSupport.java | 1 -
.../java/org/apache/commons/jelly/TagLibrary.java | 2 --
.../commons/jelly/expression/CompositeExpression.java | 2 --
.../commons/jelly/expression/ExpressionSupport.java | 4 +---
.../commons/jelly/expression/jexl/JexlExpression.java | 5 +----
.../jelly/expression/jexl/JexlExpressionFactory.java | 3 +--
.../jelly/expression/xpath/XPathExpression.java | 3 +--
.../apache/commons/jelly/impl/DefaultTagFactory.java | 1 -
.../org/apache/commons/jelly/impl/DynamicTag.java | 2 +-
.../java/org/apache/commons/jelly/impl/Embedded.java | 1 -
.../apache/commons/jelly/impl/ExpressionScript.java | 1 -
.../java/org/apache/commons/jelly/impl/StaticTag.java | 1 -
.../apache/commons/jelly/impl/StaticTagScript.java | 8 ++++----
.../org/apache/commons/jelly/impl/TagFactory.java | 1 -
.../java/org/apache/commons/jelly/impl/TagScript.java | 7 ++-----
.../org/apache/commons/jelly/impl/TextScript.java | 1 -
.../org/apache/commons/jelly/parser/XMLParser.java | 19 ++++++++-----------
.../commons/jelly/servlet/JellyServletContext.java | 7 ++++---
.../java/org/apache/commons/jelly/tags/Resources.java | 5 +++--
.../org/apache/commons/jelly/tags/core/BreakTag.java | 2 +-
.../commons/jelly/tags/core/SetPropertiesTag.java | 3 +--
.../org/apache/commons/jelly/test/BaseJellyTest.java | 4 ++--
.../apache/commons/jelly/util/CommandLineParser.java | 4 ++--
.../test/java/org/apache/commons/jelly/TJEcho.java | 4 ----
.../java/org/apache/commons/jelly/TJTagLibrary.java | 2 --
.../test/java/org/apache/commons/jelly/TJTest.java | 5 -----
.../java/org/apache/commons/jelly/TestCoreTags.java | 10 +++++-----
.../commons/jelly/TestDoctypeDefinitionXXE.java | 4 ++--
.../test/java/org/apache/commons/jelly/TestJelly.java | 4 ++--
.../test/java/org/apache/commons/jelly/TestTrim.java | 4 ++--
.../java/org/apache/commons/jelly/TestXMLOutput.java | 2 --
.../apache/commons/jelly/core/BaseMemoryLeakTest.java | 4 ++--
.../org/apache/commons/jelly/core/TestArgTag.java | 4 ++--
.../org/apache/commons/jelly/core/TestBreakTag.java | 4 ++--
.../org/apache/commons/jelly/core/TestCatchTag.java | 4 ++--
.../org/apache/commons/jelly/core/TestChooseTag.java | 4 ++--
.../org/apache/commons/jelly/core/TestFileTag.java | 4 ++--
.../org/apache/commons/jelly/core/TestForEachTag.java | 4 ++--
.../apache/commons/jelly/core/TestGetStaticTag.java | 6 +++---
.../org/apache/commons/jelly/core/TestIncludeTag.java | 6 +++---
.../commons/jelly/core/TestInvokeStaticTag.java | 4 ++--
.../org/apache/commons/jelly/core/TestInvokeTag.java | 5 ++---
.../commons/jelly/core/TestNamespacePrefixes.java | 4 ++--
.../commons/jelly/core/TestNestedExceptions.java | 4 ++--
.../org/apache/commons/jelly/core/TestNewTag.java | 5 ++---
.../org/apache/commons/jelly/core/TestSwitchTag.java | 4 ++--
.../commons/jelly/core/TestUnexpectedTagCaching.java | 6 +++---
.../apache/commons/jelly/core/TestUnknownTags.java | 6 +++---
.../org/apache/commons/jelly/core/TestUseBeanTag.java | 4 ++--
.../jelly/expression/TestCustomExpressionFactory.java | 11 ++++-------
.../commons/jelly/expression/TestDynaBeans.java | 11 +++++------
.../commons/jelly/expression/TestExpressions.java | 8 ++------
.../apache/commons/jelly/tags/junit/AssertTag.java | 3 +--
.../org/apache/commons/jelly/tags/junit/CaseTag.java | 6 +++---
.../commons/jelly/tags/junit/JUnitTagLibrary.java | 6 ++----
.../jelly/tags/junit/JellyAssertionFailedError.java | 4 ++--
.../commons/jelly/tags/junit/JellyTestSuite.java | 4 ++--
.../org/apache/commons/jelly/tags/junit/RunTag.java | 10 +++++-----
.../org/apache/commons/jelly/tags/junit/SuiteTag.java | 6 +++---
.../apache/commons/jelly/test/impl/TestEmbedded.java | 10 +++++-----
.../org/apache/commons/jelly/test/xml/TestCData.java | 4 ++--
.../jelly/test/xml/TestDefaultNamespaceFilter.java | 6 +++---
.../commons/jelly/test/xml/TestDummyXMLOutput.java | 6 +++---
.../commons/jelly/test/xml/TestNonexistentTags.java | 6 +++---
.../commons/jelly/test/xml/TestXMLParserCache.java | 6 +++---
.../commons/jelly/test/xml/TestXMLValidation.java | 6 +++---
68 files changed, 135 insertions(+), 186 deletions(-)
diff --git a/core/src/main/java/org/apache/commons/jelly/Jelly.java b/core/src/main/java/org/apache/commons/jelly/Jelly.java
index 980e7df9..d1ebf0a3 100644
--- a/core/src/main/java/org/apache/commons/jelly/Jelly.java
+++ b/core/src/main/java/org/apache/commons/jelly/Jelly.java
@@ -18,9 +18,9 @@
package org.apache.commons.jelly;
import java.io.File;
-import java.io.InputStream;
import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Enumeration;
@@ -31,7 +31,6 @@ import org.apache.commons.jelly.util.ClassLoaderUtils;
import org.apache.commons.jelly.util.CommandLineParser;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.xml.sax.SAXException;
/**
diff --git a/core/src/main/java/org/apache/commons/jelly/JellyContext.java b/core/src/main/java/org/apache/commons/jelly/JellyContext.java
index cebde072..7acfb72c 100644
--- a/core/src/main/java/org/apache/commons/jelly/JellyContext.java
+++ b/core/src/main/java/org/apache/commons/jelly/JellyContext.java
@@ -29,7 +29,6 @@ import org.apache.commons.jelly.parser.XMLParser;
import org.apache.commons.jelly.util.ClassLoaderUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
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 6d279f7c..82de6713 100644
--- a/core/src/main/java/org/apache/commons/jelly/MapTagSupport.java
+++ b/core/src/main/java/org/apache/commons/jelly/MapTagSupport.java
@@ -18,7 +18,6 @@
package org.apache.commons.jelly;
import java.util.HashMap;
-
import java.util.Map;
/**
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 8d76a4e1..567a0f01 100644
--- a/core/src/main/java/org/apache/commons/jelly/TagLibrary.java
+++ b/core/src/main/java/org/apache/commons/jelly/TagLibrary.java
@@ -23,14 +23,12 @@ import java.util.Map;
import org.apache.commons.beanutils.ConvertUtils;
import org.apache.commons.beanutils.Converter;
-
import org.apache.commons.jelly.expression.CompositeExpression;
import org.apache.commons.jelly.expression.ConstantExpression;
import org.apache.commons.jelly.expression.Expression;
import org.apache.commons.jelly.expression.ExpressionFactory;
import org.apache.commons.jelly.impl.TagFactory;
import org.apache.commons.jelly.impl.TagScript;
-
import org.xml.sax.Attributes;
/** <p><code>Taglib</code> represents the metadata for a Jelly custom tag library.</p>
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 d59313ac..2a6ea826 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
@@ -22,10 +22,8 @@ import java.util.Iterator;
import java.util.List;
import org.apache.commons.collections.iterators.SingletonIterator;
-
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.JellyTagException;
/**
* <p><code>CompositeExpression</code> is a Composite expression made up of several
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 bfcd2876..6f98727e 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
@@ -16,8 +16,8 @@
*/
package org.apache.commons.jelly.expression;
-import java.util.Collections;
import java.util.Collection;
+import java.util.Collections;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
@@ -26,9 +26,7 @@ import java.util.Map;
import org.apache.commons.collections.iterators.ArrayIterator;
import org.apache.commons.collections.iterators.EnumerationIterator;
import org.apache.commons.collections.iterators.SingletonIterator;
-
import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.lang.StringUtils;
/** <p><code>ExpressionSupport</code>
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 5d55ad0e..cfc9a32d 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
@@ -17,17 +17,14 @@
package org.apache.commons.jelly.expression.jexl;
+import java.util.Collection;
import java.util.Map;
import java.util.Set;
-import java.util.Collection;
import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.expression.ExpressionSupport;
-
import org.apache.commons.jexl.Expression;
import org.apache.commons.jexl.JexlContext;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
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 d2d21b85..cf205186 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
@@ -19,10 +19,9 @@ package org.apache.commons.jelly.expression.jexl;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.expression.Expression;
-import org.apache.commons.jelly.expression.ExpressionSupport;
import org.apache.commons.jelly.expression.ExpressionFactory;
+import org.apache.commons.jelly.expression.ExpressionSupport;
//import org.apache.commons.jexl.resolver.FlatResolver;
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 297a74c2..0393a4a6 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
@@ -21,16 +21,15 @@ import java.util.Iterator;
import java.util.Map;
import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.expression.Expression;
import org.apache.commons.jelly.expression.ExpressionSupport;
import org.apache.commons.jelly.impl.TagScript;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jaxen.JaxenException;
import org.jaxen.SimpleNamespaceContext;
import org.jaxen.VariableContext;
import org.jaxen.XPath;
-import org.jaxen.JaxenException;
import org.jaxen.dom4j.Dom4jXPath;
/** An expression which returns an XPath object.
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 23f63cfb..a6da6ffd 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
@@ -18,7 +18,6 @@ package org.apache.commons.jelly.impl;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.Tag;
-
import org.xml.sax.Attributes;
/**
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 e1cf7252..29fe3801 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
@@ -17,8 +17,8 @@
package org.apache.commons.jelly.impl;
import java.util.HashMap;
-import java.util.Map;
import java.util.Iterator;
+import java.util.Map;
import org.apache.commons.jelly.DynaTagSupport;
import org.apache.commons.jelly.JellyContext;
diff --git a/core/src/main/java/org/apache/commons/jelly/impl/Embedded.java b/core/src/main/java/org/apache/commons/jelly/impl/Embedded.java
index 0287ee10..5521b6e0 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/Embedded.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/Embedded.java
@@ -27,7 +27,6 @@ import java.net.URL;
import org.apache.commons.jelly.Jelly;
import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TagLibrary;
import org.apache.commons.jelly.XMLOutput;
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 ddbfe878..483cbe07 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
@@ -21,7 +21,6 @@ import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.expression.Expression;
-
import org.xml.sax.SAXException;
/**
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 70028988..bc77de71 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
@@ -19,7 +19,6 @@ package org.apache.commons.jelly.impl;
import org.apache.commons.jelly.DynaTagSupport;
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.XMLOutput;
-
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
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 3b2eaa9e..56ac708d 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
@@ -16,6 +16,10 @@
*/
package org.apache.commons.jelly.impl;
+import java.net.URL;
+import java.util.Iterator;
+import java.util.Map;
+
import org.apache.commons.jelly.DynaTag;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
@@ -26,10 +30,6 @@ import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.expression.Expression;
import org.xml.sax.SAXException;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Map;
-
/**
* <p><code>StaticTagScript</code> is a script that evaluates a StaticTag, a piece of static XML
* though its attributes or element content may contain dynamic expressions.
diff --git a/core/src/main/java/org/apache/commons/jelly/impl/TagFactory.java b/core/src/main/java/org/apache/commons/jelly/impl/TagFactory.java
index 74e632aa..d3de8b92 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/TagFactory.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/TagFactory.java
@@ -18,7 +18,6 @@ package org.apache.commons.jelly.impl;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.Tag;
-
import org.xml.sax.Attributes;
/**
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 16879e9c..48132194 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
@@ -26,16 +26,15 @@ import java.util.Iterator;
import java.util.Map;
import java.util.WeakHashMap;
-import org.apache.commons.beanutils.ConvertingWrapDynaBean;
import org.apache.commons.beanutils.ConvertUtils;
+import org.apache.commons.beanutils.ConvertingWrapDynaBean;
import org.apache.commons.beanutils.DynaBean;
import org.apache.commons.beanutils.DynaProperty;
-
import org.apache.commons.jelly.CompilableTag;
+import org.apache.commons.jelly.DynaTag;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.JellyTagException;
-import org.apache.commons.jelly.DynaTag;
import org.apache.commons.jelly.LocationAware;
import org.apache.commons.jelly.NamespaceAwareTag;
import org.apache.commons.jelly.Script;
@@ -43,10 +42,8 @@ import org.apache.commons.jelly.Tag;
import org.apache.commons.jelly.TagLibrary;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.expression.Expression;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
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 2b9b67a4..389fdb9e 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
@@ -20,7 +20,6 @@ import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.XMLOutput;
-
import org.xml.sax.SAXException;
/** <p><code>TextScript</code> outputs some static text.</p>
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 02e2f746..8bf3a24b 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
@@ -17,8 +17,8 @@
package org.apache.commons.jelly.parser;
import java.io.File;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.Reader;
import java.net.URL;
import java.util.ArrayList;
@@ -32,39 +32,36 @@ import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import org.apache.commons.collections.ArrayStack;
-
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.Tag;
import org.apache.commons.jelly.TagLibrary;
+import org.apache.commons.jelly.expression.CompositeExpression;
+import org.apache.commons.jelly.expression.ConstantExpression;
+import org.apache.commons.jelly.expression.Expression;
+import org.apache.commons.jelly.expression.ExpressionFactory;
+import org.apache.commons.jelly.expression.jexl.JexlExpressionFactory;
import org.apache.commons.jelly.impl.CompositeTextScriptBlock;
import org.apache.commons.jelly.impl.ExpressionScript;
-import org.apache.commons.jelly.impl.StaticTag;
import org.apache.commons.jelly.impl.ScriptBlock;
+import org.apache.commons.jelly.impl.StaticTag;
import org.apache.commons.jelly.impl.StaticTagScript;
import org.apache.commons.jelly.impl.TagFactory;
import org.apache.commons.jelly.impl.TagScript;
import org.apache.commons.jelly.impl.TextScript;
import org.apache.commons.jelly.util.ClassLoaderUtils;
-import org.apache.commons.jelly.expression.CompositeExpression;
-import org.apache.commons.jelly.expression.ConstantExpression;
-import org.apache.commons.jelly.expression.Expression;
-import org.apache.commons.jelly.expression.ExpressionFactory;
-import org.apache.commons.jelly.expression.jexl.JexlExpressionFactory;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.xml.sax.Attributes;
import org.xml.sax.ErrorHandler;
-import org.xml.sax.helpers.DefaultHandler;
import org.xml.sax.InputSource;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
import org.xml.sax.XMLReader;
import org.xml.sax.helpers.AttributesImpl;
+import org.xml.sax.helpers.DefaultHandler;
/** <p><code>XMLParser</code> parses the XML Jelly format.
* The SAXParser and XMLReader portions of this code come from Digester.</p>
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 ca625e08..dfc17960 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
@@ -17,13 +17,14 @@
package org.apache.commons.jelly.servlet;
-import org.apache.commons.jelly.JellyContext;
-
-import javax.servlet.ServletContext;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
+import javax.servlet.ServletContext;
+
+import org.apache.commons.jelly.JellyContext;
+
/**
*
* @author <a href="mailto:kelvint@apache.org">Kelvin Tan</a>
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/Resources.java b/core/src/main/java/org/apache/commons/jelly/tags/Resources.java
index 3d468456..fbd51b60 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/Resources.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/Resources.java
@@ -17,8 +17,9 @@
package org.apache.commons.jelly.tags;
-import java.util.*;
-import java.text.*;
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
/**
* <p>Provides locale-neutral access to string resources. Only the
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 5d4877ba..5b0d3323 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
@@ -19,8 +19,8 @@ package org.apache.commons.jelly.tags.core;
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.commons.jelly.impl.BreakException;
import org.apache.commons.jelly.expression.Expression;
+import org.apache.commons.jelly.impl.BreakException;
/**
* A tag which terminates the execution of the current <forEach> or <while>
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 64488398..2af470d3 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
@@ -20,11 +20,10 @@ import java.lang.reflect.InvocationTargetException;
import java.util.Map;
import org.apache.commons.beanutils.BeanUtils;
-
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.JellyTagException;
-import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.MapTagSupport;
+import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.impl.BeanSource;
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 4c4d2ca0..0c22586d 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
@@ -19,12 +19,12 @@ package org.apache.commons.jelly.test;
import java.io.StringWriter;
import java.net.URL;
-import junit.framework.TestCase;
-
import org.apache.commons.jelly.Jelly;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.XMLOutput;
+import junit.framework.TestCase;
+
/**
* @author Rodney Waldhoff
*/
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 cd08e998..6e485686 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
@@ -20,16 +20,16 @@ package org.apache.commons.jelly.util;
import java.io.File;
import java.io.FileWriter;
import java.net.URL;
-import java.util.Arrays;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Properties;
import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.Parser;
-import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.jelly.Jelly;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
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 85122e0d..a22c316b 100644
--- a/core/src/test/java/org/apache/commons/jelly/TJEcho.java
+++ b/core/src/test/java/org/apache/commons/jelly/TJEcho.java
@@ -17,10 +17,6 @@
package org.apache.commons.jelly;
-import org.apache.commons.jelly.MissingAttributeException;
-import org.apache.commons.jelly.JellyTagException;
-import org.apache.commons.jelly.TagSupport;
-import org.apache.commons.jelly.XMLOutput;
import org.xml.sax.SAXException;
public class TJEcho extends TagSupport {
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 1a98fedf..9a872f71 100644
--- a/core/src/test/java/org/apache/commons/jelly/TJTagLibrary.java
+++ b/core/src/test/java/org/apache/commons/jelly/TJTagLibrary.java
@@ -17,8 +17,6 @@
package org.apache.commons.jelly;
-import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.TagLibrary;
import org.apache.commons.jelly.expression.ConstantExpression;
import org.apache.commons.jelly.expression.Expression;
import org.apache.commons.jelly.expression.ExpressionFactory;
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 6e767d71..a709046d 100644
--- a/core/src/test/java/org/apache/commons/jelly/TJTest.java
+++ b/core/src/test/java/org/apache/commons/jelly/TJTest.java
@@ -17,11 +17,6 @@
package org.apache.commons.jelly;
-import org.apache.commons.jelly.MissingAttributeException;
-import org.apache.commons.jelly.JellyTagException;
-import org.apache.commons.jelly.TagSupport;
-import org.apache.commons.jelly.XMLOutput;
-
public class TJTest extends TagSupport {
public static final String TAG_NAME = "test";
diff --git a/core/src/test/java/org/apache/commons/jelly/TestCoreTags.java b/core/src/test/java/org/apache/commons/jelly/TestCoreTags.java
index dcc83d0f..2906e951 100644
--- a/core/src/test/java/org/apache/commons/jelly/TestCoreTags.java
+++ b/core/src/test/java/org/apache/commons/jelly/TestCoreTags.java
@@ -20,16 +20,16 @@ import java.io.FileInputStream;
import java.io.InputStream;
import java.io.StringWriter;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
import org.apache.commons.jelly.impl.TextScript;
import org.apache.commons.jelly.parser.XMLParser;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
/** Tests the core tags
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
diff --git a/core/src/test/java/org/apache/commons/jelly/TestDoctypeDefinitionXXE.java b/core/src/test/java/org/apache/commons/jelly/TestDoctypeDefinitionXXE.java
index 4a5eb052..7f8639da 100644
--- a/core/src/test/java/org/apache/commons/jelly/TestDoctypeDefinitionXXE.java
+++ b/core/src/test/java/org/apache/commons/jelly/TestDoctypeDefinitionXXE.java
@@ -16,10 +16,10 @@
*/
package org.apache.commons.jelly;
-import junit.framework.TestCase;
-
import java.net.URL;
+import junit.framework.TestCase;
+
/**
* A test class to validate doctype definitions' declaration of external
* calls using custom xml tags. Specifically we test some changes in {@link JellyContext}
diff --git a/core/src/test/java/org/apache/commons/jelly/TestJelly.java b/core/src/test/java/org/apache/commons/jelly/TestJelly.java
index 54f0832d..f879ce47 100644
--- a/core/src/test/java/org/apache/commons/jelly/TestJelly.java
+++ b/core/src/test/java/org/apache/commons/jelly/TestJelly.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.jelly;
+import org.apache.commons.jelly.tags.junit.JellyTestSuite;
+
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.jelly.tags.junit.JellyTestSuite;
-
/**
* A helper class to run jelly test cases as part of Ant's JUnit tests
*
diff --git a/core/src/test/java/org/apache/commons/jelly/TestTrim.java b/core/src/test/java/org/apache/commons/jelly/TestTrim.java
index b8a01de6..87986cfb 100644
--- a/core/src/test/java/org/apache/commons/jelly/TestTrim.java
+++ b/core/src/test/java/org/apache/commons/jelly/TestTrim.java
@@ -17,13 +17,13 @@
package org.apache.commons.jelly;
+import org.apache.commons.jelly.impl.TextScript;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.jelly.impl.TextScript;
-
/**
* Tests the whitespace triming of scripts.
*
diff --git a/core/src/test/java/org/apache/commons/jelly/TestXMLOutput.java b/core/src/test/java/org/apache/commons/jelly/TestXMLOutput.java
index 13ff55e1..8c87aec9 100644
--- a/core/src/test/java/org/apache/commons/jelly/TestXMLOutput.java
+++ b/core/src/test/java/org/apache/commons/jelly/TestXMLOutput.java
@@ -18,8 +18,6 @@ package org.apache.commons.jelly;
import java.io.ByteArrayOutputStream;
-import org.apache.commons.jelly.Script;
-import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.test.BaseJellyTest;
/**
diff --git a/core/src/test/java/org/apache/commons/jelly/core/BaseMemoryLeakTest.java b/core/src/test/java/org/apache/commons/jelly/core/BaseMemoryLeakTest.java
index 9f628585..d38e2295 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/BaseMemoryLeakTest.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/BaseMemoryLeakTest.java
@@ -21,8 +21,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
-import junit.framework.TestCase;
-
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.Script;
@@ -33,6 +31,8 @@ import org.apache.commons.logging.LogFactory;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
+import junit.framework.TestCase;
+
/**
* Automates the basic process of testing a tag library for a memory leak.
* <p>
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 92dd4671..abd73c2c 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
@@ -19,8 +19,6 @@ package org.apache.commons.jelly.core;
import java.util.ArrayList;
import java.util.List;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.JellyTagException;
@@ -31,6 +29,8 @@ import org.apache.commons.jelly.tags.core.ArgTag;
import org.apache.commons.jelly.tags.core.ArgTagParent;
import org.apache.commons.jelly.test.BaseJellyTest;
+import junit.framework.TestSuite;
+
/**
* @author Rodney Waldhoff
*/
diff --git a/core/src/test/java/org/apache/commons/jelly/core/TestBreakTag.java b/core/src/test/java/org/apache/commons/jelly/core/TestBreakTag.java
index 57a36a0e..c9829382 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestBreakTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestBreakTag.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.jelly.core;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.test.BaseJellyTest;
+import junit.framework.TestSuite;
+
public class TestBreakTag extends BaseJellyTest
{
diff --git a/core/src/test/java/org/apache/commons/jelly/core/TestCatchTag.java b/core/src/test/java/org/apache/commons/jelly/core/TestCatchTag.java
index 9374ac3d..8bdb484c 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestCatchTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestCatchTag.java
@@ -18,11 +18,11 @@
*/
package org.apache.commons.jelly.core;
+import org.apache.commons.jelly.tags.junit.JellyTestSuite;
+
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.jelly.tags.junit.JellyTestSuite;
-
/**
* New Catch improvement test suite
* @author mde
diff --git a/core/src/test/java/org/apache/commons/jelly/core/TestChooseTag.java b/core/src/test/java/org/apache/commons/jelly/core/TestChooseTag.java
index e9125c8b..6a7d504f 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestChooseTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestChooseTag.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.jelly.core;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.test.BaseJellyTest;
+import junit.framework.TestSuite;
+
/**
* @author <a href="mailto:bwalding@apache.org">Ben Walding</a>
*/
diff --git a/core/src/test/java/org/apache/commons/jelly/core/TestFileTag.java b/core/src/test/java/org/apache/commons/jelly/core/TestFileTag.java
index 8457ffcd..7730cc5b 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestFileTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestFileTag.java
@@ -18,8 +18,6 @@ package org.apache.commons.jelly.core;
import java.io.StringWriter;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.test.BaseJellyTest;
@@ -28,6 +26,8 @@ import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
import org.xml.sax.SAXException;
+import junit.framework.TestSuite;
+
/**
* @author <a href="mailto:robert@bull-enterprises.com">Robert McIntosh</a>
*/
diff --git a/core/src/test/java/org/apache/commons/jelly/core/TestForEachTag.java b/core/src/test/java/org/apache/commons/jelly/core/TestForEachTag.java
index 1cff3dcf..587e1750 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestForEachTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestForEachTag.java
@@ -16,12 +16,12 @@
*/
package org.apache.commons.jelly.core;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.test.BaseJellyTest;
import org.apache.commons.lang.StringUtils;
+import junit.framework.TestSuite;
+
/**
* @author <a href="mailto:benanderson@benanderson.us">Ben Anderson</a>
*/
diff --git a/core/src/test/java/org/apache/commons/jelly/core/TestGetStaticTag.java b/core/src/test/java/org/apache/commons/jelly/core/TestGetStaticTag.java
index 641027b6..80212e9b 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestGetStaticTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestGetStaticTag.java
@@ -16,12 +16,12 @@
*/
package org.apache.commons.jelly.core;
-import junit.framework.TestSuite;
-
-import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.JellyTagException;
+import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.test.BaseJellyTest;
+import junit.framework.TestSuite;
+
/**
*/
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 e78d6d57..56380f7c 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
@@ -18,15 +18,15 @@ package org.apache.commons.jelly.core;
import java.net.URL;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.Jelly;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TagLibrary;
import org.apache.commons.jelly.XMLOutput;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
/**
* Makes sure that nested includes work correctly
*
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 af120331..8acc48d1 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
@@ -16,12 +16,12 @@
*/
package org.apache.commons.jelly.core;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.test.BaseJellyTest;
+import junit.framework.TestSuite;
+
/**
* @author <a href="mailto:robert@bull-enterprises.com">Robert McIntosh</a>
*/
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 6e76695a..39dff2a3 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
@@ -16,13 +16,12 @@
*/
package org.apache.commons.jelly.core;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.Script;
-import org.apache.commons.jelly.core.Customer;
import org.apache.commons.jelly.test.BaseJellyTest;
+import junit.framework.TestSuite;
+
/**
* @author Rodney Waldhoff
*/
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 e2eb3bde..e744519d 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
@@ -23,8 +23,6 @@ import java.net.URL;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TJTagLibrary;
@@ -33,6 +31,8 @@ import org.apache.commons.jelly.test.BaseJellyTest;
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
+import junit.framework.TestSuite;
+
/**
* Tests for bug JELLY-184, where enabling feature
* "http://xml.org/sax/features/namespace-prefixes" breaks Jelly.
diff --git a/core/src/test/java/org/apache/commons/jelly/core/TestNestedExceptions.java b/core/src/test/java/org/apache/commons/jelly/core/TestNestedExceptions.java
index 1b3ae2f6..20f31897 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestNestedExceptions.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestNestedExceptions.java
@@ -17,11 +17,11 @@
package org.apache.commons.jelly.core;
+import org.apache.commons.jelly.tags.junit.JellyTestSuite;
+
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.jelly.tags.junit.JellyTestSuite;
-
public class TestNestedExceptions extends JellyTestSuite {
public static void main( String[] args ) throws Exception {
diff --git a/core/src/test/java/org/apache/commons/jelly/core/TestNewTag.java b/core/src/test/java/org/apache/commons/jelly/core/TestNewTag.java
index 5773a87b..730009a1 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestNewTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestNewTag.java
@@ -18,12 +18,11 @@ package org.apache.commons.jelly.core;
import java.util.Date;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.Script;
-import org.apache.commons.jelly.core.Customer;
import org.apache.commons.jelly.test.BaseJellyTest;
+import junit.framework.TestSuite;
+
/**
* @author Rodney Waldhoff
*/
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 9c42d7dc..4b660209 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
@@ -16,13 +16,13 @@
*/
package org.apache.commons.jelly.core;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.test.BaseJellyTest;
+import junit.framework.TestSuite;
+
/**
* @author Rodney Waldhoff
*/
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 532fc38a..a6d2f639 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
@@ -18,8 +18,8 @@ package org.apache.commons.jelly.core;
import java.io.StringReader;
import java.io.StringWriter;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyTagException;
@@ -28,11 +28,11 @@ import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TagLibrary;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-
-import junit.framework.TestCase;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
+import junit.framework.TestCase;
+
/**
* This test illustrates pre-1.0 Jelly behavior that did not cache tags by default. Many user tag implementations
* will assume that they are at an initialized state when doTag() is called, rather than still being "dirty" from a
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 299f8d53..1134d020 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
@@ -16,15 +16,15 @@
*/
package org.apache.commons.jelly.core;
-import junit.framework.TestSuite;
-
+import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.Script;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.TJTagLibrary;
import org.apache.commons.jelly.test.BaseJellyTest;
import org.xml.sax.SAXParseException;
+import junit.framework.TestSuite;
+
/**
* Tests for exceptions being raised when an unknown tag is encountered - new
* code added in response to JELLY-13
diff --git a/core/src/test/java/org/apache/commons/jelly/core/TestUseBeanTag.java b/core/src/test/java/org/apache/commons/jelly/core/TestUseBeanTag.java
index 3a2e62d7..0672902e 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestUseBeanTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestUseBeanTag.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.jelly.core;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.test.BaseJellyTest;
+import junit.framework.TestSuite;
+
/**
* Tests for UseBean tag
*/
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 3898d34a..e25534e6 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
@@ -17,18 +17,15 @@
package org.apache.commons.jelly.expression;
-import java.io.File;
-import java.io.StringWriter;
-import java.net.URL;
+import org.apache.commons.jelly.JellyContext;
+import org.apache.commons.jelly.Script;
+import org.apache.commons.jelly.TJTagLibrary;
+import org.apache.commons.jelly.test.BaseJellyTest;
import junit.framework.Test;
-import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.jelly.*;
-import org.apache.commons.jelly.test.BaseJellyTest;
-
public class TestCustomExpressionFactory extends BaseJellyTest {
private static final String EXPECTED = "id=1; attr=${TEST FACTORY: 1 + 2 }; text=${TEST FACTORY: 'hello' + \" world\" }\n" +
diff --git a/core/src/test/java/org/apache/commons/jelly/expression/TestDynaBeans.java b/core/src/test/java/org/apache/commons/jelly/expression/TestDynaBeans.java
index d4a8a53a..0cf829ab 100644
--- a/core/src/test/java/org/apache/commons/jelly/expression/TestDynaBeans.java
+++ b/core/src/test/java/org/apache/commons/jelly/expression/TestDynaBeans.java
@@ -19,19 +19,18 @@ package org.apache.commons.jelly.expression;
import java.util.List;
import java.util.Map;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
import org.apache.commons.beanutils.BasicDynaClass;
import org.apache.commons.beanutils.DynaBean;
import org.apache.commons.beanutils.DynaClass;
import org.apache.commons.beanutils.DynaProperty;
-
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.expression.jexl.JexlExpressionFactory;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
/**
* Tests the use of Expression parsing
*
diff --git a/core/src/test/java/org/apache/commons/jelly/expression/TestExpressions.java b/core/src/test/java/org/apache/commons/jelly/expression/TestExpressions.java
index c97c2dd7..1457fa3f 100644
--- a/core/src/test/java/org/apache/commons/jelly/expression/TestExpressions.java
+++ b/core/src/test/java/org/apache/commons/jelly/expression/TestExpressions.java
@@ -16,16 +16,12 @@
*/
package org.apache.commons.jelly.expression;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.expression.jexl.JexlExpressionFactory;
+import junit.framework.TestCase;
+
/**
* Tests the use of Expression parsing
*
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 1cb9ccb7..dc8e3ad4 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
@@ -17,10 +17,9 @@
package org.apache.commons.jelly.tags.junit;
import org.apache.commons.jelly.JellyTagException;
-import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.MissingAttributeException;
+import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.expression.Expression;
-
import org.jaxen.JaxenException;
import org.jaxen.XPath;
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 673eeba1..271d50c8 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
@@ -16,14 +16,14 @@
*/
package org.apache.commons.jelly.tags.junit;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
/**
* Represents a single test case in a test suite; this tag is analagous to
* JUnit's TestCase class.
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 e93900a6..6796287e 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
@@ -16,14 +16,12 @@
*/
package org.apache.commons.jelly.tags.junit;
-import org.apache.commons.jelly.TagLibrary;
-
import org.apache.commons.jelly.JellyException;
+import org.apache.commons.jelly.TagLibrary;
import org.apache.commons.jelly.expression.Expression;
import org.apache.commons.jelly.expression.ExpressionFactory;
-import org.apache.commons.jelly.impl.TagScript;
import org.apache.commons.jelly.expression.xpath.XPathExpression;
-
+import org.apache.commons.jelly.impl.TagScript;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
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 6284ed00..d1593f68 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
@@ -20,10 +20,10 @@ package org.apache.commons.jelly.tags.junit;
import java.io.PrintStream;
import java.io.PrintWriter;
-import junit.framework.AssertionFailedError;
-
import org.apache.commons.jelly.LocationAware;
+import junit.framework.AssertionFailedError;
+
/**
* <p><code>JellyAssertionFailedError</code> is
* a JUnit AssertionFailedError which is LocationAware so that it can include
diff --git a/core/src/test/java/org/apache/commons/jelly/tags/junit/JellyTestSuite.java b/core/src/test/java/org/apache/commons/jelly/tags/junit/JellyTestSuite.java
index 94bddd4f..e9eacc76 100644
--- a/core/src/test/java/org/apache/commons/jelly/tags/junit/JellyTestSuite.java
+++ b/core/src/test/java/org/apache/commons/jelly/tags/junit/JellyTestSuite.java
@@ -18,13 +18,13 @@ package org.apache.commons.jelly.tags.junit;
import java.net.URL;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import junit.framework.TestSuite;
+
/**
* An abstract base class for creating a TestSuite via a Jelly script.
*
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 d48601ae..218c3289 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
@@ -19,11 +19,6 @@ package org.apache.commons.jelly.tags.junit;
import java.io.PrintWriter;
import java.io.StringWriter;
-import junit.framework.AssertionFailedError;
-import junit.framework.Test;
-import junit.framework.TestListener;
-import junit.framework.TestResult;
-
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.TagSupport;
@@ -33,6 +28,11 @@ import org.apache.commons.logging.LogFactory;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
+import junit.framework.AssertionFailedError;
+import junit.framework.Test;
+import junit.framework.TestListener;
+import junit.framework.TestResult;
+
/**
* This tag will run the given Test which could be an individual TestCase or a TestSuite.
* The TestResult can be specified to capture the output, otherwise the results are output
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 0b107bf4..27c3d8f1 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
@@ -16,13 +16,13 @@
*/
package org.apache.commons.jelly.tags.junit;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
/**
* Represents a collection of TestCases.. This tag is analagous to
* JUnit's TestSuite class.
diff --git a/core/src/test/java/org/apache/commons/jelly/test/impl/TestEmbedded.java b/core/src/test/java/org/apache/commons/jelly/test/impl/TestEmbedded.java
index f7b11674..5966c58c 100644
--- a/core/src/test/java/org/apache/commons/jelly/test/impl/TestEmbedded.java
+++ b/core/src/test/java/org/apache/commons/jelly/test/impl/TestEmbedded.java
@@ -20,16 +20,16 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.StringReader;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.impl.Embedded;
import org.xml.sax.InputSource;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
/**
* Unit case of Embedded
*
diff --git a/core/src/test/java/org/apache/commons/jelly/test/xml/TestCData.java b/core/src/test/java/org/apache/commons/jelly/test/xml/TestCData.java
index ccc8a291..c4a6cc49 100644
--- a/core/src/test/java/org/apache/commons/jelly/test/xml/TestCData.java
+++ b/core/src/test/java/org/apache/commons/jelly/test/xml/TestCData.java
@@ -18,8 +18,6 @@ package org.apache.commons.jelly.test.xml;
import java.io.StringWriter;
-import junit.framework.TestCase;
-
import org.apache.commons.jelly.Jelly;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.Script;
@@ -28,6 +26,8 @@ import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
import org.xml.sax.SAXException;
+import junit.framework.TestCase;
+
/**
* @author mdelagrange
*/
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 f8b6b07a..7ea281bf 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
@@ -19,14 +19,14 @@ package org.apache.commons.jelly.test.xml;
import java.io.StringWriter;
import java.net.URL;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.Jelly;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.XMLOutput;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
/**
* A helper class to run jelly test cases as part of Ant's JUnit tests
*
diff --git a/core/src/test/java/org/apache/commons/jelly/test/xml/TestDummyXMLOutput.java b/core/src/test/java/org/apache/commons/jelly/test/xml/TestDummyXMLOutput.java
index 1ca82aa5..9b59f09d 100644
--- a/core/src/test/java/org/apache/commons/jelly/test/xml/TestDummyXMLOutput.java
+++ b/core/src/test/java/org/apache/commons/jelly/test/xml/TestDummyXMLOutput.java
@@ -18,14 +18,14 @@ package org.apache.commons.jelly.test.xml;
import java.net.URL;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.Jelly;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.XMLOutput;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
/**
* Confirm that <i>XMLOutput.createDummyXMLOutput()</i>
* doesn't do anything funky.
diff --git a/core/src/test/java/org/apache/commons/jelly/test/xml/TestNonexistentTags.java b/core/src/test/java/org/apache/commons/jelly/test/xml/TestNonexistentTags.java
index 148fa62d..460542d8 100644
--- a/core/src/test/java/org/apache/commons/jelly/test/xml/TestNonexistentTags.java
+++ b/core/src/test/java/org/apache/commons/jelly/test/xml/TestNonexistentTags.java
@@ -19,14 +19,14 @@ package org.apache.commons.jelly.test.xml;
import java.net.URL;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.Jelly;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.XMLOutput;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
/**
* A test to confirm that Jelly scripts fail to parse if they declare tags
* that do not exist
diff --git a/core/src/test/java/org/apache/commons/jelly/test/xml/TestXMLParserCache.java b/core/src/test/java/org/apache/commons/jelly/test/xml/TestXMLParserCache.java
index 5ddc08da..36710c69 100644
--- a/core/src/test/java/org/apache/commons/jelly/test/xml/TestXMLParserCache.java
+++ b/core/src/test/java/org/apache/commons/jelly/test/xml/TestXMLParserCache.java
@@ -19,15 +19,15 @@ package org.apache.commons.jelly.test.xml;
import java.io.StringWriter;
import java.net.URL;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.Jelly;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.XMLOutput;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
/**
* A test to confirm that invalid documents are
* reject iff jelly.setValidateXML(true)
diff --git a/core/src/test/java/org/apache/commons/jelly/test/xml/TestXMLValidation.java b/core/src/test/java/org/apache/commons/jelly/test/xml/TestXMLValidation.java
index 8a8acc3f..2b94c0dc 100644
--- a/core/src/test/java/org/apache/commons/jelly/test/xml/TestXMLValidation.java
+++ b/core/src/test/java/org/apache/commons/jelly/test/xml/TestXMLValidation.java
@@ -19,15 +19,15 @@ package org.apache.commons.jelly.test.xml;
import java.io.StringWriter;
import java.net.URL;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.Jelly;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.XMLOutput;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
/**
* A test to confirm that invalid documents are
* reject iff jelly.setValidateXML(true)
[commons-jelly] 01/02: Fix formatting
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jelly.git
commit 56ad420531814d3e7eae0a4d1edda41cb2605dbc
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 8 11:00:42 2023 -0400
Fix formatting
---
.../main/java/org/apache/commons/jelly/Jelly.java | 14 +--
.../org/apache/commons/jelly/JellyContext.java | 4 +-
.../apache/commons/jelly/JellyTagException.java | 25 ++---
.../java/org/apache/commons/jelly/TagSupport.java | 4 +-
.../expression/jexl/JexlExpressionFactory.java | 2 +-
.../apache/commons/jelly/impl/DynamicBeanTag.java | 6 +-
.../commons/jelly/impl/DynamicDynaBeanTag.java | 6 +-
.../commons/jelly/impl/ExpressionScript.java | 6 +-
.../org/apache/commons/jelly/impl/StaticTag.java | 8 +-
.../apache/commons/jelly/impl/StaticTagScript.java | 29 +++---
.../org/apache/commons/jelly/impl/TagScript.java | 20 ++--
.../org/apache/commons/jelly/impl/TextScript.java | 10 +-
.../jelly/parser/DefaultNamespaceFilter.java | 16 ++--
.../org/apache/commons/jelly/parser/XMLParser.java | 10 +-
.../org/apache/commons/jelly/tags/core/ArgTag.java | 105 +++++++++++----------
.../apache/commons/jelly/tags/core/ExprTag.java | 2 +-
.../apache/commons/jelly/tags/core/FileTag.java | 2 +-
.../apache/commons/jelly/tags/core/ImportTag.java | 2 +-
.../commons/jelly/tags/core/InvokeStaticTag.java | 2 +-
.../apache/commons/jelly/tags/core/InvokeTag.java | 6 +-
.../org/apache/commons/jelly/tags/core/NewTag.java | 4 +-
.../commons/jelly/tags/core/SetPropertiesTag.java | 4 +-
.../apache/commons/jelly/tags/core/UseBeanTag.java | 4 +-
.../apache/commons/jelly/test/BaseJellyTest.java | 9 +-
.../commons/jelly/util/CommandLineParser.java | 15 ++-
25 files changed, 154 insertions(+), 161 deletions(-)
diff --git a/core/src/main/java/org/apache/commons/jelly/Jelly.java b/core/src/main/java/org/apache/commons/jelly/Jelly.java
index 4ad4859b..980e7df9 100644
--- a/core/src/main/java/org/apache/commons/jelly/Jelly.java
+++ b/core/src/main/java/org/apache/commons/jelly/Jelly.java
@@ -137,18 +137,18 @@ public class Jelly {
* Compiles the script
*/
public Script compileScript() throws JellyException {
- if (! loadedProperties) {
+ if (!loadedProperties) {
loadedProperties = true;
loadJellyProperties();
}
-
+
XMLParser parser = new XMLParser();
try {
parser.setContext(getJellyContext());
} catch (MalformedURLException e) {
throw new JellyException(e.toString());
}
-
+
Script script = null;
try {
parser.setDefaultNamespaceURI(this.defaultNamespaceURI);
@@ -156,14 +156,14 @@ public class Jelly {
script = parser.parse(getUrl());
script = script.compile();
if (log.isDebugEnabled()) {
- log.debug("Compiled script: " + getUrl());
+ log.debug("Compiled script: " + getUrl());
}
} catch (IOException e) {
- throw new JellyException("could not parse Jelly script",e);
+ throw new JellyException("could not parse Jelly script", e);
} catch (SAXException e) {
- throw new JellyException("could not parse Jelly script",e);
+ throw new JellyException("could not parse Jelly script", e);
}
-
+
return script;
}
diff --git a/core/src/main/java/org/apache/commons/jelly/JellyContext.java b/core/src/main/java/org/apache/commons/jelly/JellyContext.java
index 62988094..cebde072 100644
--- a/core/src/main/java/org/apache/commons/jelly/JellyContext.java
+++ b/core/src/main/java/org/apache/commons/jelly/JellyContext.java
@@ -184,9 +184,9 @@ public class JellyContext {
* making the System Properties available as <code>systemScope</code>
*/
private void init() {
- variables.put("context",this);
+ variables.put("context", this);
try {
- variables.put("systemScope", System.getProperties() );
+ variables.put("systemScope", System.getProperties());
} catch (SecurityException e) {
log.debug("security exception accessing system properties", e);
}
diff --git a/core/src/main/java/org/apache/commons/jelly/JellyTagException.java b/core/src/main/java/org/apache/commons/jelly/JellyTagException.java
index e3398b7b..44508798 100644
--- a/core/src/main/java/org/apache/commons/jelly/JellyTagException.java
+++ b/core/src/main/java/org/apache/commons/jelly/JellyTagException.java
@@ -17,15 +17,16 @@
package org.apache.commons.jelly;
-/**
- * <p>A <code>JellyTagException</code> is an exception generated by a Tag
- * implementation.</p>
+/**
+ * <p>
+ * A <code>JellyTagException</code> is an exception generated by a Tag implementation.
+ * </p>
*
* @author <a href="mailto:morgand@apache.org">Morgan Delagrange</a>
*/
public class JellyTagException extends JellyException {
-
+
public JellyTagException() {
}
@@ -34,23 +35,23 @@ public class JellyTagException extends JellyException {
}
public JellyTagException(String message, Throwable cause) {
- super(message,cause);
+ super(message, cause);
}
-
+
public JellyTagException(Throwable cause) {
super(cause);
}
-
+
public JellyTagException(Throwable cause, String fileName, String elementName, int columnNumber, int lineNumber) {
super(cause, fileName, elementName, columnNumber, lineNumber);
}
-
+
public JellyTagException(String reason, Throwable cause, String fileName, String elementName, int columnNumber, int lineNumber) {
- super(reason,cause,fileName,elementName,columnNumber,lineNumber);
+ super(reason, cause, fileName, elementName, columnNumber, lineNumber);
}
-
+
public JellyTagException(String reason, String fileName, String elementName, int columnNumber, int lineNumber) {
- super(reason,fileName,elementName,columnNumber,lineNumber);
+ super(reason, fileName, elementName, columnNumber, lineNumber);
}
-
+
}
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 f682997f..0668c267 100644
--- a/core/src/main/java/org/apache/commons/jelly/TagSupport.java
+++ b/core/src/main/java/org/apache/commons/jelly/TagSupport.java
@@ -221,7 +221,7 @@ public abstract class TagSupport implements Tag {
* @see #findAncestorWithClass(Collection)
*/
protected Tag findAncestorWithClass(Class[] parentClasses) {
- return findAncestorWithClass(getParent(),parentClasses);
+ return findAncestorWithClass(getParent(), parentClasses);
}
/**
@@ -229,7 +229,7 @@ public abstract class TagSupport implements Tag {
* @return the tag of the given type or null if it could not be found
*/
protected Tag findAncestorWithClass(Collection parentClasses) {
- return findAncestorWithClass(getParent(),parentClasses);
+ return findAncestorWithClass(getParent(), parentClasses);
}
/**
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 b4795201..d2d21b85 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
@@ -66,7 +66,7 @@ public class JexlExpressionFactory implements ExpressionFactory {
}
if ( isSupportAntVariables() && isValidAntVariableName(text) ) {
- return new ExpressionSupportLocal(jexlExpression,text);
+ return new ExpressionSupportLocal(jexlExpression, text);
}
return jexlExpression;
}
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 c5578504..0b7f1ac1 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
@@ -95,11 +95,11 @@ public class DynamicBeanTag extends DynaBeanTagSupport implements BeanSource {
// create a new dynabean before the attributes are set
try {
bean = beanClass.newInstance();
- setDynaBean( new ConvertingWrapDynaBean( bean ) );
+ setDynaBean(new ConvertingWrapDynaBean(bean));
} catch (InstantiationException e) {
- throw new JellyTagException("Could not instantiate dynabean",e);
+ throw new JellyTagException("Could not instantiate dynabean", e);
} catch (IllegalAccessException e) {
- throw new JellyTagException("Could not instantiate dynabean",e);
+ throw new JellyTagException("Could not instantiate dynabean", e);
}
setAttributesSet.clear();
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 dc884bf5..ea6965c9 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
@@ -65,11 +65,11 @@ public class DynamicDynaBeanTag extends DynaBeanTagSupport implements BeanSource
public void beforeSetAttributes() throws JellyTagException {
// create a new dynabean before the attributes are set
try {
- setDynaBean( beanClass.newInstance() );
+ setDynaBean(beanClass.newInstance());
} catch (IllegalAccessException e) {
- throw new JellyTagException("Could not instantiate dynabean",e);
+ throw new JellyTagException("Could not instantiate dynabean", e);
} catch (InstantiationException e) {
- throw new JellyTagException("Could not instantiate dynabean",e);
+ throw new JellyTagException("Could not instantiate dynabean", e);
}
setAttributesSet.clear();
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 89789166..ddbfe878 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
@@ -64,12 +64,12 @@ public class ExpressionScript implements Script {
/** Evaluates the body of a tag */
public void run(JellyContext context, XMLOutput output) throws JellyTagException {
Object result = expression.evaluate(context);
- if ( result != null ) {
+ if (result != null) {
try {
- output.objectData(result);
+ output.objectData(result);
} catch (SAXException e) {
- throw new JellyTagException("Could not write to XMLOutput",e);
+ throw new JellyTagException("Could not write to XMLOutput", e);
}
}
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 8d69cefd..70028988 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
@@ -72,12 +72,12 @@ public class StaticTag extends DynaTagSupport {
}
public void setAttribute(String name, String prefix, String nsURI, Object value) {
- if(value==null)
+ if (value == null)
return;
- if(prefix!=null && prefix.length()>0)
- attributes.addAttribute(nsURI,name,prefix+":"+name,"CDATA",value.toString());
+ if (prefix != null && prefix.length() > 0)
+ attributes.addAttribute(nsURI, name, prefix + ":" + name, "CDATA", value.toString());
else
- attributes.addAttribute("",name,name,"CDATA",value.toString());
+ attributes.addAttribute("", name, name, "CDATA", value.toString());
}
// DynaTag interface
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 4bd8456e..3b2eaa9e 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
@@ -54,7 +54,7 @@ public class StaticTagScript extends TagScript {
try {
startNamespacePrefixes(output);
} catch (SAXException e) {
- throw new JellyTagException("could not start namespace prefixes",e);
+ throw new JellyTagException("could not start namespace prefixes", e);
}
Tag tag;
@@ -66,7 +66,7 @@ public class StaticTagScript extends TagScript {
tag = findDynamicTag(context, (StaticTag) tag);
}
- setTag(tag,context);
+ setTag(tag, context);
} catch (JellyException e) {
throw new JellyTagException(e);
}
@@ -74,7 +74,7 @@ public class StaticTagScript extends TagScript {
URL rootURL = context.getRootURL();
URL currentURL = context.getCurrentURL();
try {
- if ( tag == null ) {
+ if (tag == null) {
return;
}
tag.setContext(context);
@@ -86,35 +86,30 @@ public class StaticTagScript extends TagScript {
for (Iterator iter = attributes.entrySet().iterator(); iter.hasNext();) {
Map.Entry entry = (Map.Entry) iter.next();
String name = (String) entry.getKey();
- if(name.indexOf(':')!=-1)
- name = name.substring(name.indexOf(':')+1);
+ if (name.indexOf(':') != -1)
+ name = name.substring(name.indexOf(':') + 1);
ExpressionAttribute expat = (ExpressionAttribute) entry.getValue();
Expression expression = expat.exp;
Object value;
- if ( Expression.class.isAssignableFrom( dynaTag.getAttributeType(name) ) ) {
+ if (Expression.class.isAssignableFrom(dynaTag.getAttributeType(name))) {
value = expression;
} else {
value = expression.evaluate(context);
}
- if( expat.prefix != null && expat.prefix.length() > 0 && tag instanceof StaticTag )
- {
- ((StaticTag) dynaTag).setAttribute(name,expat.prefix, expat.nsURI,value);
- }
- else
- {
+ if (expat.prefix != null && expat.prefix.length() > 0 && tag instanceof StaticTag) {
+ ((StaticTag) dynaTag).setAttribute(name, expat.prefix, expat.nsURI, value);
+ } else {
dynaTag.setAttribute(name, value);
}
}
tag.doTag(output);
- }
- catch (JellyTagException e) {
+ } catch (JellyTagException e) {
handleException(e);
- }
- catch (RuntimeException e) {
+ } catch (RuntimeException e) {
handleException(e);
} finally {
context.setCurrentURL(currentURL);
@@ -124,7 +119,7 @@ public class StaticTagScript extends TagScript {
try {
endNamespacePrefixes(output);
} catch (SAXException e) {
- throw new JellyTagException("could not end namespace prefixes",e);
+ throw new JellyTagException("could not end namespace prefixes", e);
}
}
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 85edce1c..16879e9c 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
@@ -174,7 +174,7 @@ public class TagScript implements Script {
if (log.isDebugEnabled()) {
log.debug("adding attribute name: " + name + " expression: " + expression);
}
- attributes.put(name, new ExpressionAttribute(name,expression));
+ attributes.put(name, new ExpressionAttribute(name, expression));
}
/** Add an initialization attribute for the tag.
@@ -184,9 +184,9 @@ public class TagScript implements Script {
if (log.isDebugEnabled()) {
log.debug("adding attribute name: " + name + " expression: " + expression);
}
- if(name.indexOf(':')==-1)
+ if (name.indexOf(':') == -1)
name = prefix + ':' + name;
- attributes.put(name, new ExpressionAttribute(name,prefix,nsURI,expression));
+ attributes.put(name, new ExpressionAttribute(name, prefix, nsURI, expression));
}
/**
@@ -313,11 +313,11 @@ public class TagScript implements Script {
public Tag getTag(JellyContext context) throws JellyException {
Thread t = Thread.currentThread();
Tag tag = (Tag) threadLocalTagCache.get(t);
- if ( tag == null ) {
+ if (tag == null) {
tag = createTag();
- if ( tag != null ) {
- threadLocalTagCache.put(t,tag);
- configureTag(tag,context);
+ if (tag != null) {
+ threadLocalTagCache.put(t, tag);
+ configureTag(tag, context);
}
}
return tag;
@@ -554,7 +554,7 @@ public class TagScript implements Script {
*/
protected void clearTag() {
Thread t = Thread.currentThread();
- threadLocalTagCache.put(t,null);
+ threadLocalTagCache.put(t, null);
}
/**
@@ -563,7 +563,7 @@ public class TagScript implements Script {
*/
protected void setTag(Tag tag, JellyContext context) {
Thread t = Thread.currentThread();
- threadLocalTagCache.put(t,tag);
+ threadLocalTagCache.put(t, tag);
}
/**
@@ -735,7 +735,7 @@ public class TagScript implements Script {
class ExpressionAttribute {
public ExpressionAttribute(String name, Expression exp) {
- this(name,"","",exp);
+ this(name, "", "", exp);
}
public ExpressionAttribute(String name, String prefix, String nsURI, Expression exp) {
this.name = name;
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 ecdcf6e6..2b9b67a4 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
@@ -78,8 +78,8 @@ public class TextScript implements Script {
}
}
index++;
- if ( index < text.length() ) {
- this.text = text.substring(0,index);
+ if (index < text.length()) {
+ this.text = text.substring(0, index);
}
}
@@ -101,11 +101,11 @@ public class TextScript implements Script {
/** Evaluates the body of a tag */
public void run(JellyContext context, XMLOutput output) throws JellyTagException {
- if ( text != null ) {
+ if (text != null) {
try {
- output.write(text);
+ output.write(text);
} catch (SAXException e) {
- throw new JellyTagException("could not write to XMLOutput",e);
+ throw new JellyTagException("could not write to XMLOutput", e);
}
}
}
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 57867ecf..ecbad1b2 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
@@ -56,9 +56,9 @@ public class DefaultNamespaceFilter extends XMLFilterImpl {
throws SAXException {
if (uri.equals("")) {
- super.startPrefixMapping(prefix,this.uriDefault);
+ super.startPrefixMapping(prefix, this.uriDefault);
} else {
- super.startPrefixMapping(prefix,uri);
+ super.startPrefixMapping(prefix, uri);
}
}
@@ -75,12 +75,12 @@ public class DefaultNamespaceFilter extends XMLFilterImpl {
java.lang.String localName,
java.lang.String qName,
Attributes atts)
- throws SAXException {
+ throws SAXException {
if (uri.equals("")) {
- super.startElement(this.uriDefault,localName,qName,atts);
+ super.startElement(this.uriDefault, localName, qName, atts);
} else {
- super.startElement(uri,localName,qName,atts);
+ super.startElement(uri, localName, qName, atts);
}
}
@@ -95,11 +95,11 @@ public class DefaultNamespaceFilter extends XMLFilterImpl {
* @throws SAXException
*/
public void endElement(String namespaceURI, String localName, String qName)
- throws SAXException {
+ throws SAXException {
if (namespaceURI.equals("")) {
- super.endElement(this.uriDefault,localName,qName);
+ super.endElement(this.uriDefault, localName, qName);
} else {
- super.endElement(namespaceURI,localName,qName);
+ super.endElement(namespaceURI, localName, qName);
}
}
}
\ No newline at end of file
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 7625344b..02e2f746 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
@@ -569,7 +569,7 @@ public class XMLParser extends DefaultHandler {
reader.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
}
if (this.defaultNamespaceURI != null) {
- reader = new DefaultNamespaceFilter(this.defaultNamespaceURI,reader);
+ reader = new DefaultNamespaceFilter(this.defaultNamespaceURI, reader);
}
}
//set up the parse
@@ -1090,13 +1090,13 @@ public class XMLParser extends DefaultHandler {
throw createSAXException("Could not load class: " + uri + " so taglib instantiation failed", e);
}
catch (IllegalAccessException e) {
- throw createSAXException("Constructor for class is not accessible: " + uri + " so taglib instantiation failed",e);
+ throw createSAXException("Constructor for class is not accessible: " + uri + " so taglib instantiation failed", e);
}
catch (InstantiationException e) {
- throw createSAXException("Class could not be instantiated: " + uri + " so taglib instantiation failed",e);
+ throw createSAXException("Class could not be instantiated: " + uri + " so taglib instantiation failed", e);
}
catch (ClassCastException e) {
- throw createSAXException("Class is not a TagLibrary: " + uri + " so taglib instantiation failed",e);
+ throw createSAXException("Class is not a TagLibrary: " + uri + " so taglib instantiation failed", e);
}
}
}
@@ -1178,7 +1178,7 @@ public class XMLParser extends DefaultHandler {
String attrQName = list.getQName(i);
int p = attrQName.indexOf(':');
String prefix = p>=0 ?
- attrQName.substring(0,p):
+ attrQName.substring(0, p):
"";
script.addAttribute(list.getLocalName(i),
prefix, list.getURI(i), expression);
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 1326a0bd..6b83813a 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
@@ -110,28 +110,25 @@ public class ArgTag extends BaseClassLoaderTag {
klass = value.getClass();
}
- if(!isInstanceOf(klass,value)) {
- if (klass.equals(Class.class))
- {
+ if (!isInstanceOf(klass, value)) {
+ if (klass.equals(Class.class)) {
try {
- //value = getClassLoader().loadClass((String) value);
+ // value = getClassLoader().loadClass((String) value);
// JELLY-274: rather use three-args class.forName
value = Class.forName((String) value, false, getClassLoader());
} catch (ClassNotFoundException e) {
throw new JellyTagException(e);
}
- }
- else
- {
- value = convert(klass,value);
+ } else {
+ value = convert(klass, value);
}
}
ArgTagParent parent = (ArgTagParent)findAncestorWithClass(ArgTagParent.class);
- if(null == parent) {
- throw new JellyTagException("This tag must be enclosed inside an ArgTagParent implementation (for example, <new> or <invoke>)" );
+ if (null == parent) {
+ throw new JellyTagException("This tag must be enclosed inside an ArgTagParent implementation (for example, <new> or <invoke>)");
} else {
- parent.addArgument(klass,value);
+ parent.addArgument(klass, value);
}
}
@@ -161,17 +158,17 @@ public class ArgTag extends BaseClassLoaderTag {
//-------------------------------------------------------------------------
private static Object convert(Class klass, Object value) throws JellyTagException {
- if(null == value) {
+ if (null == value) {
return null;
- } else if(!klass.isInstance(value)) {
- Converter converter = (Converter)(converterMap.get(klass));
- if(null == converter) {
+ } else if (!klass.isInstance(value)) {
+ Converter converter = (Converter) (converterMap.get(klass));
+ if (null == converter) {
throw new JellyTagException("Can't convert " + value + " to " + klass);
} else {
try {
- return converter.convert(klass,value);
+ return converter.convert(klass, value);
} catch (ConversionException e) {
- throw new JellyTagException("Can't convert " + value + " to " + klass + " (" + e.toString() + ")",e);
+ throw new JellyTagException("Can't convert " + value + " to " + klass + " (" + e.toString() + ")", e);
}
}
} else {
@@ -186,97 +183,103 @@ public class ArgTag extends BaseClassLoaderTag {
static {
{
Converter c = new BooleanConverter();
- converterMap.put(Boolean.TYPE,c);
- converterMap.put(Boolean.class,c);
+ converterMap.put(Boolean.TYPE, c);
+ converterMap.put(Boolean.class, c);
}
{
Converter c = new CharacterConverter();
- converterMap.put(Character.TYPE,c);
- converterMap.put(Character.class,c);
+ converterMap.put(Character.TYPE, c);
+ converterMap.put(Character.class, c);
}
{
Converter c = new Converter() {
public Object convert(Class klass, Object value) {
- if(value instanceof Number) {
- return new Byte(((Number)value).byteValue());
+ if (value instanceof Number) {
+ return new Byte(((Number) value).byteValue());
} else {
- return inner.convert(klass,value);
+ return inner.convert(klass, value);
}
}
+
private Converter inner = new ByteConverter();
};
- converterMap.put(Byte.TYPE,c);
- converterMap.put(Byte.class,c);
+ converterMap.put(Byte.TYPE, c);
+ converterMap.put(Byte.class, c);
}
{
Converter c = new Converter() {
public Object convert(Class klass, Object value) {
- if(value instanceof Number) {
- return new Short(((Number)value).shortValue());
+ if (value instanceof Number) {
+ return new Short(((Number) value).shortValue());
} else {
- return inner.convert(klass,value);
+ return inner.convert(klass, value);
}
}
+
private Converter inner = new ShortConverter();
};
- converterMap.put(Short.TYPE,c);
- converterMap.put(Short.class,c);
+ converterMap.put(Short.TYPE, c);
+ converterMap.put(Short.class, c);
}
{
Converter c = new Converter() {
public Object convert(Class klass, Object value) {
- if(value instanceof Number) {
- return new Integer(((Number)value).intValue());
+ if (value instanceof Number) {
+ return new Integer(((Number) value).intValue());
} else {
- return inner.convert(klass,value);
+ return inner.convert(klass, value);
}
}
+
private Converter inner = new IntegerConverter();
};
- converterMap.put(Integer.TYPE,c);
- converterMap.put(Integer.class,c);
+ converterMap.put(Integer.TYPE, c);
+ converterMap.put(Integer.class, c);
}
{
Converter c = new Converter() {
public Object convert(Class klass, Object value) {
- if(value instanceof Number) {
- return new Long(((Number)value).longValue());
+ if (value instanceof Number) {
+ return new Long(((Number) value).longValue());
} else {
- return inner.convert(klass,value);
+ return inner.convert(klass, value);
}
}
+
private Converter inner = new LongConverter();
};
- converterMap.put(Long.TYPE,c);
- converterMap.put(Long.class,c);
+ converterMap.put(Long.TYPE, c);
+ converterMap.put(Long.class, c);
}
{
Converter c = new Converter() {
public Object convert(Class klass, Object value) {
- if(value instanceof Number) {
- return new Float(((Number)value).floatValue());
+ if (value instanceof Number) {
+ return new Float(((Number) value).floatValue());
} else {
- return inner.convert(klass,value);
+ return inner.convert(klass, value);
}
}
+
private Converter inner = new FloatConverter();
};
- converterMap.put(Float.TYPE,c);
- converterMap.put(Float.class,c);
+ converterMap.put(Float.TYPE, c);
+ converterMap.put(Float.class, c);
}
{
Converter c = new Converter() {
public Object convert(Class klass, Object value) {
- if(value instanceof Number) {
- return new Double(((Number)value).doubleValue());
+ if (value instanceof Number) {
+ return new Double(((Number) value).doubleValue());
} else {
- return inner.convert(klass,value);
+ return inner.convert(klass, value);
}
}
+
private Converter inner = new DoubleConverter();
};
- converterMap.put(Double.TYPE,c);
- converterMap.put(Double.class,c);
+ converterMap.put(Double.TYPE, c);
+ converterMap.put(Double.class, c);
}
}
}
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 417244b7..d2f30bc4 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
@@ -46,7 +46,7 @@ public class ExprTag extends TagSupport {
output.write(text);
}
catch (SAXException e) {
- throw new JellyTagException("could not write the XMLOutput",e);
+ throw new JellyTagException("could not write the XMLOutput", e);
}
}
}
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 ad15b8af..743c79d6 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
@@ -80,7 +80,7 @@ public class FileTag extends TagSupport {
} catch (UnsupportedEncodingException e) {
throw new JellyTagException(e);
} catch (SAXException e) {
- throw new JellyTagException("could not write file",e);
+ throw new JellyTagException("could not write file", e);
}
}
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 ed43870f..56e80c9b 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
@@ -84,7 +84,7 @@ public class ImportTag extends TagSupport {
}
}
catch (JellyException e) {
- throw new JellyTagException("could not import script",e);
+ throw new JellyTagException("could not import script", e);
}
}
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 46c4de9f..c35ab7b8 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
@@ -143,7 +143,7 @@ public class InvokeStaticTag extends TagSupport implements ArgTagParent {
}
catch (InvocationTargetException e) {
if(null != exceptionVar) {
- context.setVariable(exceptionVar,e.getTargetException());
+ context.setVariable(exceptionVar, e.getTargetException());
} else {
throw new JellyTagException("method " + methodName +
" threw exception: "+ e.getTargetException().getMessage(),
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 49cc83f7..2b5c8cc6 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
@@ -94,7 +94,7 @@ public class InvokeTag extends TagSupport implements ArgTagParent {
Object result = null;
try {
- result = MethodUtils.invokeMethod(onInstance,methodName,values,types);
+ result = MethodUtils.invokeMethod(onInstance, methodName, values, types);
}
catch (NoSuchMethodException e) {
throw new JellyTagException(e);
@@ -106,9 +106,7 @@ public class InvokeTag extends TagSupport implements ArgTagParent {
if(null != exceptionVar) {
context.setVariable(exceptionVar,e.getTargetException());
} else {
- throw new JellyTagException("method " + methodName +
- " threw exception: "+ e.getTargetException().getMessage(),
- e.getTargetException() );
+ throw new JellyTagException("method " + methodName + " threw exception: " + e.getTargetException().getMessage(), e.getTargetException());
}
}
finally {
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 482566cb..e5c24b99 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
@@ -80,8 +80,8 @@ public class NewTag extends BaseClassLoaderTag implements ArgTagParent {
object = theClass.newInstance();
} else {
Object[] values = paramValues.toArray();
- Class[] types = (Class[])(paramTypes.toArray(new Class[paramTypes.size()]));
- object = ConstructorUtils.invokeConstructor(theClass,values,types);
+ Class[] types = (Class[]) (paramTypes.toArray(new Class[paramTypes.size()]));
+ object = ConstructorUtils.invokeConstructor(theClass, values, types);
paramTypes.clear();
paramValues.clear();
}
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 59b76ee7..64488398 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
@@ -82,9 +82,9 @@ public class SetPropertiesTag extends MapTagSupport {
try {
BeanUtils.populate(bean, attributes);
} catch (IllegalAccessException e) {
- throw new JellyTagException("could not set the properties on a bean",e);
+ throw new JellyTagException("could not set the properties on a bean", e);
} catch (InvocationTargetException e) {
- throw new JellyTagException("could not set the properties on a bean",e);
+ throw new JellyTagException("could not set the properties on a bean", e);
}
}
}
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 293e5350..df465c77 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
@@ -190,9 +190,9 @@ public class UseBeanTag extends MapTagSupport implements BeanSource {
try {
BeanUtils.populate(bean, attrsToUse);
} catch (IllegalAccessException e) {
- throw new JellyTagException("could not set the properties of the bean",e);
+ throw new JellyTagException("could not set the properties of the bean", e);
} catch (InvocationTargetException e) {
- throw new JellyTagException("could not set the properties of the bean",e);
+ throw new JellyTagException("could not set the properties of the bean", e);
}
}
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 74e6f180..4c4d2ca0 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
@@ -49,17 +49,14 @@ public abstract class BaseJellyTest extends TestCase {
protected void setUpScript(String scriptname) throws Exception {
URL url = this.getClass().getResource(scriptname);
- if(null == url) {
- throw new Exception(
- "Could not find Jelly script: " + scriptname
- + " in package of class: " + getClass().getName()
- );
+ if (null == url) {
+ throw new Exception("Could not find Jelly script: " + scriptname + " in package of class: " + getClass().getName());
}
jelly.setUrl(url);
String exturl = url.toExternalForm();
int lastSlash = exturl.lastIndexOf("/");
- String extBase = exturl.substring(0,lastSlash+1);
+ String extBase = exturl.substring(0, lastSlash + 1);
URL baseurl = new URL(extBase);
context.setCurrentURL(baseurl);
}
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 5457b97b..cd08e998 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
@@ -158,14 +158,13 @@ public class CommandLineParser {
cmdLineOptions = new Options();
cmdLineOptions.addOption("o", true, "Output file");
cmdLineOptions.addOption("script", true, "Jelly script to run");
- cmdLineOptions.addOption("h","help", false, "Give this help message");
- cmdLineOptions.addOption("v","version", false, "prints Jelly's version and exits");
+ cmdLineOptions.addOption("h", "help", false, "Give this help message");
+ cmdLineOptions.addOption("v", "version", false, "prints Jelly's version and exits");
cmdLineOptions.addOption("script", true, "Jelly script to run");
cmdLineOptions.addOption("awt", false, "Wether to run in the AWT thread.");
cmdLineOptions.addOption("swing", false, "Synonym of \"-awt\".");
- List builtinOptionNames = Arrays.asList(new String[]{
- "-o","-script","-h","--help","-v","--version","-awt","-swing"});
-
+ List builtinOptionNames = Arrays.asList(new String[] { "-o", "-script", "-h", "--help", "-v", "--version", "-awt", "-swing" });
+
// -D options will be added to the system properties
Properties sysProps = System.getProperties();
@@ -173,7 +172,7 @@ public class CommandLineParser {
// before passing it to the CLI parser
ArrayList filteredArgList = new ArrayList();
- for (int i=0;i<args.length;i++) {
+ for (int i = 0; i < args.length; i++) {
String arg = args[i];
// if this is a -D property parse it and add it to the system properties.
@@ -181,9 +180,9 @@ public class CommandLineParser {
if (arg.startsWith("-D") && (arg.length() > 2)) {
arg = arg.substring(2);
int ePos = arg.indexOf("=");
- if(ePos==-1 || ePos==0 || ePos==arg.length()-1)
+ if (ePos == -1 || ePos == 0 || ePos == arg.length() - 1)
System.err.println("Invalid system property: \"" + arg + "\".");
- sysProps.setProperty(arg.substring(0,ePos), arg.substring(ePos+1));
+ sysProps.setProperty(arg.substring(0, ePos), arg.substring(ePos + 1));
} else {
// add this to the filtered list of arguments
filteredArgList.add(arg);