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

[Manik Surtani]

  User: msurtani
  Date: 07/07/12 10:29:05

  Modified:    src/org/jboss/cache/interceptors  
                        CacheLoaderInterceptor.java
                        ActivationInterceptor.java
  Log:
  Better method naming
  
  Revision  Changes    Path
  1.87      +4 -4      JBossCache/src/org/jboss/cache/interceptors/CacheLoaderInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheLoaderInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/CacheLoaderInterceptor.java,v
  retrieving revision 1.86
  retrieving revision 1.87
  diff -u -b -r1.86 -r1.87
  --- CacheLoaderInterceptor.java	12 Jul 2007 14:26:34 -0000	1.86
  +++ CacheLoaderInterceptor.java	12 Jul 2007 14:29:05 -0000	1.87
  @@ -25,7 +25,7 @@
    * Loads nodes that don't exist at the time of the call into memory from the CacheLoader
    *
    * @author Bela Ban
  - * @version $Id: CacheLoaderInterceptor.java,v 1.86 2007/07/12 14:26:34 msurtani Exp $
  + * @version $Id: CacheLoaderInterceptor.java,v 1.87 2007/07/12 14:29:05 msurtani Exp $
    */
   public class CacheLoaderInterceptor extends Interceptor implements CacheLoaderInterceptorMBean
   {
  @@ -213,7 +213,7 @@
      private void loadChildren(Fqn fqn, NodeSPI node, boolean recursive, boolean isMove) throws Throwable
      {
   
  -      if (node != null && node.getChildrenLoaded())
  +      if (node != null && node.isChildrenLoaded())
         {
            return;
         }
  @@ -277,7 +277,7 @@
            log.trace("mustLoad, node null");
            return true;
         }
  -      if (!n.getDataLoaded())
  +      if (!n.isDataLoaded())
         {
            log.trace("must Load, uninitialized");
            return true;
  @@ -405,7 +405,7 @@
            }
         }
   
  -      if (n != null && !n.getDataLoaded())
  +      if (n != null && !n.isDataLoaded())
         {
            log.trace("Setting dataLoaded to true");
            n.setDataLoaded(true);
  
  
  
  1.59      +5 -5      JBossCache/src/org/jboss/cache/interceptors/ActivationInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ActivationInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/ActivationInterceptor.java,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -b -r1.58 -r1.59
  --- ActivationInterceptor.java	11 Jun 2007 12:58:17 -0000	1.58
  +++ ActivationInterceptor.java	12 Jul 2007 14:29:05 -0000	1.59
  @@ -26,7 +26,7 @@
    * their attributes have been initialized and their children have been loaded in memory.
    *
    * @author <a href="mailto:{hmesha at novell.com}">{Hany Mesha}</a>
  - * @version $Id: ActivationInterceptor.java,v 1.58 2007/06/11 12:58:17 msurtani Exp $
  + * @version $Id: ActivationInterceptor.java,v 1.59 2007/07/12 14:29:05 msurtani Exp $
    */
   public class ActivationInterceptor extends CacheLoaderInterceptor implements ActivationInterceptorMBean
   {
  @@ -161,7 +161,7 @@
                  // Then notify the listeners that the node has been activated.
                  NodeSPI n = getNode(fqn);// don't load
                  // node not null and attributes have been loaded?
  -               if (n != null && n.getDataLoaded())
  +               if (n != null && n.isDataLoaded())
                  {
                     if (!n.getChildrenDirect().isEmpty())
                     {
  @@ -198,14 +198,14 @@
       */
      private boolean allInitialized(NodeSPI<?, ?> n)
      {
  -      if (!n.getChildrenLoaded())
  +      if (!n.isChildrenLoaded())
         {
            return false;
         }
   
         for (NodeSPI child : n.getChildrenDirect())
         {
  -         if (!child.getDataLoaded())
  +         if (!child.isDataLoaded())
            {
               return false;
            }
  @@ -311,7 +311,7 @@
                  {
                     NodeSPI n = getNode(fqn);// don't load
                     // node not null and attributes have been loaded?
  -                  if (n != null && n.getDataLoaded())
  +                  if (n != null && n.isDataLoaded())
                     {
                        // has children?
                        if (!n.getChildrenDirect().isEmpty() && allInitialized(n))