[jboss-cvs] JBossAS SVN: r107012 - projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/jndi/impl.

[jboss-cvs-commits at lists.jboss.org]

Author: pferraro
Date: 2010-07-21 23:01:30 -0400 (Wed, 21 Jul 2010)
New Revision: 107012

Modified:
   projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/jndi/impl/DistributedTreeManagerImpl.java
Log:
Fix compiler warnings (remove this. reference to static members)
Replace references of HAPartitionCacheHandlerImpl w/ InfinispanHAPartitionCacheHandler interface.

Modified: projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/jndi/impl/DistributedTreeManagerImpl.java
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/jndi/impl/DistributedTreeManagerImpl.java	2010-07-22 02:51:35 UTC (rev 107011)
+++ projects/cluster/ha-server-cache-ispn/trunk/src/main/java/org/jboss/ha/jndi/impl/DistributedTreeManagerImpl.java	2010-07-22 03:01:30 UTC (rev 107012)
@@ -40,12 +40,12 @@
 import javax.naming.NamingException;
 import javax.naming.NotContextException;
 
+import org.infinispan.CacheException;
+import org.infinispan.tree.Fqn;
 import org.infinispan.tree.Node;
 import org.infinispan.tree.TreeCache;
-import org.infinispan.tree.Fqn;
-import org.infinispan.CacheException;
 import org.infinispan.tree.TreeCacheFactory;
-import org.jboss.ha.framework.server.HAPartitionCacheHandlerImpl;
+import org.jboss.ha.framework.server.InfinispanHAPartitionCacheHandler;
 import org.jboss.ha.jndi.spi.DistributedTreeManager;
 import org.jboss.logging.Logger;
 import org.jnp.interfaces.Naming;
@@ -70,15 +70,15 @@
    private static final Fqn FQN_ROOT = Fqn.fromString(DEFAULT_ROOT);
 
    private volatile TreeCache<String, Binding> m_cache;
-   private volatile HAPartitionCacheHandlerImpl cacheHandler;
+   private volatile InfinispanHAPartitionCacheHandler<String, Binding> cacheHandler;
    private final Naming haStub;
 
-   public HAPartitionCacheHandlerImpl getCacheHandler()
+   public InfinispanHAPartitionCacheHandler<String, Binding> getCacheHandler()
    {
       return cacheHandler;
    }
 
-   public void setCacheHandler(HAPartitionCacheHandlerImpl cacheHandler)
+   public void setCacheHandler(InfinispanHAPartitionCacheHandler<String, Binding> cacheHandler)
    {
       this.cacheHandler = cacheHandler;
    }
@@ -155,7 +155,7 @@
       // is the name a context?
       try
       {
-         Fqn temp = Fqn.fromRelativeFqn(this.FQN_ROOT, Fqn.fromString(name.toString()));
+         Fqn temp = Fqn.fromRelativeFqn(FQN_ROOT, Fqn.fromString(name.toString()));
          // TODO why not jst call remove -- why hasChild first?
          if (this.m_cache.getRoot().hasChild(temp))
          {
@@ -180,11 +180,11 @@
       {
          String prefix = name.getPrefix(size - 1).toString();
          Fqn fqn = Fqn.fromString(prefix);
-         ctx = Fqn.fromRelativeFqn(this.FQN_ROOT, fqn);
+         ctx = Fqn.fromRelativeFqn(FQN_ROOT, fqn);
       }
       else
       {
-         ctx = this.FQN_ROOT;
+         ctx = FQN_ROOT;
       }
       
       try
@@ -227,7 +227,7 @@
       // is the name a context?
       try
       {
-         Node<String, Binding> n = this.m_cache.getRoot().getChild(Fqn.fromRelativeFqn(this.FQN_ROOT, Fqn.fromString(name.toString())));
+         Node<String, Binding> n = this.m_cache.getRoot().getChild(Fqn.fromRelativeFqn(FQN_ROOT, Fqn.fromString(name.toString())));
          if (n != null)
          {
             Name fullName = (Name) name.clone();
@@ -251,11 +251,11 @@
       {
          String prefix = name.getPrefix(size - 1).toString();
          Fqn fqn = Fqn.fromString(prefix);
-         ctx = Fqn.fromRelativeFqn(this.FQN_ROOT, fqn);
+         ctx = Fqn.fromRelativeFqn(FQN_ROOT, fqn);
       }
       else
       {
-         ctx = this.FQN_ROOT;
+         ctx = FQN_ROOT;
       }
    
       try
@@ -290,11 +290,11 @@
       {
          ctxName = name.toString();
          Fqn fqn = Fqn.fromString(ctxName);
-         ctx = Fqn.fromRelativeFqn(this.FQN_ROOT, fqn);
+         ctx = Fqn.fromRelativeFqn(FQN_ROOT, fqn);
       }
       else
       {
-         ctx = this.FQN_ROOT;
+         ctx = FQN_ROOT;
       }
       
       boolean exists = this.m_cache.getRoot().hasChild(ctx);
@@ -363,11 +363,11 @@
       {
          ctxName = name.toString();
          Fqn fqn = Fqn.fromString(ctxName);
-         ctx = Fqn.fromRelativeFqn(this.FQN_ROOT, fqn);
+         ctx = Fqn.fromRelativeFqn(FQN_ROOT, fqn);
       }
       else
       {
-         ctx = this.FQN_ROOT;
+         ctx = FQN_ROOT;
       }
       
       boolean exists = this.m_cache.getRoot().hasChild(ctx);
@@ -441,7 +441,7 @@
       // does the new context already exist?
       String str = name.toString();
       Fqn fqn = Fqn.fromString(str);
-      Fqn ctx = Fqn.fromRelativeFqn(this.FQN_ROOT, fqn);
+      Fqn ctx = Fqn.fromRelativeFqn(FQN_ROOT, fqn);
       if (this.m_cache.getRoot().hasChild(ctx))
       {
          throw new NameAlreadyBoundException(str);
@@ -454,11 +454,11 @@
       {
          String prefix = name.getPrefix(size - 1).toString();
          Fqn fqn2 = Fqn.fromString(prefix);
-         pctx = Fqn.fromRelativeFqn(this.FQN_ROOT, fqn2);
+         pctx = Fqn.fromRelativeFqn(FQN_ROOT, fqn2);
       }
       else
       {
-         pctx = this.FQN_ROOT;
+         pctx = FQN_ROOT;
       }
       
       boolean exists = this.m_cache.getRoot().hasChild(pctx);
@@ -502,11 +502,11 @@
       {
          String prefix = name.getPrefix(size - 1).toString();
          Fqn fqn = Fqn.fromString(prefix);
-         ctx = Fqn.fromRelativeFqn(this.FQN_ROOT, fqn);
+         ctx = Fqn.fromRelativeFqn(FQN_ROOT, fqn);
       }
       else
       {
-         ctx = this.FQN_ROOT;
+         ctx = FQN_ROOT;
       }
    
       boolean exists = this.m_cache.getRoot().hasChild(ctx);