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

[Manik Surtani]

  User: msurtani
  Date: 07/06/06 08:43:48

  Modified:    src/org/jboss/cache/interceptors   CacheMgmtInterceptor.java
                        CreateIfNotExistsInterceptor.java
  Log:
  Removed a lot of deprecation
  
  Revision  Changes    Path
  1.32      +3 -53     JBossCache/src/org/jboss/cache/interceptors/CacheMgmtInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheMgmtInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/CacheMgmtInterceptor.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -b -r1.31 -r1.32
  --- CacheMgmtInterceptor.java	23 May 2007 15:22:03 -0000	1.31
  +++ CacheMgmtInterceptor.java	6 Jun 2007 12:43:48 -0000	1.32
  @@ -23,7 +23,6 @@
   
   import org.jboss.cache.CacheSPI;
   import org.jboss.cache.InvocationContext;
  -import org.jboss.cache.jmx.CacheNotificationBroadcaster;
   import org.jboss.cache.marshall.MethodCall;
   import org.jboss.cache.marshall.MethodDeclarations;
   
  @@ -34,61 +33,12 @@
    * Captures cache management statistics
    *
    * @author Jerry Gauthier
  - * @version $Id: CacheMgmtInterceptor.java,v 1.31 2007/05/23 15:22:03 msurtani Exp $
  + * @version $Id: CacheMgmtInterceptor.java,v 1.32 2007/06/06 12:43:48 msurtani Exp $
    */
   public class CacheMgmtInterceptor
           extends Interceptor
           implements CacheMgmtInterceptorMBean
   {
  -   /**
  -    * @deprecated use constants in {@link CacheNotificationBroadcaster}
  -    */
  -   public static final String NOTIF_CACHE_STARTED = CacheNotificationBroadcaster.NOTIF_CACHE_STARTED;
  -   /**
  -    * @deprecated use constants in {@link CacheNotificationBroadcaster}
  -    */
  -   public static final String NOTIF_CACHE_STOPPED = CacheNotificationBroadcaster.NOTIF_CACHE_STOPPED;
  -   /**
  -    * @deprecated use constants in {@link CacheNotificationBroadcaster}
  -    */
  -   public static final String NOTIF_NODE_CREATED = CacheNotificationBroadcaster.NOTIF_NODE_CREATED;
  -   /**
  -    * @deprecated use constants in {@link CacheNotificationBroadcaster}
  -    */
  -   public static final String NOTIF_NODE_MODIFIED = CacheNotificationBroadcaster.NOTIF_NODE_MODIFIED;
  -   /**
  -    * @deprecated use constants in {@link CacheNotificationBroadcaster}
  -    */
  -   public static final String NOTIF_NODE_REMOVED = CacheNotificationBroadcaster.NOTIF_NODE_REMOVED;
  -   /**
  -    * @deprecated use constants in {@link CacheNotificationBroadcaster}
  -    */
  -   public static final String NOTIF_NODE_MOVED = CacheNotificationBroadcaster.NOTIF_NODE_MOVED;
  -   /**
  -    * @deprecated use constants in {@link CacheNotificationBroadcaster}
  -    */
  -   public static final String NOTIF_NODE_VISITED = CacheNotificationBroadcaster.NOTIF_NODE_VISITED;
  -   /**
  -    * @deprecated use constants in {@link CacheNotificationBroadcaster}
  -    */
  -   public static final String NOTIF_NODE_EVICTED = CacheNotificationBroadcaster.NOTIF_NODE_EVICTED;
  -   /**
  -    * @deprecated use constants in {@link CacheNotificationBroadcaster}
  -    */
  -   public static final String NOTIF_NODE_LOADED = CacheNotificationBroadcaster.NOTIF_NODE_LOADED;
  -   /**
  -    * @deprecated use constants in {@link CacheNotificationBroadcaster}
  -    */
  -   public static final String NOTIF_NODE_ACTIVATED = CacheNotificationBroadcaster.NOTIF_NODE_ACTIVATED;
  -   /**
  -    * @deprecated use constants in {@link CacheNotificationBroadcaster}
  -    */
  -   public static final String NOTIF_NODE_PASSIVATED = CacheNotificationBroadcaster.NOTIF_NODE_PASSIVATED;
  -   /**
  -    * @deprecated use constants in {@link CacheNotificationBroadcaster}
  -    */
  -   public static final String NOTIF_VIEW_CHANGED = CacheNotificationBroadcaster.NOTIF_VIEW_CHANGED;
  -
      private long m_hit_times = 0;
      private long m_miss_times = 0;
      private long m_store_times = 0;
  
  
  
  1.28      +9 -8      JBossCache/src/org/jboss/cache/interceptors/CreateIfNotExistsInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CreateIfNotExistsInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/CreateIfNotExistsInterceptor.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -b -r1.27 -r1.28
  --- CreateIfNotExistsInterceptor.java	23 May 2007 15:22:03 -0000	1.27
  +++ CreateIfNotExistsInterceptor.java	6 Jun 2007 12:43:48 -0000	1.28
  @@ -20,9 +20,10 @@
    * (depending on the create_if_not_exists argument)
    *
    * @author Bela Ban
  - * @version $Id: CreateIfNotExistsInterceptor.java,v 1.27 2007/05/23 15:22:03 msurtani Exp $
  + * @version $Id: CreateIfNotExistsInterceptor.java,v 1.28 2007/06/06 12:43:48 msurtani Exp $
    * @deprecated This code is not used anymore and will be removed in a future unlock
    */
  + at Deprecated
   public class CreateIfNotExistsInterceptor extends Interceptor
   {