You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by ds...@apache.org on 2003/06/24 03:52:19 UTC
cvs commit: jakarta-tapestry/framework/src/org/apache/tapestry/wml Timer.java Setvar.java Card.java Do.java Select.java Input.java Option.java
dsolis 2003/06/23 18:52:19
Modified: framework/src/org/apache/tapestry/wml Timer.java Setvar.java
Card.java Do.java Select.java Input.java
Option.java
Log:
Improve code for null or empty values
Revision Changes Path
1.5 +3 -2 jakarta-tapestry/framework/src/org/apache/tapestry/wml/Timer.java
Index: Timer.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/wml/Timer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Timer.java 17 Apr 2003 21:33:44 -0000 1.4
+++ Timer.java 24 Jun 2003 01:52:19 -0000 1.5
@@ -55,6 +55,7 @@
package org.apache.tapestry.wml;
+import org.apache.commons.lang.StringUtils;
import org.apache.tapestry.AbstractComponent;
import org.apache.tapestry.IBinding;
import org.apache.tapestry.IMarkupWriter;
@@ -86,7 +87,7 @@
writer.attribute("name", getName());
String value = readValue();
- if (value != null)
+ if (StringUtils.isNotEmpty(value))
writer.attribute("value", value);
else
writer.attribute("value", "0");
1.5 +3 -2 jakarta-tapestry/framework/src/org/apache/tapestry/wml/Setvar.java
Index: Setvar.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/wml/Setvar.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Setvar.java 17 Apr 2003 21:33:44 -0000 1.4
+++ Setvar.java 24 Jun 2003 01:52:19 -0000 1.5
@@ -55,6 +55,7 @@
package org.apache.tapestry.wml;
+import org.apache.commons.lang.StringUtils;
import org.apache.tapestry.AbstractComponent;
import org.apache.tapestry.IBinding;
import org.apache.tapestry.IMarkupWriter;
@@ -88,7 +89,7 @@
renderInformalParameters(writer, cycle);
String value = readValue();
- if (value != null)
+ if (StringUtils.isNotEmpty(value))
writer.attribute("value", value);
else
writer.attribute("value", "");
1.7 +3 -2 jakarta-tapestry/framework/src/org/apache/tapestry/wml/Card.java
Index: Card.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/wml/Card.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Card.java 28 May 2003 13:41:43 -0000 1.6
+++ Card.java 24 Jun 2003 01:52:19 -0000 1.7
@@ -55,6 +55,7 @@
package org.apache.tapestry.wml;
+import org.apache.commons.lang.StringUtils;
import org.apache.tapestry.AbstractComponent;
import org.apache.tapestry.ApplicationRuntimeException;
import org.apache.tapestry.IMarkupWriter;
@@ -89,7 +90,7 @@
writer.begin("card");
String title = getTitle();
- if (title != null)
+ if (StringUtils.isNotEmpty(title))
writer.attribute("title", title);
renderInformalParameters(writer, cycle);
1.5 +3 -4 jakarta-tapestry/framework/src/org/apache/tapestry/wml/Do.java
Index: Do.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/wml/Do.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Do.java 17 Apr 2003 21:33:44 -0000 1.4
+++ Do.java 24 Jun 2003 01:52:19 -0000 1.5
@@ -55,6 +55,7 @@
package org.apache.tapestry.wml;
+import org.apache.commons.lang.StringUtils;
import org.apache.tapestry.AbstractComponent;
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.IRequestCycle;
@@ -89,7 +90,7 @@
writer.attribute("type", getType());
String label = getLabel();
- if (label != null)
+ if (StringUtils.isNotEmpty(label))
writer.attribute("label", label);
renderInformalParameters(writer, cycle);
@@ -98,9 +99,7 @@
renderBody(writer, cycle);
if (render)
- {
writer.end();
- }
}
public abstract String getType();
1.7 +4 -3 jakarta-tapestry/framework/src/org/apache/tapestry/wml/Select.java
Index: Select.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/wml/Select.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Select.java 28 May 2003 13:41:43 -0000 1.6
+++ Select.java 24 Jun 2003 01:52:19 -0000 1.7
@@ -55,6 +55,7 @@
package org.apache.tapestry.wml;
+import org.apache.commons.lang.StringUtils;
import org.apache.tapestry.AbstractComponent;
import org.apache.tapestry.ApplicationRuntimeException;
import org.apache.tapestry.IMarkupWriter;
@@ -104,11 +105,11 @@
writer.attribute("name", getName());
String value = getValue();
- if (value != null)
+ if (StringUtils.isNotEmpty(value))
writer.attribute("value", value);
String title = getTitle();
- if (title != null)
+ if (StringUtils.isNotEmpty(title))
writer.attribute("title", title);
boolean multiple = isMultiple();
1.6 +5 -4 jakarta-tapestry/framework/src/org/apache/tapestry/wml/Input.java
Index: Input.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/wml/Input.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Input.java 9 Jun 2003 17:03:34 -0000 1.5
+++ Input.java 24 Jun 2003 01:52:19 -0000 1.6
@@ -55,6 +55,7 @@
package org.apache.tapestry.wml;
+import org.apache.commons.lang.StringUtils;
import org.apache.tapestry.AbstractComponent;
import org.apache.tapestry.IBinding;
import org.apache.tapestry.IMarkupWriter;
@@ -89,11 +90,11 @@
writer.attribute("name", getName());
String title = getTitle();
- if (title != null)
+ if (StringUtils.isNotEmpty(title))
writer.attribute("title", title);
String format = getFormat();
- if (format != null)
+ if (StringUtils.isNotEmpty(format))
writer.attribute("format", format);
boolean emptyok = isEmptyok();
@@ -103,7 +104,7 @@
renderInformalParameters(writer, cycle);
String value = readValue();
- if (value != null)
+ if (StringUtils.isNotEmpty(value))
writer.attribute("value", value);
writer.closeTag();
1.5 +3 -2 jakarta-tapestry/framework/src/org/apache/tapestry/wml/Option.java
Index: Option.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/wml/Option.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Option.java 17 Apr 2003 21:33:44 -0000 1.4
+++ Option.java 24 Jun 2003 01:52:19 -0000 1.5
@@ -55,6 +55,7 @@
package org.apache.tapestry.wml;
+import org.apache.commons.lang.StringUtils;
import org.apache.tapestry.AbstractComponent;
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.IRequestCycle;
@@ -89,7 +90,7 @@
writer.begin("option");
String value = getValue();
- if (value != null)
+ if (StringUtils.isNotEmpty(value))
writer.attribute("value", value);
renderInformalParameters(writer, cycle);