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

[Elias Ross]

  User: genman  
  Date: 06/12/08 13:49:18

  Modified:    src/org/jboss/cache/optimistic 
                        TransactionWorkspaceImpl.java
  Log:
  JBCACHE-892 Use JDK1.5 concurrent classes
  
  Revision  Changes    Path
  1.14      +2 -16     JBossCache/src/org/jboss/cache/optimistic/TransactionWorkspaceImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TransactionWorkspaceImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/optimistic/TransactionWorkspaceImpl.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- TransactionWorkspaceImpl.java	20 Sep 2006 16:28:58 -0000	1.13
  +++ TransactionWorkspaceImpl.java	8 Dec 2006 18:49:18 -0000	1.14
  @@ -6,13 +6,12 @@
    */
   package org.jboss.cache.optimistic;
   
  -import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
   import org.jboss.cache.Fqn;
  -import org.jboss.cache.TreeCache;
   
   import java.util.Map;
   import java.util.SortedMap;
   import java.util.TreeMap;
  +import java.util.concurrent.ConcurrentHashMap;
   
   /**
    * Contains a mapping of Fqn to {@link WorkspaceNode}s.
  @@ -24,10 +23,7 @@
   public class TransactionWorkspaceImpl implements TransactionWorkspace
   {
   
  -   private static FqnComparator fqnComparator = new FqnComparator();
  -
      private Map nodes;
  -   private TreeCache cache;
      private boolean versioningImplicit = true;
   
      public TransactionWorkspaceImpl()
  @@ -35,16 +31,6 @@
         nodes = new ConcurrentHashMap();
      }
   
  -   public void setCache(TreeCache cache)
  -   {
  -      this.cache = cache;
  -   }
  -
  -   public TreeCache getCache()
  -   {
  -      return cache;
  -   }
  -
      /**
       * Returns the nodes.
       */
  @@ -78,7 +64,7 @@
   
      public SortedMap getNodesAfter(Fqn fqn)
      {
  -      SortedMap sm = new TreeMap(fqnComparator);
  +      SortedMap sm = new TreeMap();
         sm.putAll(nodes);
         return sm.tailMap(fqn);
      }