Update of
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement
In directory
james.mmbase.org:/tmp/cvs-serv30736/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement
Modified Files:
MMBaseCacheEntryFactory.java SiteCacheLoader.java
SiteCache.java PortletCacheEntryFactory.java
SiteModelManager.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/services/sitemanagement
See also: http://www.mmbase.org/jira/browse/CMSC-907
Index: MMBaseCacheEntryFactory.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/MMBaseCacheEntryFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- MMBaseCacheEntryFactory.java 26 Nov 2007 11:43:39 -0000 1.3
+++ MMBaseCacheEntryFactory.java 16 May 2008 11:46:34 -0000 1.4
@@ -25,7 +25,7 @@
public abstract class MMBaseCacheEntryFactory implements CacheEntryFactory,
NodeEventListener, RelationEventListener {
/** MMbase logging system */
- private static Logger log =
Logging.getLoggerInstance(MMBaseCacheEntryFactory.class.getName());
+ private static final Logger log =
Logging.getLoggerInstance(MMBaseCacheEntryFactory.class.getName());
private CloudProvider cloudProvider;
private SelfPopulatingCache cache;
@@ -170,12 +170,12 @@
protected Integer getKey(NodeEvent event) {
- return new Integer(event.getNodeNumber());
+ return Integer.valueOf(event.getNodeNumber());
}
protected Integer getKey(RelationEvent event) {
- return new Integer(event.getRelationSourceNumber());
+ return Integer.valueOf(event.getRelationSourceNumber());
}
Index: SiteCacheLoader.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/SiteCacheLoader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- SiteCacheLoader.java 12 Apr 2008 14:26:07 -0000 1.2
+++ SiteCacheLoader.java 16 May 2008 11:46:35 -0000 1.3
@@ -28,7 +28,7 @@
public class SiteCacheLoader {
/** MMbase logging system */
- private static Logger log =
Logging.getLoggerInstance(SiteCacheLoader.class.getName());
+ private static final Logger log =
Logging.getLoggerInstance(SiteCacheLoader.class.getName());
public Map<String, PageTree> loadPageTreeMap(Cloud cloud) {
Map<String, PageTree> newtrees = new HashMap<String, PageTree>();
Index: SiteCache.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/SiteCache.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- SiteCache.java 28 Jan 2008 21:15:43 -0000 1.15
+++ SiteCache.java 16 May 2008 11:46:35 -0000 1.16
@@ -30,7 +30,7 @@
public class SiteCache implements RelationEventListener, NodeEventListener {
/** MMbase logging system */
- private static Logger log =
Logging.getLoggerInstance(SiteCache.class.getName());
+ private static final Logger log =
Logging.getLoggerInstance(SiteCache.class.getName());
private CloudProvider cloudProvider;
private Map<String, PageTree> trees = new HashMap<String, PageTree>();
Index: PortletCacheEntryFactory.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/PortletCacheEntryFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- PortletCacheEntryFactory.java 26 Nov 2007 11:43:39 -0000 1.6
+++ PortletCacheEntryFactory.java 16 May 2008 11:46:35 -0000 1.7
@@ -25,7 +25,7 @@
public class PortletCacheEntryFactory extends MMBaseCacheEntryFactory {
/** MMbase logging system */
- private static Logger log =
Logging.getLoggerInstance(PortletCacheEntryFactory.class.getName());
+ private static final Logger log =
Logging.getLoggerInstance(PortletCacheEntryFactory.class.getName());
public PortletCacheEntryFactory() {
@@ -131,7 +131,7 @@
protected Integer getKey(NodeEvent event) {
int nodeNumber = event.getNodeNumber();
if (isNodeEvent(event, PortletUtil.PORTLET)) {
- return new Integer(nodeNumber);
+ return Integer.valueOf(nodeNumber);
}
if (isNodeEvent(event, PortletUtil.PORTLETPARAMETER) ||
isNodeEvent(event, PortletUtil.NODEPARAMETER)) {
@@ -140,7 +140,7 @@
if (parameter != null) {
Node portlet = PortletUtil.getPortletForParameter(parameter);
if (portlet != null) {
- return new Integer(portlet.getNumber());
+ return Integer.valueOf(portlet.getNumber());
}
}
}
@@ -153,7 +153,7 @@
protected Integer getKey(RelationEvent event) {
int nodeNumber = event.getRelationSourceNumber();
if (isRelationEvent(event, PortletUtil.PORTLET)) {
- return new Integer(nodeNumber);
+ return Integer.valueOf(nodeNumber);
}
if (isRelationEvent(event, PortletUtil.PORTLETPARAMETER) ||
isRelationEvent(event, PortletUtil.NODEPARAMETER)) {
@@ -161,7 +161,7 @@
if (parameter != null) {
Node portlet = PortletUtil.getPortletForParameter(parameter);
if (portlet != null) {
- return new Integer(portlet.getNumber());
+ return Integer.valueOf(portlet.getNumber());
}
}
}
Index: SiteModelManager.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/SiteModelManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- SiteModelManager.java 12 Apr 2008 14:26:07 -0000 1.11
+++ SiteModelManager.java 16 May 2008 11:46:35 -0000 1.12
@@ -34,7 +34,7 @@
private PortletDefinition selectDefinition;
/** MMbase logging system */
- private static Logger log =
Logging.getLoggerInstance(SiteModelManager.class.getName());
+ private static final Logger log =
Logging.getLoggerInstance(SiteModelManager.class.getName());
public SiteModelManager() throws CacheException {
@@ -206,7 +206,7 @@
public View getView(int id) {
if (id > 0) {
try {
- return (View) getCache(VIEW_CACHE).get(new Integer(id));
+ return (View) getCache(VIEW_CACHE).get(Integer.valueOf(id));
}
catch (CacheException e) {
log.info("" + e.getMessage(), e);
@@ -219,7 +219,7 @@
public Stylesheet getStylesheet(int id) {
if (id > 0) {
try {
- return (Stylesheet) getCache(STYLESHEET_CACHE).get(new
Integer(id));
+ return (Stylesheet)
getCache(STYLESHEET_CACHE).get(Integer.valueOf(id));
}
catch (CacheException e) {
log.info("" + e.getMessage(), e);
@@ -232,7 +232,7 @@
public Layout getLayout(int id) {
if (id > 0) {
try {
- return (Layout) getCache(LAYOUT_CACHE).get(new Integer(id));
+ return (Layout) getCache(LAYOUT_CACHE).get(Integer.valueOf(id));
}
catch (CacheException e) {
log.info("" + e.getMessage(), e);
@@ -247,7 +247,7 @@
return selectDefinition;
}
try {
- return (PortletDefinition) getCache(PORTLET_DEFINITION_CACHE).get(new
Integer(id));
+ return (PortletDefinition)
getCache(PORTLET_DEFINITION_CACHE).get(Integer.valueOf(id));
}
catch (CacheException e) {
log.info("" + e.getMessage(), e);
@@ -265,7 +265,7 @@
return empty;
}
try {
- return (Portlet) getCache(PORTLET_CACHE).get(new Integer(id));
+ return (Portlet) getCache(PORTLET_CACHE).get(Integer.valueOf(id));
}
catch (CacheException e) {
log.info("" + e.getMessage(), e);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
