[MMBASE CVS] contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement SiteCache.java PortletCacheEntryFactory.java MMBaseCacheEntryFactory.java

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement
In directory 
james.mmbase.org:/tmp/cvs-serv19747/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement

Modified Files:
        SiteCache.java PortletCacheEntryFactory.java 
        MMBaseCacheEntryFactory.java 
Log Message:
CMSC-907 Code Quality with PMD
PMD error fixes


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: SiteCache.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/SiteCache.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- SiteCache.java      4 Jun 2008 15:53:11 -0000       1.18
+++ SiteCache.java      9 Jun 2008 21:23:24 -0000       1.19
@@ -11,7 +11,6 @@
 
 import java.util.*;
 
-import net.sf.mmapps.modules.cloudprovider.CloudProvider;
 import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
 
 import org.mmbase.bridge.Cloud;
@@ -27,17 +26,15 @@
 import com.finalist.cmsc.services.sitemanagement.tree.PageTree;
 import com.finalist.cmsc.services.sitemanagement.tree.PageTreeNode;
 
-public class SiteCache implements RelationEventListener, NodeEventListener {
+public final class SiteCache implements RelationEventListener, 
NodeEventListener {
 
    /** MMbase logging system */
    private static final Logger log = 
Logging.getLoggerInstance(SiteCache.class.getName());
 
-   private CloudProvider cloudProvider;
    private Map<String, PageTree> trees = new HashMap<String, PageTree>();
 
 
    public SiteCache() {
-      this.cloudProvider = CloudProviderFactory.getCloudProvider();
       doSetupCache();
       registerListeners();
    }
@@ -60,13 +57,8 @@
    }
 
 
-   protected Cloud getAdminCloud() {
-      return cloudProvider.getAdminCloud();
-   }
-
-
    protected Cloud getCloud() {
-      return cloudProvider.getAnonymousCloud();
+      return CloudProviderFactory.getCloudProvider().getAnonymousCloud();
    }
 
    public void createTree(int siteId, String sitefragment) {


Index: PortletCacheEntryFactory.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/PortletCacheEntryFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- PortletCacheEntryFactory.java       16 May 2008 11:46:35 -0000      1.7
+++ PortletCacheEntryFactory.java       9 Jun 2008 21:23:24 -0000       1.8
@@ -36,7 +36,7 @@
 
 
    @Override
-   protected Serializable loadEntry(Serializable key) throws Exception {
+   protected Serializable loadEntry(Serializable key) {
       return loadPortlet((Integer) key);
    }
 


Index: MMBaseCacheEntryFactory.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/MMBaseCacheEntryFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- MMBaseCacheEntryFactory.java        16 May 2008 11:46:34 -0000      1.4
+++ MMBaseCacheEntryFactory.java        9 Jun 2008 21:23:24 -0000       1.5
@@ -11,17 +11,17 @@
 
 import java.io.Serializable;
 
+import net.sf.ehcache.constructs.blocking.CacheEntryFactory;
+import net.sf.ehcache.constructs.blocking.SelfPopulatingCache;
+import net.sf.mmapps.modules.cloudprovider.CloudProvider;
+import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
+
 import org.mmbase.bridge.*;
 import org.mmbase.core.event.*;
 import org.mmbase.module.core.MMBase;
 import org.mmbase.util.logging.Logger;
 import org.mmbase.util.logging.Logging;
 
-import net.sf.ehcache.constructs.blocking.CacheEntryFactory;
-import net.sf.ehcache.constructs.blocking.SelfPopulatingCache;
-import net.sf.mmapps.modules.cloudprovider.CloudProvider;
-import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
-
 public abstract class MMBaseCacheEntryFactory implements CacheEntryFactory, 
NodeEventListener, RelationEventListener {
 
    /** MMbase logging system */
@@ -43,7 +43,7 @@
    protected abstract Serializable loadEntry(Serializable key) throws 
Exception;
 
 
-   protected void registerListener(String nodeType) {
+   protected final void registerListener(String nodeType) {
       MMBase.getMMBase().addNodeRelatedEventsListener(nodeType, this);
    }
 
@@ -74,14 +74,12 @@
 
 
    protected Cloud getAdminCloud() {
-      Cloud cloud = cloudProvider.getAdminCloud();
-      return cloud;
+      return cloudProvider.getAdminCloud();
    }
 
 
    protected Cloud getCloud() {
-      Cloud cloud = cloudProvider.getAnonymousCloud();
-      return cloud;
+      return cloudProvider.getAnonymousCloud();
    }
 
 
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs