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

[Manik Surtani]

  User: msurtani
  Date: 06/12/30 14:48:46

  Modified:    src/org/jboss/cache     CacheImpl.java CacheListener.java
                        Fqn.java Node.java
  Log:
  Genericised, autoboxed
  
  Revision  Changes    Path
  1.2       +4 -4      JBossCache/src/org/jboss/cache/CacheImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/CacheImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- CacheImpl.java	30 Dec 2006 17:49:54 -0000	1.1
  +++ CacheImpl.java	30 Dec 2006 19:48:46 -0000	1.2
  @@ -98,7 +98,7 @@
    * @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
    * @author Brian Stansberry
    * @author Daniel Huang (dhuang at jboss.org)
  - * @version $Id: CacheImpl.java,v 1.1 2006/12/30 17:49:54 msurtani Exp $
  + * @version $Id: CacheImpl.java,v 1.2 2006/12/30 19:48:46 msurtani Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -165,7 +165,7 @@
       * Set<Fqn> of Fqns of the topmost node of internal regions that should
       * not included in standard state transfers.
       */
  -   protected Set internalFqns = new CopyOnWriteArraySet();
  +   protected Set<Fqn> internalFqns = new CopyOnWriteArraySet<Fqn>();
   
      /**
       * True if state was initialized during start-up.
  @@ -903,7 +903,7 @@
       *
       * @return an unmodifiable Set<Fqn>.  Will not return <code>null</code>.
       */
  -   public Set getInternalFqns()
  +   public Set<Fqn> getInternalFqns()
      {
         return Collections.unmodifiableSet(internalFqns);
      }
  @@ -3097,7 +3097,7 @@
      public void setConfiguration(Configuration configuration)
      {
         this.configuration = configuration;
  -      configuration.setTreeCache(this);
  +      configuration.setCacheImpl(this);
      }
   
      /**
  
  
  
  1.4       +3 -3      JBossCache/src/org/jboss/cache/CacheListener.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheListener.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/CacheListener.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- CacheListener.java	18 Oct 2006 11:07:54 -0000	1.3
  +++ CacheListener.java	30 Dec 2006 19:48:46 -0000	1.4
  @@ -42,7 +42,7 @@
       * @param pre
       * @param isLocal
       */
  -   void nodeModified(Fqn fqn, boolean pre, boolean isLocal, Map data);
  +   void nodeModified(Fqn fqn, boolean pre, boolean isLocal, Map<Object, Object> data);
   
      /**
       * Called before and after a {@link Node} is removed.  Data passed in is
  @@ -55,7 +55,7 @@
       * @param pre
       * @param isLocal
       */
  -   void nodeRemoved(Fqn fqn, boolean pre, boolean isLocal, Map data);
  +   void nodeRemoved(Fqn fqn, boolean pre, boolean isLocal, Map<Object, Object> data);
   
      /**
       * Called when a {@link Node} is visisted, i.e., {@link Node#get(Object)} is called.
  @@ -80,7 +80,7 @@
       * The data passed in is an unmodifiable {@link Map}.  If the {@link Node} is loaded but the data isn't
       * (for example when calling {@link Node#getChildren()}) the data map is null.
       */
  -   void nodeLoaded(Fqn fqn, boolean pre, Map data);
  +   void nodeLoaded(Fqn fqn, boolean pre, Map<Object, Object> data);
   
      /**
       * Called when a {@link Node} is moved using the {@link Node#move(Node)} API.
  
  
  
  1.44      +2 -2      JBossCache/src/org/jboss/cache/Fqn.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Fqn.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/Fqn.java,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -b -r1.43 -r1.44
  --- Fqn.java	30 Dec 2006 17:49:54 -0000	1.43
  +++ Fqn.java	30 Dec 2006 19:48:46 -0000	1.44
  @@ -42,7 +42,7 @@
    * <p/>
    * Another way to look at it is that the "/" separarator is only parsed when it form sa  part of a String passed in to Fqn.fromString() and not otherwise.
    *
  - * @version $Revision: 1.43 $
  + * @version $Revision: 1.44 $
    */
   public class Fqn implements Cloneable, Externalizable, Comparable<Fqn>
   {
  @@ -78,7 +78,7 @@
                       public Object run()
                       {
                          String compatible = System.getProperty("jboss.cache.fqn.123compatible");
  -                       REL_123_COMPATIBLE = Boolean.valueOf(compatible).booleanValue();
  +                       REL_123_COMPATIBLE = Boolean.valueOf(compatible);
                          return null;
                       }
                    });
  
  
  
  1.52      +2 -2      JBossCache/src/org/jboss/cache/Node.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Node.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/Node.java,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -b -r1.51 -r1.52
  --- Node.java	30 Dec 2006 17:49:54 -0000	1.51
  +++ Node.java	30 Dec 2006 19:48:46 -0000	1.52
  @@ -116,7 +116,7 @@
       *
       * @param m
       */
  -   void put(Map m);
  +   void put(Map<Object, Object> m);
   
      /**
       * Puts an entire map of key-value pairs into the current node's data map.  If any data exists, existing
  @@ -126,7 +126,7 @@
       *
       * @param m
       */
  -   void putIfNull(Map m);
  +   void putIfNull(Map<Object, Object> m);
   
   
      /**