Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository
In directory
james.mmbase.org:/tmp/cvs-serv30736/cmsc/contentrepository/src/java/com/finalist/cmsc/repository
Modified Files:
ContentElementUtil.java RepositoryInfo.java
RepositoryUtil.java DerivedDateProcessor.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/contentrepository/src/java/com/finalist/cmsc/repository
See also: http://www.mmbase.org/jira/browse/CMSC-907
Index: ContentElementUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/ContentElementUtil.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- ContentElementUtil.java 10 May 2008 16:31:23 -0000 1.12
+++ ContentElementUtil.java 16 May 2008 11:46:35 -0000 1.13
@@ -11,9 +11,9 @@
import java.util.*;
-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,7 +22,7 @@
import com.finalist.cmsc.mmbase.TypeUtil;
import com.finalist.cmsc.security.SecurityUtil;
-public class ContentElementUtil {
+public final class ContentElementUtil {
private static final String SOURCE = "SOURCE";
private static final String DESTINATION = "DESTINATION";
@@ -110,9 +110,9 @@
return false;
}
try {
- nm = nm.getParent();
- while (!CONTENTELEMENT.equals(nm.getName())) {
- nm = nm.getParent();
+ NodeManager nmTemp = nm.getParent();
+ while (!CONTENTELEMENT.equals(nmTemp.getName())) {
+ nmTemp = nmTemp.getParent();
}
return true;
}
@@ -360,7 +360,7 @@
int operator = (greater ? FieldCompareConstraint.GREATER_EQUAL :
FieldCompareConstraint.LESS_EQUAL);
Field expireField = contentManager.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;
}
@@ -370,7 +370,7 @@
int operator = (greater ? FieldCompareConstraint.GREATER_EQUAL :
FieldCompareConstraint.LESS_EQUAL);
Field publishField = contentManager.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;
}
@@ -383,7 +383,7 @@
NodeManager contentManager =
channel.getCloud().getNodeManager(CONTENTELEMENT);
Field archiveDateField = contentManager.getField(ARCHIVEDATE_FIELD);
- Object archiveDateObj = (archiveDateField.getType() ==
Field.TYPE_DATETIME) ? new Date(date) : new Long(date);
+ Object archiveDateObj = (archiveDateField.getType() ==
Field.TYPE_DATETIME) ? new Date(date) : Long.valueOf(date);
Constraint archivedate = null;
if ("old".equalsIgnoreCase(archive)) {
Index: RepositoryInfo.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/RepositoryInfo.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- RepositoryInfo.java 26 Nov 2007 11:43:41 -0000 1.2
+++ RepositoryInfo.java 16 May 2008 11:46:35 -0000 1.3
@@ -59,7 +59,7 @@
}
if (openChannels.contains(number)) {
- openChannels.remove(new Integer(number));
+ openChannels.remove(Integer.valueOf(number));
}
}
Index: RepositoryUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/RepositoryUtil.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- RepositoryUtil.java 10 May 2008 16:31:23 -0000 1.19
+++ RepositoryUtil.java 16 May 2008 11:46:35 -0000 1.20
@@ -12,19 +12,10 @@
import java.util.*;
import net.sf.mmapps.commons.bridge.*;
-import org.apache.commons.lang.StringUtils;
import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
-import org.mmbase.bridge.Cloud;
-import org.mmbase.bridge.Field;
-import org.mmbase.bridge.Node;
-import org.mmbase.bridge.NodeList;
-import org.mmbase.bridge.NodeManager;
-import org.mmbase.bridge.NodeQuery;
-import org.mmbase.bridge.Relation;
-import org.mmbase.bridge.RelationIterator;
-import org.mmbase.bridge.RelationList;
-import org.mmbase.bridge.RelationManager;
+import org.apache.commons.lang.StringUtils;
+import org.mmbase.bridge.*;
import org.mmbase.bridge.util.Queries;
import org.mmbase.bridge.util.SearchUtil;
import org.mmbase.storage.search.FieldValueDateConstraint;
@@ -35,17 +26,15 @@
import org.mmbase.util.logging.Logging;
import com.finalist.cmsc.mmbase.TreeUtil;
-import com.finalist.cmsc.security.Role;
-import com.finalist.cmsc.security.SecurityUtil;
-import com.finalist.cmsc.security.UserRole;
+import com.finalist.cmsc.security.*;
import com.finalist.cmsc.security.forms.RolesInfo;
-public class RepositoryUtil {
+public final class RepositoryUtil {
public static final String NAME_FIELD = "name";
/** MMbase logging system */
- private static Logger log =
Logging.getLoggerInstance(RepositoryUtil.class.getName());
+ private static final Logger log =
Logging.getLoggerInstance(RepositoryUtil.class.getName());
private static final String SOURCE = "SOURCE";
private static final String DESTINATION = "DESTINATION";
@@ -674,13 +663,16 @@
Field field =
query.getCloud().getNodeManager("contentelement").getField("publishdate");
StepField basicStepField = query.getStepField(field);
if(year != -1) {
- SearchUtil.addConstraint(query, new
BasicFieldValueDateConstraint(basicStepField, new Integer(year),
FieldValueDateConstraint.YEAR));
+ SearchUtil.addConstraint(query, new
BasicFieldValueDateConstraint(basicStepField,
+ Integer.valueOf(year), FieldValueDateConstraint.YEAR));
}
if(month != -1) {
- SearchUtil.addConstraint(query, new
BasicFieldValueDateConstraint(basicStepField, new Integer(month),
FieldValueDateConstraint.MONTH));
+ SearchUtil.addConstraint(query, new
BasicFieldValueDateConstraint(basicStepField,
+ Integer.valueOf(month), FieldValueDateConstraint.MONTH));
}
if(day != -1) {
- SearchUtil.addConstraint(query, new
BasicFieldValueDateConstraint(basicStepField, new Integer(day),
FieldValueDateConstraint.DAY_OF_MONTH));
+ SearchUtil.addConstraint(query, new
BasicFieldValueDateConstraint(basicStepField,
+ Integer.valueOf(day),
FieldValueDateConstraint.DAY_OF_MONTH));
}
}
Index: DerivedDateProcessor.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/DerivedDateProcessor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- DerivedDateProcessor.java 26 Nov 2007 11:43:41 -0000 1.2
+++ DerivedDateProcessor.java 16 May 2008 11:46:35 -0000 1.3
@@ -26,7 +26,7 @@
public class DerivedDateProcessor implements CommitProcessor {
/** MMbase logging system */
- private static Logger log =
Logging.getLoggerInstance(DerivedDateProcessor.class.getName());
+ private static final Logger log =
Logging.getLoggerInstance(DerivedDateProcessor.class.getName());
private static DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd
HH:mm");
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
