[MMBASE CVS] contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form TextTag.java SelectTag.java OptionTag.java MultipleOptionTag.java

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form
In directory 
james.mmbase.org:/tmp/cvs-serv30190/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form

Modified Files:
        TextTag.java SelectTag.java OptionTag.java 
        MultipleOptionTag.java 
Log Message:
CMSC-900 Use commons.lang.SringUtils for string emptiness


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form
See also: http://www.mmbase.org/jira/browse/CMSC-900


Index: TextTag.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/TextTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- TextTag.java        26 Nov 2007 11:43:41 -0000      1.4
+++ TextTag.java        10 May 2008 16:31:23 -0000      1.5
@@ -17,7 +17,7 @@
 
 import org.apache.commons.lang.StringEscapeUtils;
 
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
 
 public class TextTag extends SimpleTagSupport {
    public String var;
@@ -41,11 +41,11 @@
 
       String attValue = (String) request.getAttribute(var);
       String inputValue = "";
-      if (!StringUtil.isEmpty(attValue)) {
+      if (StringUtils.isNotEmpty(attValue)) {
          inputValue = attValue;
       }
       else {
-         if (!StringUtil.isEmpty(value)) {
+         if (StringUtils.isNotEmpty(value)) {
             inputValue = attValue;
          }
       }


Index: SelectTag.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/SelectTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- SelectTag.java      3 Mar 2008 15:56:01 -0000       1.5
+++ SelectTag.java      10 May 2008 16:31:23 -0000      1.6
@@ -17,7 +17,7 @@
 import javax.servlet.jsp.tagext.JspFragment;
 import javax.servlet.jsp.tagext.SimpleTagSupport;
 
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
 
 import org.apache.commons.lang.StringEscapeUtils;
 
@@ -47,12 +47,12 @@
 
       selected = (String) request.getAttribute(var);
 
-      if (StringUtil.isEmpty(selected)) {
+      if (StringUtils.isEmpty(selected)) {
          selected = defaultValue;
       }
       
       String myOnChange = "";
-      if (!StringUtil.isEmpty(onchange)){
+      if (StringUtils.isNotEmpty(onchange)){
          myOnChange = " " + "onchange=\"" + 
StringEscapeUtils.escapeXml(onchange) + "\"";  
       } 
       


Index: OptionTag.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/OptionTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- OptionTag.java      26 Nov 2007 11:43:41 -0000      1.4
+++ OptionTag.java      10 May 2008 16:31:23 -0000      1.5
@@ -15,7 +15,7 @@
 import javax.servlet.jsp.PageContext;
 import javax.servlet.jsp.tagext.SimpleTagSupport;
 
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
 
 import com.finalist.cmsc.util.bundles.JstlUtil;
 
@@ -37,11 +37,11 @@
          ctx.getOut().print(" selected=\"selected\"");
       }
       ctx.getOut().print(">");
-      if (!StringUtil.isEmpty(name)) {
+      if (StringUtils.isNotEmpty(name)) {
          ctx.getOut().print(name);
       }
       else {
-         if (!StringUtil.isEmpty(message)) {
+         if (StringUtils.isNotEmpty(message)) {
             HttpServletRequest request = (HttpServletRequest) ctx.getRequest();
             ctx.getOut().print(JstlUtil.getMessage(request, message));
          }


Index: MultipleOptionTag.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/MultipleOptionTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- MultipleOptionTag.java      26 Nov 2007 11:43:41 -0000      1.2
+++ MultipleOptionTag.java      10 May 2008 16:31:23 -0000      1.3
@@ -15,7 +15,7 @@
 import javax.servlet.jsp.PageContext;
 import javax.servlet.jsp.tagext.SimpleTagSupport;
 
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
 
 import com.finalist.cmsc.util.bundles.JstlUtil;
 
@@ -38,11 +38,11 @@
          ctx.getOut().print(" selected=\"selected\"");
       }
       ctx.getOut().print(">");
-      if (!StringUtil.isEmpty(name)) {
+      if (StringUtils.isNotEmpty(name)) {
          ctx.getOut().print(name);
       }
       else {
-         if (!StringUtil.isEmpty(message)) {
+         if (StringUtils.isNotEmpty(message)) {
             HttpServletRequest request = (HttpServletRequest) ctx.getRequest();
             ctx.getOut().print(JstlUtil.getMessage(request, message));
          }
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs