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:44 UTC
[commons-jelly] 01/02: Fix formatting
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);