Update of
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts
In directory
james.mmbase.org:/tmp/cvs-serv30736/cmsc/utilities/src/java/com/finalist/cmsc/struts
Modified Files:
MMBaseAction.java WizardInitAction.java MMBaseForm.java
PagerAction.java MMBaseFormlessAction.java FormlessAction.java
WizardListAction.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/utilities/src/java/com/finalist/cmsc/struts
See also: http://www.mmbase.org/jira/browse/CMSC-907
Index: MMBaseAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/MMBaseAction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- MMBaseAction.java 3 Mar 2008 10:29:44 -0000 1.8
+++ MMBaseAction.java 16 May 2008 11:46:35 -0000 1.9
@@ -11,17 +11,12 @@
import java.util.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import javax.servlet.http.*;
import net.sf.mmapps.commons.bridge.CloudUtil;
import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
-import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.*;
import org.mmbase.bridge.*;
import org.mmbase.security.Rank;
import org.mmbase.util.Encode;
@@ -63,7 +58,7 @@
}
}
if (cloud == null) {
- throw new NullPointerException("Unable to get a cloud from action,
request, session and cloudprovider");
+ throw new IllegalArgumentException("Unable to get a cloud from
action, request, session and cloudprovider");
}
else {
Rank requiredRank = getRequiredRank();
Index: WizardInitAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/WizardInitAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- WizardInitAction.java 10 May 2008 16:31:23 -0000 1.6
+++ WizardInitAction.java 16 May 2008 11:46:35 -0000 1.7
@@ -1,12 +1,12 @@
package com.finalist.cmsc.struts;
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import org.apache.commons.lang.StringUtils;
-
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.mmbase.bridge.*;
@@ -19,7 +19,7 @@
public class WizardInitAction extends MMBaseFormlessAction {
/** MMbase logging system */
- private static Logger log =
Logging.getLoggerInstance(WizardInitAction.class.getName());
+ private static final Logger log =
Logging.getLoggerInstance(WizardInitAction.class.getName());
private static String DEFAULT_SESSION_KEY = "editwizard";
@@ -64,7 +64,7 @@
contenttype = node.getNodeManager().getName();
}
else {
- throw new RuntimeException("No criteria available to find a
wizard."
+ throw new IllegalStateException("No criteria available to find a
wizard."
+ " Provide a contenttype or objectnumber");
}
}
@@ -87,7 +87,7 @@
NodeManager manager = cloud.getNodeManager("editwizards");
list = manager.getList("nodepath = '" + contenttype + "'", null,
null);
if (list.isEmpty()) {
- throw new RuntimeException("Unable to find a wizard for
contenttype " + contenttype + " or objectnumber "
+ throw new IllegalStateException("Unable to find a wizard for
contenttype " + contenttype + " or objectnumber "
+ objectNumber);
}
Index: MMBaseForm.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/MMBaseForm.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- MMBaseForm.java 10 May 2008 16:31:23 -0000 1.4
+++ MMBaseForm.java 16 May 2008 11:46:35 -0000 1.5
@@ -24,7 +24,7 @@
private static final long serialVersionUID = 4264517673164742392L;
/** MMbase logging system */
- private static Logger log =
Logging.getLoggerInstance(MMBaseForm.class.getName());
+ private static final Logger log =
Logging.getLoggerInstance(MMBaseForm.class.getName());
private int id;
Index: PagerAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/PagerAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- PagerAction.java 26 Nov 2007 11:43:41 -0000 1.3
+++ PagerAction.java 16 May 2008 11:46:35 -0000 1.4
@@ -28,7 +28,7 @@
public ActionForward execute(ActionMapping mapping, ActionForm form,
HttpServletRequest request,
HttpServletResponse response, Cloud cloud) throws Exception {
PagerForm pagerForm = (PagerForm) form;
- request.setAttribute(RESULT_COUNT, new
Integer(pagerForm.getResultCount()));
+ request.setAttribute(RESULT_COUNT,
Integer.valueOf(pagerForm.getResultCount()));
request.setAttribute(RESULTS, pagerForm.getResults());
return mapping.getInputForward();
Index: MMBaseFormlessAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/MMBaseFormlessAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- MMBaseFormlessAction.java 26 Nov 2007 11:43:41 -0000 1.3
+++ MMBaseFormlessAction.java 16 May 2008 11:46:35 -0000 1.4
@@ -20,7 +20,7 @@
public abstract class MMBaseFormlessAction extends MMBaseAction {
/** MMbase logging system */
- private static Logger log =
Logging.getLoggerInstance(MMBaseFormlessAction.class.getName());
+ private static final Logger log =
Logging.getLoggerInstance(MMBaseFormlessAction.class.getName());
@Override
Index: FormlessAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/FormlessAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- FormlessAction.java 26 Nov 2007 11:43:41 -0000 1.3
+++ FormlessAction.java 16 May 2008 11:46:35 -0000 1.4
@@ -19,7 +19,7 @@
public abstract class FormlessAction extends Action {
/** MMbase logging system */
- private static Logger log =
Logging.getLoggerInstance(FormlessAction.class.getName());
+ private static final Logger log =
Logging.getLoggerInstance(FormlessAction.class.getName());
@Override
Index: WizardListAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/WizardListAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- WizardListAction.java 10 May 2008 16:31:23 -0000 1.5
+++ WizardListAction.java 16 May 2008 11:46:35 -0000 1.6
@@ -1,15 +1,11 @@
package com.finalist.cmsc.struts;
-import org.apache.commons.lang.StringUtils;
+import javax.servlet.http.HttpServletRequest;
+import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.mmbase.bridge.Cloud;
-import org.mmbase.bridge.Node;
-import org.mmbase.bridge.NodeManager;
-import org.mmbase.bridge.NodeList;
-
-import javax.servlet.http.HttpServletRequest;
+import org.mmbase.bridge.*;
/**
* @author Nico Klasens
@@ -26,7 +22,7 @@
String wizardname = request.getParameter("wizardname");
if (nodetype == null && wizardname == null) {
- throw new RuntimeException(" Provide a nodetype or wizardname
requestparameter");
+ throw new IllegalArgumentException(" Provide a nodetype or wizardname
requestparameter");
}
String sessionkey = request.getParameter("sessionkey");
if (sessionkey == null || sessionkey.length() == 0) {
@@ -47,7 +43,7 @@
}
if (list == null || list.isEmpty()) {
- throw new RuntimeException("Unable to find a wizard for nodetype " +
nodetype + " or wizardname " + wizardname);
+ throw new IllegalArgumentException("Unable to find a wizard for
nodetype " + nodetype + " or wizardname " + wizardname);
}
Node wizard = list.getNode(0);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
