Update of
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation
In directory
james.mmbase.org:/tmp/cvs-serv30736/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation
Modified Files:
PortletUtil.java NavigationUtil.java PagesUtil.java
ServerUtil.java NavigationInfo.java SiteUtil.java
Log Message:
CMSC-907 Code Quality with PMD
Add final modifier to Util classes
Add final modifier to Logger instances
Change Boolean, Integer and Long instantiation to valueOf calls
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation
See also: http://www.mmbase.org/jira/browse/CMSC-907
Index: PortletUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/PortletUtil.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- PortletUtil.java 10 May 2008 16:31:23 -0000 1.13
+++ PortletUtil.java 16 May 2008 11:46:32 -0000 1.14
@@ -14,17 +14,17 @@
import net.sf.mmapps.commons.bridge.CloneUtil;
import net.sf.mmapps.commons.bridge.RelationUtil;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.mmbase.bridge.*;
import org.mmbase.bridge.util.SearchUtil;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
-public class PortletUtil {
+public final class PortletUtil {
/** MMbase logging system */
- private static Logger log =
Logging.getLoggerInstance(PortletUtil.class.getName());
+ private static final Logger log =
Logging.getLoggerInstance(PortletUtil.class.getName());
private static final String SOURCE = "source";
private static final String DESTINATION = "destination";
Index: NavigationUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/NavigationUtil.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- NavigationUtil.java 10 May 2008 16:31:23 -0000 1.20
+++ NavigationUtil.java 16 May 2008 11:46:32 -0000 1.21
@@ -11,15 +11,13 @@
import java.util.*;
-import java.util.List;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.sf.mmapps.commons.bridge.*;
+import net.sf.mmapps.commons.bridge.RelationUtil;
import net.sf.mmapps.commons.util.HttpUtil;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.mmbase.bridge.*;
import org.mmbase.bridge.util.SearchUtil;
@@ -27,7 +25,7 @@
import com.finalist.cmsc.security.*;
import com.finalist.cmsc.security.forms.RolesInfo;
-public class NavigationUtil {
+public final class NavigationUtil {
public static final String NAVREL = "navrel";
public static final String ALLOWREL = "allowrel";
Index: PagesUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/PagesUtil.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- PagesUtil.java 10 May 2008 16:31:23 -0000 1.13
+++ PagesUtil.java 16 May 2008 11:46:32 -0000 1.14
@@ -12,9 +12,9 @@
import java.util.*;
import net.sf.mmapps.commons.bridge.*;
-import org.apache.commons.lang.StringUtils;
import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
+import org.apache.commons.lang.StringUtils;
import org.mmbase.bridge.*;
import org.mmbase.bridge.util.SearchUtil;
import org.mmbase.storage.search.*;
@@ -22,13 +22,13 @@
import org.mmbase.util.logging.Logging;
import com.finalist.cmsc.mmbase.TreeUtil;
-import com.finalist.cmsc.services.workflow.Workflow;
import com.finalist.cmsc.services.publish.Publish;
+import com.finalist.cmsc.services.workflow.Workflow;
-public class PagesUtil {
+public final class PagesUtil {
/** MMbase logging system */
- private static Logger log =
Logging.getLoggerInstance(PagesUtil.class.getName());
+ private static final Logger log =
Logging.getLoggerInstance(PagesUtil.class.getName());
private static final String SOURCE = "source";
private static final String DESTINATION = "DESTINATION";
@@ -64,6 +64,10 @@
public static final String POS_FIELD = "pos";
+ private PagesUtil() {
+ // utility
+ }
+
public static NodeManager getNodeManager(Cloud cloud) {
return TreeUtil.getNodeManager(cloud, PAGE);
}
@@ -409,7 +413,7 @@
PortletUtil.addPortlet(newPage, portlet, name);
}
else {
- throw new NullPointerException("Single portletdefinition
does not have a portlet instance");
+ throw new IllegalArgumentException("Single
portletdefinition does not have a portlet instance");
}
}
}
@@ -498,7 +502,7 @@
int operator = (greater ? FieldCompareConstraint.GREATER_EQUAL :
FieldCompareConstraint.LESS_EQUAL);
Field expireField = pageManager.getField(EXPIREDATE_FIELD);
- Object expireDateObj = (expireField.getType() == Field.TYPE_DATETIME) ?
new Date(date) : new Long(date);
+ Object expireDateObj = (expireField.getType() == Field.TYPE_DATETIME) ?
new Date(date) : Long.valueOf(date);
Constraint expirydate =
query.createConstraint(query.getStepField(expireField), operator,
expireDateObj);
return expirydate;
}
@@ -508,7 +512,7 @@
int operator = (greater ? FieldCompareConstraint.GREATER_EQUAL :
FieldCompareConstraint.LESS_EQUAL);
Field publishField = pageManager.getField(PUBLISHDATE_FIELD);
- Object publishDateObj = (publishField.getType() == Field.TYPE_DATETIME)
? new Date(date) : new Long(date);
+ Object publishDateObj = (publishField.getType() == Field.TYPE_DATETIME)
? new Date(date) : Long.valueOf(date);
Constraint publishdate =
query.createConstraint(query.getStepField(publishField), operator,
publishDateObj);
return publishdate;
}
Index: ServerUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/ServerUtil.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ServerUtil.java 30 Apr 2008 08:54:38 -0000 1.7
+++ ServerUtil.java 16 May 2008 11:46:32 -0000 1.8
@@ -19,7 +19,7 @@
public class ServerUtil {
/** MMBase logging system */
- private static Logger log =
Logging.getLoggerInstance(ServerUtil.class.getName());
+ private static final Logger log =
Logging.getLoggerInstance(ServerUtil.class.getName());
private static boolean live;
private static boolean single;
Index: NavigationInfo.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/NavigationInfo.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- NavigationInfo.java 30 Nov 2007 10:58:31 -0000 1.4
+++ NavigationInfo.java 16 May 2008 11:46:32 -0000 1.5
@@ -56,7 +56,7 @@
}
if (openItems.contains(number)) {
- openItems.remove(new Integer(number));
+ openItems.remove(Integer.valueOf(number));
}
}
Index: SiteUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/SiteUtil.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- SiteUtil.java 10 May 2008 16:31:23 -0000 1.5
+++ SiteUtil.java 16 May 2008 11:46:32 -0000 1.6
@@ -10,13 +10,12 @@
package com.finalist.cmsc.navigation;
import org.apache.commons.lang.StringUtils;
-
import org.mmbase.bridge.*;
import com.finalist.cmsc.security.Role;
import com.finalist.cmsc.security.SecurityUtil;
-public class SiteUtil {
+public final class SiteUtil {
private static final String STAGING_FRAGMENT = "stagingfragment";
private static final String LIVE_FRAGMENT = "urlfragment";
@@ -37,7 +36,7 @@
public static boolean isSite(Node node) {
if (node == null) {
- throw new NullPointerException("node can not be null");
+ throw new IllegalArgumentException("node can not be null");
}
return SITE.equals(node.getNodeManager().getName());
}
@@ -55,8 +54,7 @@
public static NodeList getSites(Cloud cloud) {
NodeManager sitesManager = cloud.getNodeManager(SITE);
- NodeList sites = sitesManager.getList(sitesManager.createQuery());
- return sites;
+ return sitesManager.getList(sitesManager.createQuery());
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
