[jboss-cvs] JBossCache/src/org/jboss/cache/loader/jdbm ...

[Brian Stansberry]

  User: bstansberry
  Date: 06/10/26 15:30:21

  Modified:    src/org/jboss/cache/loader/jdbm   JdbmCacheLoader.java
  Added:       src/org/jboss/cache/loader/jdbm   JdbmCacheLoaderConfig.java
  Log:
  Make cache loader Config classes top level classes
  
  Revision  Changes    Path
  1.17      +5 -55     JBossCache/src/org/jboss/cache/loader/jdbm/JdbmCacheLoader.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JdbmCacheLoader.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/loader/jdbm/JdbmCacheLoader.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  --- JdbmCacheLoader.java	23 Oct 2006 05:46:40 -0000	1.16
  +++ JdbmCacheLoader.java	26 Oct 2006 19:30:21 -0000	1.17
  @@ -56,7 +56,7 @@
    * plans to fix this.
    *
    * @author Elias Ross
  - * @version $Id: JdbmCacheLoader.java,v 1.16 2006/10/23 05:46:40 bstansberry Exp $
  + * @version $Id: JdbmCacheLoader.java,v 1.17 2006/10/26 19:30:21 bstansberry Exp $
    */
   public class JdbmCacheLoader extends AbstractCacheLoader
   {
  @@ -66,7 +66,7 @@
      private static final String NODE = "N";
      private static final String NAME = "JdbmCacheLoader";
   
  -   private Config config;
  +   private JdbmCacheLoaderConfig config;
      private String cacheDbName;
      private RecordManager recman;
      private BTree tree;
  @@ -210,13 +210,13 @@
      {
         checkNotOpen();
         
  -      if (base instanceof Config)
  +      if (base instanceof JdbmCacheLoaderConfig)
         {
  -         this.config = (Config) base;
  +         this.config = (JdbmCacheLoaderConfig) base;
         }
         else
         {
  -         config = new Config(base);
  +         config = new JdbmCacheLoaderConfig(base);
         }
         
         if (log.isTraceEnabled()) log.trace("Configuring cache loader with location = " + config.getLocation());
  @@ -707,54 +707,4 @@
                 " size=" + size;
      }
      
  -   public static class Config extends IndividualCacheLoaderConfig
  -   {
  -      private static final long serialVersionUID = 4626734068542420865L;
  -      
  -      private String location;
  -
  -      public Config() 
  -      {
  -         setClassName(JdbmCacheLoader.class.getName());
  -      }
  -      
  -      private Config(IndividualCacheLoaderConfig base)
  -      {
  -         setClassName(JdbmCacheLoader.class.getName());
  -         populateFromBaseConfig(base);
  -      }
  -      
  -      public String getLocation()
  -      {
  -         return location;
  -      }
  -
  -      public void setLocation(String location)
  -      {
  -         testImmutability("location");
  -         this.location = location;
  -      }
  -
  -      public void setProperties(Properties props)
  -      {
  -         super.setProperties(props);
  -         setLocation(props != null ? props.getProperty("location") : null);
  -      }
  -
  -      public boolean equals(Object obj)
  -      {
  -         if (obj instanceof Config && equalsExcludingProperties(obj))
  -         {
  -            return  safeEquals(location, ((Config) obj).location);
  -         }
  -         return false;
  -      }
  -      
  -      public int hashCode()
  -      {
  -         return 31 * hashCodeExcludingProperties() + (location == null ? 0 : location.hashCode());
  -      }     
  -      
  -   }
  -
   }
  
  
  
  1.1      date: 2006/10/26 19:30:21;  author: bstansberry;  state: Exp;JBossCache/src/org/jboss/cache/loader/jdbm/JdbmCacheLoaderConfig.java
  
  Index: JdbmCacheLoaderConfig.java
  ===================================================================
  package org.jboss.cache.loader.jdbm;
  
  import java.util.Properties;
  
  import org.jboss.cache.config.CacheLoaderConfig.IndividualCacheLoaderConfig;
  
  public class JdbmCacheLoaderConfig extends IndividualCacheLoaderConfig
  {
     private static final long serialVersionUID = 4626734068542420865L;
     
     private String location;
  
     public JdbmCacheLoaderConfig() 
     {
        setClassName(JdbmCacheLoader.class.getName());
     }
     
     /**
      * For use by {@link JdbmCacheLoader}.
      * 
      * @param base generic config object created by XML parsing.
      */
     JdbmCacheLoaderConfig(IndividualCacheLoaderConfig base)
     {
        setClassName(JdbmCacheLoader.class.getName());
        populateFromBaseConfig(base);
     }
     
     public String getLocation()
     {
        return location;
     }
  
     public void setLocation(String location)
     {
        testImmutability("location");
        this.location = location;
     }
  
     public void setProperties(Properties props)
     {
        super.setProperties(props);
        setLocation(props != null ? props.getProperty("location") : null);
     }
  
     public boolean equals(Object obj)
     {
        if (obj instanceof JdbmCacheLoaderConfig && equalsExcludingProperties(obj))
        {
           return  safeEquals(location, ((JdbmCacheLoaderConfig) obj).location);
        }
        return false;
     }
     
     public int hashCode()
     {
        return 31 * hashCodeExcludingProperties() + (location == null ? 0 : location.hashCode());
     }     
     
  }