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

[Manik Surtani]

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

  Modified:    src/org/jboss/cache/statetransfer  
                        DefaultStateTransferIntegrator.java
                        DefaultStateTransferGenerator.java
  Log:
  Genericised, autoboxed
  
  Revision  Changes    Path
  1.11      +9 -15     JBossCache/src/org/jboss/cache/statetransfer/DefaultStateTransferIntegrator.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DefaultStateTransferIntegrator.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/statetransfer/DefaultStateTransferIntegrator.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- DefaultStateTransferIntegrator.java	30 Dec 2006 17:49:57 -0000	1.10
  +++ DefaultStateTransferIntegrator.java	30 Dec 2006 19:48:45 -0000	1.11
  @@ -22,7 +22,6 @@
   import java.io.IOException;
   import java.io.ObjectInputStream;
   import java.util.HashSet;
  -import java.util.Iterator;
   import java.util.Set;
   
   public class DefaultStateTransferIntegrator implements StateTransferIntegrator
  @@ -38,7 +37,7 @@
   
      private NodeFactory.NodeType nodeType;
   
  -   private Set internalFqns;
  +   private Set<Fqn> internalFqns;
   
      public DefaultStateTransferIntegrator(Fqn targetFqn, CacheImpl cache)
      {
  @@ -187,15 +186,12 @@
       */
      private void notifyAllNodesCreated(Node curr)
      {
  -      Node n;
  -
         if (curr == null) return;
         getCache().getNotifier().notifyNodeCreated(curr.getFqn(), true);
         getCache().getNotifier().notifyNodeCreated(curr.getFqn(), false);
  -      Set children = curr.getChildren();
  -      for (Iterator it = children.iterator(); it.hasNext();)
  +      Set<Node> children = curr.getChildren();
  +      for (Node n : children)
         {
  -         n = (Node) it.next();
            notifyAllNodesCreated(n);
         }
      }
  @@ -222,7 +218,7 @@
      private void integrateTransientState(Node target, ObjectInputStream in) throws IOException,
              ClassNotFoundException
      {
  -      Set retainedNodes = retainInternalNodes(target);
  +      Set<Node> retainedNodes = retainInternalNodes(target);
   
         target.getNodeSPI().removeChildren();
   
  @@ -303,13 +299,12 @@
         return null;
      }
   
  -   private Set retainInternalNodes(Node target)
  +   private Set<Node> retainInternalNodes(Node target)
      {
  -      Set result = new HashSet();
  +      Set<Node> result = new HashSet<Node>();
         Fqn targetFqn = target.getFqn();
  -      for (Iterator it = internalFqns.iterator(); it.hasNext();)
  +      for (Fqn internalFqn : internalFqns)
         {
  -         Fqn internalFqn = (Fqn) it.next();
            if (internalFqn.isChildOf(targetFqn))
            {
               Node internalNode = getInternalNode(target, internalFqn);
  @@ -338,12 +333,11 @@
         return result;
      }
   
  -   private void integrateRetainedNodes(Node root, Set retainedNodes)
  +   private void integrateRetainedNodes(Node root, Set<Node> retainedNodes)
      {
         Fqn rootFqn = root.getFqn();
  -      for (Iterator it = retainedNodes.iterator(); it.hasNext();)
  +      for (Node retained : retainedNodes)
         {
  -         Node retained = (Node) it.next();
            if (retained.getFqn().isChildOf(rootFqn))
            {
               integrateRetainedNode(root, retained);
  
  
  
  1.9       +4 -6      JBossCache/src/org/jboss/cache/statetransfer/DefaultStateTransferGenerator.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DefaultStateTransferGenerator.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/statetransfer/DefaultStateTransferGenerator.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- DefaultStateTransferGenerator.java	30 Dec 2006 17:49:57 -0000	1.8
  +++ DefaultStateTransferGenerator.java	30 Dec 2006 19:48:45 -0000	1.9
  @@ -17,7 +17,6 @@
   import org.jboss.cache.loader.NodeDataExceptionMarker;
   
   import java.io.ObjectOutputStream;
  -import java.util.Iterator;
   import java.util.Map;
   import java.util.Set;
   
  @@ -30,7 +29,7 @@
   
      private CacheImpl cache;
   
  -   private Set internalFqns;
  +   private Set<Fqn> internalFqns;
   
      protected DefaultStateTransferGenerator(CacheImpl cache)
      {
  @@ -138,15 +137,14 @@
         out.writeObject(nd);
   
         // then visit the children
  -      Map children = node.getNodeSPI().getChildrenMap();
  +      Map<Object, Node> children = node.getNodeSPI().getChildrenMap();
         if (children == null)
         {
            return;
         }
  -      for (Iterator it = children.entrySet().iterator(); it.hasNext();)
  +      for (Node child : children.values())
         {
  -         Map.Entry entry = (Map.Entry) it.next();
  -         marshallTransientState((Node) entry.getValue(), out);
  +         marshallTransientState(child, out);
         }
      }