[infinispan-commits] Infinispan SVN: r532 - trunk/core/src/main/java/org/infinispan/loaders.

[infinispan-commits at lists.jboss.org]

Author: vblagojevic at jboss.com
Date: 2009-07-09 05:21:07 -0400 (Thu, 09 Jul 2009)
New Revision: 532

Modified:
   trunk/core/src/main/java/org/infinispan/loaders/AbstractCacheLoaderConfig.java
   trunk/core/src/main/java/org/infinispan/loaders/AbstractCacheStoreConfig.java
Log:
AbstractCacheStoreConfig extends AbstractCacheLoaderConfig

Modified: trunk/core/src/main/java/org/infinispan/loaders/AbstractCacheLoaderConfig.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loaders/AbstractCacheLoaderConfig.java	2009-07-09 08:48:28 UTC (rev 531)
+++ trunk/core/src/main/java/org/infinispan/loaders/AbstractCacheLoaderConfig.java	2009-07-09 09:21:07 UTC (rev 532)
@@ -1,6 +1,7 @@
 package org.infinispan.loaders;
 
 import org.infinispan.CacheException;
+import org.infinispan.config.ConfigurationAttribute;
 import org.infinispan.config.PluggableConfigurationComponent;
 
 /**
@@ -11,12 +12,15 @@
  */
 public class AbstractCacheLoaderConfig extends PluggableConfigurationComponent implements CacheLoaderConfig {
 
-   private String cacheLoaderClassName;
+   protected String cacheLoaderClassName;
 
    public String getCacheLoaderClassName() {
       return cacheLoaderClassName;
    }
 
+   @ConfigurationAttribute(name = "class", 
+            containingElement = "loader", 
+            description = "Full class name of a cache loader")
    public void setCacheLoaderClassName(String className) {
       if (className == null || className.length() == 0) return;
       testImmutability("cacheLoaderClassName");

Modified: trunk/core/src/main/java/org/infinispan/loaders/AbstractCacheStoreConfig.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loaders/AbstractCacheStoreConfig.java	2009-07-09 08:48:28 UTC (rev 531)
+++ trunk/core/src/main/java/org/infinispan/loaders/AbstractCacheStoreConfig.java	2009-07-09 09:21:07 UTC (rev 532)
@@ -1,7 +1,6 @@
 package org.infinispan.loaders;
 
 import org.infinispan.config.ConfigurationAttribute;
-import org.infinispan.config.PluggableConfigurationComponent;
 import org.infinispan.loaders.decorators.AsyncStoreConfig;
 import org.infinispan.loaders.decorators.SingletonStoreConfig;
 import org.infinispan.util.Util;
@@ -19,7 +18,7 @@
  * @version $Id$
  * @since 4.0
  */
-public class AbstractCacheStoreConfig extends PluggableConfigurationComponent implements CacheStoreConfig {
+public class AbstractCacheStoreConfig extends AbstractCacheLoaderConfig implements CacheStoreConfig {
    private boolean ignoreModifications;
    private boolean fetchPersistentState;
    private boolean purgeOnStartup;
@@ -27,7 +26,6 @@
    private AsyncStoreConfig asyncStoreConfig = new AsyncStoreConfig();
 
    private boolean purgeSynchronously = false;
-   protected String cacheLoaderClassName;
 
    public boolean isPurgeSynchronously() {
       return purgeSynchronously;
@@ -38,19 +36,6 @@
       this.purgeSynchronously = purgeSynchronously;
    }
 
-   public String getCacheLoaderClassName() {
-      return cacheLoaderClassName;
-   }
-
-   @ConfigurationAttribute(name = "class", 
-            containingElement = "loader", 
-            description = "Full class name of a cache loader")
-   public void setCacheLoaderClassName(String className) {
-      if (className == null || className.length() == 0) return;
-      testImmutability("cacheLoaderClassName");
-      this.cacheLoaderClassName = className;
-   }
-
    public boolean isPurgeOnStartup() {
       return purgeOnStartup;
    }
@@ -159,11 +144,7 @@
    @Override
    public AbstractCacheStoreConfig clone() {
       AbstractCacheStoreConfig clone = null;
-      try {
-         clone = (AbstractCacheStoreConfig) super.clone();
-      } catch (CloneNotSupportedException e) {
-         throw new RuntimeException("Should not happen!", e);
-      }
+      clone = (AbstractCacheStoreConfig) super.clone();
       if (singletonStoreConfig != null) clone.setSingletonStoreConfig(singletonStoreConfig.clone());
       if (asyncStoreConfig != null) clone.setAsyncStoreConfig(asyncStoreConfig.clone());
       return clone;