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
The following commit(s) were added to refs/heads/master by this push:
new 8950dda3 Fix formatting
8950dda3 is described below
commit 8950dda3ca52f83511e0a8d0754ac9318a5300de
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Tue Aug 22 14:54:30 2023 -0400
Fix formatting
---
.../java/org/apache/commons/jelly/XMLOutput.java | 4 ++--
.../org/apache/commons/jelly/impl/Embedded.java | 2 +-
.../org/apache/commons/jelly/tags/core/ArgTag.java | 22 +++++++++++-----------
.../apache/commons/jelly/tags/core/CaseTag.java | 8 ++++----
.../apache/commons/jelly/tags/core/CatchTag.java | 2 +-
.../apache/commons/jelly/tags/core/DefaultTag.java | 6 +++---
.../commons/jelly/tags/core/GetStaticTag.java | 8 ++++----
.../commons/jelly/tags/core/InvokeStaticTag.java | 6 +++---
.../apache/commons/jelly/tags/core/InvokeTag.java | 6 +++---
.../org/apache/commons/jelly/tags/core/NewTag.java | 6 +++---
.../apache/commons/jelly/tags/core/SwitchTag.java | 2 +-
.../apache/commons/jelly/tags/core/UseBeanTag.java | 2 +-
.../org/apache/commons/jelly/core/Customer.java | 2 +-
.../org/apache/commons/jelly/tags/ant/AntTag.java | 4 ++--
.../commons/jelly/avalon/JellyServiceImpl.java | 10 +++++-----
.../commons/jelly/tags/bean/BeanPropertyTag.java | 6 +++---
.../apache/commons/jelly/tags/bean/Customer.java | 2 +-
.../jelly/tags/jetty/SecurityHandlerTag.java | 2 +-
.../commons/jelly/tags/swing/ComponentTag.java | 2 +-
.../commons/jelly/tags/swing/EtchedBorderTag.java | 10 +++++-----
.../apache/commons/jelly/core/BaseJellyTest.java | 2 +-
.../commons/jelly/demos/HomepageBuilder.java | 2 +-
.../org/apache/commons/jelly/tags/xml/SetTag.java | 22 +++++++++++-----------
23 files changed, 69 insertions(+), 69 deletions(-)
diff --git a/core/src/main/java/org/apache/commons/jelly/XMLOutput.java
b/core/src/main/java/org/apache/commons/jelly/XMLOutput.java
index 3016fd25..1eb55baa 100644
--- a/core/src/main/java/org/apache/commons/jelly/XMLOutput.java
+++ b/core/src/main/java/org/apache/commons/jelly/XMLOutput.java
@@ -845,10 +845,10 @@ public class XMLOutput implements ContentHandler,
LexicalHandler {
* @throws SAXException The application may raise an exception.
*/
public void objectData(Object object) throws SAXException {
- if(contentHandler instanceof XMLOutput)
+ if (contentHandler instanceof XMLOutput)
((XMLOutput) contentHandler).objectData(object);
else {
- if(object!=null) {
+ if (object!=null) {
String output=object.toString();
write(output);
} else {
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 5521b6e0..758a421e 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
@@ -51,7 +51,7 @@ import org.xml.sax.SAXException;
* // embedded.setScript(scriptAsInputStream)
*
* boolean bStatus=embedded.execute();
- * if(!bStatus) { // if error
+ * if (!bStatus) { // if error
* String errorMsg=embedded.getErrorMsg();
* }
* </pre>
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 6b83813a..14da6e09 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
@@ -72,31 +72,31 @@ public class ArgTag extends BaseClassLoaderTag {
invokeBody(output);
Class klass = null;
- if("boolean".equals(typeString)) {
+ if ("boolean".equals(typeString)) {
klass = Boolean.TYPE;
assertNotNull(value);
- } else if("byte".equals(typeString)) {
+ } else if ("byte".equals(typeString)) {
klass = Byte.TYPE;
assertNotNull(value);
- } else if("short".equals(typeString)) {
+ } else if ("short".equals(typeString)) {
klass = Short.TYPE;
assertNotNull(value);
- } else if("int".equals(typeString)) {
+ } else if ("int".equals(typeString)) {
klass = Integer.TYPE;
assertNotNull(value);
- } else if("char".equals(typeString)) {
+ } else if ("char".equals(typeString)) {
klass = Character.TYPE;
assertNotNull(value);
- } else if("float".equals(typeString)) {
+ } else if ("float".equals(typeString)) {
klass = Float.TYPE;
assertNotNull(value);
- } else if("long".equals(typeString)) {
+ } else if ("long".equals(typeString)) {
klass = Long.TYPE;
assertNotNull(value);
- } else if("double".equals(typeString)) {
+ } else if ("double".equals(typeString)) {
klass = Double.TYPE;
assertNotNull(value);
- } else if(null != typeString) {
+ } else if (null != typeString) {
try {
// klass = getClassLoader().loadClass(typeString);
// JELLY-274: rather use the three args static class-load-method
@@ -104,7 +104,7 @@ public class ArgTag extends BaseClassLoaderTag {
} catch (ClassNotFoundException e) {
throw new JellyTagException(e);
}
- } else if(null == value) { // and (by construction) null == typeString
+ } else if (null == value) { // and (by construction) null == typeString
klass = Object.class;
} else {
klass = value.getClass();
@@ -136,7 +136,7 @@ public class ArgTag extends BaseClassLoaderTag {
//-------------------------------------------------------------------------
private void assertNotNull(Object value) throws JellyTagException {
- if(null == value) {
+ if (null == value) {
throw new JellyTagException("A " + typeString + " instance cannot
be null.");
}
}
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/CaseTag.java
b/core/src/main/java/org/apache/commons/jelly/tags/core/CaseTag.java
index a495e990..1d70a964 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/CaseTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/CaseTag.java
@@ -51,18 +51,18 @@ public class CaseTag extends TagSupport {
}
public void doTag(XMLOutput output) throws MissingAttributeException,
JellyTagException {
- if(null == this.valueExpression) {
+ if (null == this.valueExpression) {
throw new MissingAttributeException("value");
}
SwitchTag tag = (SwitchTag)findAncestorWithClass(SwitchTag.class);
- if(null == tag) {
+ if (null == tag) {
throw new JellyTagException("This tag must be enclosed inside a
<switch> tag" );
}
- if(tag.hasDefaultBeenEncountered()) {
+ if (tag.hasDefaultBeenEncountered()) {
throw new JellyTagException("<default> should be the last tag
within a <switch>" );
}
Object value = valueExpression.evaluate(context);
- if(tag.isFallingThru() ||
+ if (tag.isFallingThru() ||
(null == tag.getValue() && null == value) ||
(null != tag.getValue() && tag.getValue().equals(value))) {
tag.caseMatched();
diff --git
a/core/src/main/java/org/apache/commons/jelly/tags/core/CatchTag.java
b/core/src/main/java/org/apache/commons/jelly/tags/core/CatchTag.java
index aed309e4..a9a8dff0 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/CatchTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/CatchTag.java
@@ -182,7 +182,7 @@ public class CatchTag extends TagSupport {
* @return true if t is expected
*/
public boolean isExpected(Throwable t) {
- if( exceptionArray == null ) {
+ if ( exceptionArray == null ) {
return true;
}
Class clazz = null;
diff --git
a/core/src/main/java/org/apache/commons/jelly/tags/core/DefaultTag.java
b/core/src/main/java/org/apache/commons/jelly/tags/core/DefaultTag.java
index 6a17e867..d37974d3 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/DefaultTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/DefaultTag.java
@@ -47,14 +47,14 @@ public class DefaultTag extends TagSupport {
public void doTag(XMLOutput output) throws JellyTagException {
SwitchTag tag = (SwitchTag)findAncestorWithClass(SwitchTag.class);
- if(null == tag) {
+ if (null == tag) {
throw new JellyTagException("This tag must be enclosed inside a
<switch> tag" );
}
- if(tag.hasDefaultBeenEncountered()) {
+ if (tag.hasDefaultBeenEncountered()) {
throw new JellyTagException("Only one <default> tag is allowed per
<switch>.");
}
tag.defaultEncountered();
- if(tag.isFallingThru() || (!tag.hasSomeCaseMatched())) {
+ if (tag.isFallingThru() || (!tag.hasSomeCaseMatched())) {
tag.caseMatched();
tag.setFallingThru(fallThru);
invokeBody(output);
diff --git
a/core/src/main/java/org/apache/commons/jelly/tags/core/GetStaticTag.java
b/core/src/main/java/org/apache/commons/jelly/tags/core/GetStaticTag.java
index 3cee0e75..f0a12dbf 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/GetStaticTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/GetStaticTag.java
@@ -93,14 +93,14 @@ public class GetStaticTag extends TagSupport {
public void doTag(XMLOutput output) throws JellyTagException {
String message = null;
- if(var == null)
+ if (var == null)
message = "var";
- else if(field == null)
+ else if (field == null)
message = "field";
- else if(className == null)
+ else if (className == null)
message = "className";
- if(message != null)
+ if (message != null)
throw new MissingAttributeException(message);
try {
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 c35ab7b8..b39f7eb0 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
@@ -123,12 +123,12 @@ public class InvokeStaticTag extends TagSupport
implements ArgTagParent {
Class[] types = (Class[])(paramTypes.toArray(new
Class[paramTypes.size()]));
Method method = loadClass().getMethod( methodName, types );
Object result = method.invoke( null, values );
- if(null != var) {
+ if (null != var) {
context.setVariable(var, result);
}
ArgTag parentArg = (ArgTag)(findAncestorWithClass(ArgTag.class));
- if(null != parentArg) {
+ if (null != parentArg) {
parentArg.setValue(result);
}
}
@@ -142,7 +142,7 @@ public class InvokeStaticTag extends TagSupport implements
ArgTagParent {
throw createLoadClassFailedException(e);
}
catch (InvocationTargetException e) {
- if(null != exceptionVar) {
+ if (null != exceptionVar) {
context.setVariable(exceptionVar, e.getTargetException());
} else {
throw new JellyTagException("method " + methodName +
diff --git
a/core/src/main/java/org/apache/commons/jelly/tags/core/InvokeTag.java
b/core/src/main/java/org/apache/commons/jelly/tags/core/InvokeTag.java
index 2b5c8cc6..27ee9a52 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
@@ -103,7 +103,7 @@ public class InvokeTag extends TagSupport implements
ArgTagParent {
throw new JellyTagException(e);
}
catch (InvocationTargetException e) {
- if(null != exceptionVar) {
+ if (null != exceptionVar) {
context.setVariable(exceptionVar,e.getTargetException());
} else {
throw new JellyTagException("method " + methodName + " threw
exception: " + e.getTargetException().getMessage(), e.getTargetException());
@@ -115,10 +115,10 @@ public class InvokeTag extends TagSupport implements
ArgTagParent {
}
ArgTag parentArg = (ArgTag)(findAncestorWithClass(ArgTag.class));
- if(null != parentArg) {
+ if (null != parentArg) {
parentArg.setValue(result);
}
- if(null != var) {
+ if (null != var) {
context.setVariable(var, result);
}
}
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 e5c24b99..f807a36b 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
@@ -64,7 +64,7 @@ public class NewTag extends BaseClassLoaderTag implements
ArgTagParent {
ArgTag parentArg = null;
if ( var == null ) {
parentArg = (ArgTag)(findAncestorWithClass(ArgTag.class));
- if(null == parentArg) {
+ if (null == parentArg) {
throw new MissingAttributeException( "var" );
}
}
@@ -76,7 +76,7 @@ public class NewTag extends BaseClassLoaderTag implements
ArgTagParent {
try {
Class theClass = getClassLoader().loadClass( className );
Object object = null;
- if(paramTypes.size() == 0) {
+ if (paramTypes.size() == 0) {
object = theClass.newInstance();
} else {
Object[] values = paramValues.toArray();
@@ -85,7 +85,7 @@ public class NewTag extends BaseClassLoaderTag implements
ArgTagParent {
paramTypes.clear();
paramValues.clear();
}
- if(null != var) {
+ if (null != var) {
context.setVariable(var, object);
} else {
parentArg.setValue(object);
diff --git
a/core/src/main/java/org/apache/commons/jelly/tags/core/SwitchTag.java
b/core/src/main/java/org/apache/commons/jelly/tags/core/SwitchTag.java
index f5178903..58ef05fc 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/SwitchTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/SwitchTag.java
@@ -56,7 +56,7 @@ public class SwitchTag extends TagSupport {
this.someCaseMatched = false;
this.fallingThru = false;
- if(null == on) {
+ if (null == on) {
throw new MissingAttributeException("on");
} else {
value = on.evaluate(context);
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 df465c77..01ab3331 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
@@ -226,7 +226,7 @@ public class UseBeanTag extends MapTagSupport implements
BeanSource {
}
else {
ArgTag parentArg = (ArgTag)(findAncestorWithClass(ArgTag.class));
- if(null != parentArg) {
+ if (null != parentArg) {
parentArg.setValue(bean);
}
}
diff --git a/core/src/test/java/org/apache/commons/jelly/core/Customer.java
b/core/src/test/java/org/apache/commons/jelly/core/Customer.java
index 4e2cb489..b82e47d5 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/Customer.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/Customer.java
@@ -56,7 +56,7 @@ public class Customer {
setCity(cust.getCity());
setLocation(cust.getLocation());
List list = cust.getOrders();
- if(null != list) {
+ if (null != list) {
for(Iterator iter = list.iterator();iter.hasNext();) {
addOrder((Order)iter.next());
}
diff --git
a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTag.java
b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTag.java
index 637f1470..6cac55f8 100644
--- a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTag.java
+++ b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTag.java
@@ -561,12 +561,12 @@ public class AntTag extends MapTagSupport implements
TaskSource {
}
private String safeToString(Object o) {
- if(o==null) return "null";
+ if (o==null) return "null";
String r = null;
try {
r = o.toString();
} catch (Exception ex) {}
- if(r == null)
+ if (r == null)
r = "(object of class " + o.getClass() + ")";
return r;
}
diff --git
a/jelly-tags/avalon/src/main/java/org/apache/commons/jelly/avalon/JellyServiceImpl.java
b/jelly-tags/avalon/src/main/java/org/apache/commons/jelly/avalon/JellyServiceImpl.java
index ccf959eb..076db04e 100644
---
a/jelly-tags/avalon/src/main/java/org/apache/commons/jelly/avalon/JellyServiceImpl.java
+++
b/jelly-tags/avalon/src/main/java/org/apache/commons/jelly/avalon/JellyServiceImpl.java
@@ -68,7 +68,7 @@ public class JellyServiceImpl implements JellyService,
Configurable {
* @see
org.apache.commons.jelly.avalon.JellyService#runNamedScript(String, Map,
XMLOutput)
*/
public Map runNamedScript( String name, Map params, XMLOutput output )
throws Exception {
- if( !m_scripts.containsKey( name ) )
+ if ( !m_scripts.containsKey( name ) )
throw new JellyException( "No script exists for script name [" +
name + "]" );
Script script = (Script)m_scripts.get( name );
@@ -157,10 +157,10 @@ public class JellyServiceImpl implements JellyService,
Configurable {
* @throws ConfigurationException
*/
public void configure( Configuration config ) throws
ConfigurationException {
- if( m_configured )
+ if ( m_configured )
throw new ConfigurationException( "configure may only be executed
once" );
- if( !"jelly".equals( config.getName() ) )
+ if ( !"jelly".equals( config.getName() ) )
throw new ConfigurationException( "Expected <jelly> but got " +
config.getName() );
// Configure named scripts
@@ -174,7 +174,7 @@ public class JellyServiceImpl implements JellyService,
Configurable {
// Try to load the script via file, then by URL, then by
classloader
URL url = null;
File file = new File( scriptName );
- if( file.exists() ) {
+ if ( file.exists() ) {
url = file.toURL();
}
else {
@@ -188,7 +188,7 @@ public class JellyServiceImpl implements JellyService,
Configurable {
}
// All attempts failed...
- if( url == null )
+ if ( url == null )
throw new ConfigurationException( "Could not find script
[" + scriptName + "]" );
// Get the script and store it
diff --git
a/jelly-tags/bean/src/main/java/org/apache/commons/jelly/tags/bean/BeanPropertyTag.java
b/jelly-tags/bean/src/main/java/org/apache/commons/jelly/tags/bean/BeanPropertyTag.java
index d67a61d9..1d56f886 100644
---
a/jelly-tags/bean/src/main/java/org/apache/commons/jelly/tags/bean/BeanPropertyTag.java
+++
b/jelly-tags/bean/src/main/java/org/apache/commons/jelly/tags/bean/BeanPropertyTag.java
@@ -75,9 +75,9 @@ public class BeanPropertyTag extends BeanTag {
}
else {
Class tagClass = theClass;
- if(tagClass == Object.class)
+ if (tagClass == Object.class)
tagClass = findAddMethodClass(parentClass);
- if(tagClass == null)
+ if (tagClass == null)
throw new JellyTagException("unable to infer element class
for tag "+getTagName());
return super.newInstance(tagClass, attributes, output) ;
@@ -97,7 +97,7 @@ public class BeanPropertyTag extends BeanTag {
Method[] methods = parentClass.getMethods();
for (int i = 0; i < methods.length; i++) {
Method method = methods[i];
- if(Modifier.isPublic(method.getModifiers())) {
+ if (Modifier.isPublic(method.getModifiers())) {
Class[] args = method.getParameterTypes();
if (method.getName().equals(addMethodName)
&& java.lang.Void.TYPE.equals(method.getReturnType())
diff --git
a/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/Customer.java
b/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/Customer.java
index 60ab6579..4c2f51c4 100644
---
a/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/Customer.java
+++
b/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/Customer.java
@@ -54,7 +54,7 @@ public class Customer {
setName(cust.getName());
setLocation(cust.getLocation());
List list = cust.getOrders();
- if(null != list) {
+ if (null != list) {
for(Iterator iter = list.iterator();iter.hasNext();) {
addOrder((Order)iter.next());
}
diff --git
a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/SecurityHandlerTag.java
b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/SecurityHandlerTag.java
index 7bf9aae2..b95cc8ab 100644
---
a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/SecurityHandlerTag.java
+++
b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/SecurityHandlerTag.java
@@ -255,7 +255,7 @@ public class SecurityHandlerTag extends TagSupport {
httpContext.setRealmName(name.toString(false,true));
XmlParser.Node formConfig = node.get("form-login-config");
- if(formConfig != null)
+ if (formConfig != null)
{
if (_formAuthenticator==null)
Code.warning("FORM Authentication miss-configured");
diff --git
a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ComponentTag.java
b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ComponentTag.java
index 09330925..ca8dac2e 100644
---
a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ComponentTag.java
+++
b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ComponentTag.java
@@ -311,7 +311,7 @@ public class ComponentTag extends UseBeanTag implements
ContainerTag {
this.setTagName((String)attributes.get("tagName"));
addIgnoreProperty("tagName");
}
- if(tagName!=null) {
+ if (tagName!=null) {
context.setVariable(tagName,this);
currentOutput = output;
}
diff --git
a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/EtchedBorderTag.java
b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/EtchedBorderTag.java
index 16f78b74..ac9be661 100644
---
a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/EtchedBorderTag.java
+++
b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/EtchedBorderTag.java
@@ -46,14 +46,14 @@ public class EtchedBorderTag extends BorderTagSupport {
// Tag interface
//-------------------------------------------------------------------------
public void doTag(final XMLOutput output) throws
MissingAttributeException, JellyTagException {
- if( highlight != null && shadow == null ) {
+ if ( highlight != null && shadow == null ) {
throw new MissingAttributeException("shadow must be supplied when
highlight is supplied");
}
- if( shadow != null && highlight == null) {
+ if ( shadow != null && highlight == null) {
throw new MissingAttributeException("highlight must be supplied
when shadow is supplied");
}
- if( etchType != EtchedBorder.LOWERED || etchType !=
EtchedBorder.RAISED ) {
- if( log.isDebugEnabled() ) log.debug( "etchType set to [" +
etchType + "], which is invalid. Resetting to -1" );
+ if ( etchType != EtchedBorder.LOWERED || etchType !=
EtchedBorder.RAISED ) {
+ if ( log.isDebugEnabled() ) log.debug( "etchType set to [" +
etchType + "], which is invalid. Resetting to -1" );
}
super.doTag(output);
}
@@ -88,7 +88,7 @@ public class EtchedBorderTag extends BorderTagSupport {
* Factory method to create a new EtchedBorder instance.
*/
protected Border createBorder() {
- if( etchType == -1 && shadow == null && highlight == null) {
+ if ( etchType == -1 && shadow == null && highlight == null) {
return BorderFactory.createEtchedBorder();
}
else if ( highlight != null && shadow != null && etchType > -1 ) {
diff --git
a/jelly-tags/swing/src/test/java/org/apache/commons/jelly/core/BaseJellyTest.java
b/jelly-tags/swing/src/test/java/org/apache/commons/jelly/core/BaseJellyTest.java
index c7d3af89..1495a81f 100644
---
a/jelly-tags/swing/src/test/java/org/apache/commons/jelly/core/BaseJellyTest.java
+++
b/jelly-tags/swing/src/test/java/org/apache/commons/jelly/core/BaseJellyTest.java
@@ -42,7 +42,7 @@ public abstract class BaseJellyTest extends TestCase {
protected void setUpScript(String scriptname) throws Exception {
URL url = this.getClass().getResource(scriptname);
- if(null == url) {
+ if (null == url) {
throw new Exception(
"Could not find Jelly script: " + scriptname
+ " in package of class: " + getClass().getName()
diff --git
a/jelly-tags/swing/src/test/java/org/apache/commons/jelly/demos/HomepageBuilder.java
b/jelly-tags/swing/src/test/java/org/apache/commons/jelly/demos/HomepageBuilder.java
index fd62d11d..be9df4c5 100644
---
a/jelly-tags/swing/src/test/java/org/apache/commons/jelly/demos/HomepageBuilder.java
+++
b/jelly-tags/swing/src/test/java/org/apache/commons/jelly/demos/HomepageBuilder.java
@@ -140,7 +140,7 @@ public class HomepageBuilder extends JPanel {
// //embedded.setScript(scriptAsInputStream);
//
// boolean bStatus=embedded.execute();
-// if(!bStatus) //if error
+// if (!bStatus) //if error
// {
// System.out.println(embedded.getErrorMsg());
// }
diff --git
a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/SetTag.java
b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/SetTag.java
index 60e3e9f5..822663ec 100644
--- a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/SetTag.java
+++ b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/SetTag.java
@@ -89,7 +89,7 @@ public class SetTag extends XPathTagSupport {
Object xpathContext = getXPathContext();
Object value = null;
try {
- if( single != null && single.booleanValue() == true ) {
+ if ( single != null && single.booleanValue() == true ) {
value = select.selectSingleNode(xpathContext);
} else {
value = select.evaluate(xpathContext);
@@ -105,7 +105,7 @@ public class SetTag extends XPathTagSupport {
if (xpCmp != null && (xpCmp.getXpath() != null)) {
Collections.sort(list, xpCmp);
}
- if(list.isEmpty()) {
+ if (list.isEmpty()) {
value = null;
}
}
@@ -114,7 +114,7 @@ public class SetTag extends XPathTagSupport {
// handle single
if (single!=null) {
if (single.booleanValue() == true) {
- if(value instanceof List) {
+ if (value instanceof List) {
List l = (List) value;
if (l.size() == 0)
value=null;
@@ -122,7 +122,7 @@ public class SetTag extends XPathTagSupport {
value=l.get(0);
}
} else { // single == false
- if(! (value instanceof List) ) {
+ if (! (value instanceof List) ) {
List l = null;
if (value==null) {
l = new ArrayList(0);
@@ -136,13 +136,13 @@ public class SetTag extends XPathTagSupport {
}
// now convert the result(s) to string if need
- if(asString != null && asString.booleanValue()) {
- if(value instanceof Node) {
+ if (asString != null && asString.booleanValue()) {
+ if (value instanceof Node) {
value = ((Node) value).getStringValue();
- } else if(value instanceof List) {
+ } else if (value instanceof List) {
for(ListIterator it = ((List) value).listIterator();
it.hasNext(); ) {
Object v = it.next();
- if(v instanceof Node) {
+ if (v instanceof Node) {
v = ((Node) v).getStringValue();
it.set(v);
}
@@ -151,7 +151,7 @@ public class SetTag extends XPathTagSupport {
}
// finally convert the result to a concatenated string if delimiter is
defined
- if(delimiter != null && value instanceof List) {
+ if (delimiter != null && value instanceof List) {
StringBuilder buff = new StringBuilder();
for(Iterator it = ((List) value).iterator(); it.hasNext(); ) {
Object v = it.next();
@@ -160,7 +160,7 @@ public class SetTag extends XPathTagSupport {
} else {
buff.append(v.toString());
}
- if(it.hasNext()) {
+ if (it.hasNext()) {
buff.append(delimiter);
}
}
@@ -297,7 +297,7 @@ public class SetTag extends XPathTagSupport {
*/
public void setDelim(String delim) {
this.delimiter = delim;
- if( delim!=null ) {
+ if ( delim!=null ) {
this.asString = Boolean.TRUE;
}
}
