[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/xml XMLController.java XMLServlet.java

[Nico Klasens]

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

Modified Files:
        XMLController.java XMLServlet.java 
Log Message:
CMSC-900 Use commons.lang.SringUtils for string emptiness


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


Index: XMLController.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/xml/XMLController.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- XMLController.java  18 Feb 2008 09:42:15 -0000      1.7
+++ XMLController.java  10 May 2008 16:31:23 -0000      1.8
@@ -10,7 +10,7 @@
 import javax.xml.transform.stream.StreamResult;
 
 import net.sf.mmapps.commons.bridge.NodeFieldComparator;
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
 
 import org.mmbase.bridge.*;
 import org.mmbase.util.logging.Logger;
@@ -318,7 +318,7 @@
             else {
                if ("page".equals(builderName) || "site".equals(builderName)) {
                   url = node.getStringValue("externalurl");
-                  if (StringUtil.isEmpty(url)) {
+                  if (StringUtils.isEmpty(url)) {
                      url = 
ResourcesUtil.getServletPathWithAssociation("content", "/content/*", node
                            .getStringValue("number"), 
node.getStringValue("title"));
                   }
@@ -326,7 +326,7 @@
             }
          }
       }
-      if (!StringUtil.isEmpty(url)) {
+      if (StringUtils.isNotEmpty(url)) {
          if (fieldsAsAttribute) {
             nodeElement.setAttribute("externalUrl", url);
          }


Index: XMLServlet.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/xml/XMLServlet.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- XMLServlet.java     31 Mar 2008 08:59:33 -0000      1.9
+++ XMLServlet.java     10 May 2008 16:31:23 -0000      1.10
@@ -9,7 +9,7 @@
 import javax.xml.transform.TransformerException;
 
 import net.sf.mmapps.commons.util.HttpUtil;
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
 import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
 
 import org.apache.commons.lang.StringUtils;
@@ -124,7 +124,7 @@
 
       // Primary key request
       String pk = request.getParameter(PK);
-      if (!StringUtil.isEmptyOrWhitespace(pk)) {
+      if (StringUtils.isNotBlank(pk)) {
          processSingle(response, cloud, xsl, pk);
          return;
       }
@@ -154,7 +154,7 @@
       for (int i = 0; i < contentTypes.length; i++) {
          log.debug("CONTENTTYPE " + contentTypes[i]);
 
-         if (StringUtil.isEmptyOrWhitespace(contentTypes[i])) {
+         if (StringUtils.isBlank(contentTypes[i])) {
             sendError("Content type is empty", response);
             return;
          }
@@ -234,7 +234,7 @@
          List<String> contentTypes, String fromIndex, String toIndex, String 
filterName, String filterValue,
          String sortName, String sortDirection, String previewdateParam, 
String numbersOnly) {
 
-      if (StringUtil.isEmptyOrWhitespace(channel)) {
+      if (StringUtils.isBlank(channel)) {
          sendError("Channel is empty", response);
          return;
       }
@@ -264,7 +264,7 @@
       int offSet = -1;
       int maxNumber = -1;
 
-      if (!StringUtil.isEmptyOrWhitespace(fromIndex) && 
!StringUtil.isEmptyOrWhitespace(toIndex)) {
+      if (StringUtils.isNotBlank(fromIndex) && 
StringUtils.isNotBlank(toIndex)) {
          offSet = getInt(fromIndex, 0);
          maxNumber = Math.max(getInt(toIndex, -1) - getInt(fromIndex, 0), -1);
       }
@@ -276,7 +276,7 @@
       NodeManager queryNodeManager = query.getNodeManager();
 
       // add other constraints
-      if (!StringUtil.isEmptyOrWhitespace(filterName) && 
!StringUtil.isEmptyOrWhitespace(filterValue)) {
+      if (StringUtils.isNotBlank(filterName) && 
StringUtils.isNotBlank(filterValue)) {
          // check if field exsists
          if (queryNodeManager.hasField(filterName)) {
             Field field = queryNodeManager.getField(filterName);
@@ -354,7 +354,7 @@
 
 
    private String transformXml(String xsl, String xml) throws IOException, 
TransformerException {
-      if (!StringUtil.isEmpty(xsl)) {
+      if (StringUtils.isNotEmpty(xsl)) {
          // get xslt source and xml source
          InputStream xslSrc = 
getClass().getClassLoader().getResourceAsStream(xsl);
          // transform
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs