Update of
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/util
In directory
james.mmbase.org:/tmp/cvs-serv30736/cmsc/utilities/src/java/com/finalist/cmsc/util
Modified Files:
NameUtil.java XsltUtil.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/util
See also: http://www.mmbase.org/jira/browse/CMSC-907
Index: NameUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/util/NameUtil.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- NameUtil.java 26 Nov 2007 11:43:46 -0000 1.2
+++ NameUtil.java 16 May 2008 11:46:35 -0000 1.3
@@ -5,7 +5,7 @@
* name-String from the firstname and/or middlename and/or lastname of a person
* in several nameformats.
*/
-public class NameUtil {
+public final class NameUtil {
/**
* Use this value to indicate the nameformat to use is 'firstname middlename
* lastname' (default).
@@ -120,8 +120,7 @@
}
// Build the correct full name, depending on the nameformat specified
- switch (nameFormat) {
- case NAMEFORMAT_LASTFIRSTMIDDLE:
+ if (nameFormat == NAMEFORMAT_LASTFIRSTMIDDLE) {
if (lastNameAvailable) {
retValue.append(lastName);
if (firstNameAvailable || middleNameAvailable) {
@@ -133,12 +132,12 @@
}
if (middleNameAvailable) {
if (lastNameAvailable) {
- retValue.append(" ");
+ retValue.append(' ');
}
retValue.append(middleName);
}
- break;
- default:
+ }
+ else {
// NAMEFORMAT_FIRSTMIDDLELAST
if (firstNameAvailable) {
retValue.append(firstName);
@@ -146,14 +145,14 @@
if (middleNameAvailable) {
if (firstNameAvailable) {
// There's already a firstname, so add a space
- retValue.append(" ");
+ retValue.append(' ');
}
retValue.append(middleName);
}
if (lastNameAvailable) {
if (firstNameAvailable || middleNameAvailable) {
// There's already something there, so we need a space
- retValue.append(" ");
+ retValue.append(' ');
}
retValue.append(lastName);
}
Index: XsltUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/util/XsltUtil.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- XsltUtil.java 26 Nov 2007 11:43:46 -0000 1.3
+++ XsltUtil.java 16 May 2008 11:46:35 -0000 1.4
@@ -1,21 +1,12 @@
package com.finalist.cmsc.util;
-import java.io.CharArrayWriter;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.io.StringReader;
+import java.io.*;
import java.net.URL;
import java.util.Iterator;
import java.util.Map;
import javax.servlet.http.HttpServletResponse;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.URIResolver;
+import javax.xml.transform.*;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
@@ -158,7 +149,7 @@
*/
public void setXSLSource(Object obj) {
if (obj == null) {
- throw new NullPointerException("You cannot have a null XSL source.");
+ throw new IllegalArgumentException("You cannot have a null XSL
source.");
}
xslSourceType = getType(obj);
@@ -177,7 +168,7 @@
*/
public void setXMLSource(Object obj) {
if (obj == null) {
- throw new NullPointerException("You cannot have a null XML source.");
+ throw new IllegalArgumentException("You cannot have a null XML
source.");
}
xmlSourceType = getType(obj);
@@ -296,8 +287,9 @@
* The params to be placed. Standard name/value pairs.
*/
private static void setStylesheetParams(Transformer transformer,
Map<String, Object> params) {
- if (params == null)
+ if (params == null) {
return;
+ }
Iterator<Map.Entry<String, Object>> i = params.entrySet().iterator();
while (i.hasNext()) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
