Fix tabbing.... Please fix your editors so they do tabbing correctly!!! (Spaces...

[IRC.git] / Robust / src / Analysis / OoOJava / SESELock.java

diff --git a/Robust/src/Analysis/OoOJava/SESELock.java b/Robust/src/Analysis/OoOJava/SESELock.java
index 4b4e6c6419a4dc2533d3a404623172f888065442..d36eeec80c4e2a9bf29c7fdee9e3b16344436203 100644 (file)
--- a/Robust/src/Analysis/OoOJava/SESELock.java
+++ b/Robust/src/Analysis/OoOJava/SESELock.java
@@ -32,7 +32,7 @@ public class SESELock {
   }
 
   public void addConflictEdge(ConflictEdge e) {
-      conflictEdgeSet.add(e);
+    conflictEdgeSet.add(e);
   }
 
   public boolean containsConflictEdge(ConflictEdge e) {
@@ -54,44 +54,44 @@ public class SESELock {
   public boolean hasSelfCoarseEdge(ConflictNode node) {
 
     Set<ConflictEdge> set = node.getEdgeSet();
-    for (Iterator iterator = set.iterator(); iterator.hasNext();) {
+    for (Iterator iterator = set.iterator(); iterator.hasNext(); ) {
       ConflictEdge conflictEdge = (ConflictEdge) iterator.next();
 
       if (conflictEdge.isCoarseEdge() && conflictEdge.getVertexU() == conflictEdge.getVertexV()) {
-        return true;
+       return true;
       }
     }
     return false;
   }
-  
+
   public boolean hasSelfEdge(ConflictNode node) {
 
     Set<ConflictEdge> set = node.getEdgeSet();
-    for (Iterator iterator = set.iterator(); iterator.hasNext();) {
+    for (Iterator iterator = set.iterator(); iterator.hasNext(); ) {
       ConflictEdge conflictEdge = (ConflictEdge) iterator.next();
 
       if ((!conflictEdge.isCoarseEdge()) && conflictEdge.getVertexU() == conflictEdge.getVertexV()) {
-        return true;
+       return true;
       }
     }
     return false;
   }
-  
+
   public boolean hasCoarseEdgeWithParentCoarse(ConflictNode node) {
 
     Set<ConflictEdge> set = node.getEdgeSet();
-    for (Iterator iterator = set.iterator(); iterator.hasNext();) {
+    for (Iterator iterator = set.iterator(); iterator.hasNext(); ) {
       ConflictEdge conflictEdge = (ConflictEdge) iterator.next();
 
       ConflictNode cNode;
       if (conflictEdge.getVertexU() == node) {
-        cNode = conflictEdge.getVertexV();
+       cNode = conflictEdge.getVertexV();
       } else {
-        cNode = conflictEdge.getVertexU();
+       cNode = conflictEdge.getVertexU();
       }
       Integer cNodeTypeIn = nodeTypeMap.get(cNode);
       if (cNodeTypeIn != null && cNodeTypeIn.intValue() == ConflictNode.PARENT_COARSE) {
-        return true;
+       return true;
       }
     }
     return false;
@@ -110,42 +110,42 @@ public class SESELock {
     } else {
       return null;
     }
-    
-    
+
+
     int count = 0;
     Set<ConflictEdge> edgeSet = newNode.getEdgeSet();
-    for (Iterator iterator = edgeSet.iterator(); iterator.hasNext();) {
+    for (Iterator iterator = edgeSet.iterator(); iterator.hasNext(); ) {
       ConflictEdge conflictEdge = (ConflictEdge) iterator.next();
       if (!conflictEdge.getVertexU().equals(newNode)
           && conflictNodeSet.contains(conflictEdge.getVertexU())) {
-        count++;
+       count++;
       } else if (!conflictEdge.getVertexV().equals(newNode)
-          && conflictNodeSet.contains(conflictEdge.getVertexV())) {
-        count++;
+                 && conflictNodeSet.contains(conflictEdge.getVertexV())) {
+       count++;
       }
     }
-    
-    if(conflictNodeSet.contains(newNode)){
+
+    if(conflictNodeSet.contains(newNode)) {
       count++;
     }
 
-    if(isWriteNode(newNode)){
+    if(isWriteNode(newNode)) {
       if (count == conflictNodeSet.size()) {
-        // connected to all current nodes in group
-        return newNode;
+       // connected to all current nodes in group
+       return newNode;
       }
-    }else{
+    } else {
       // it is read node
       int writeNodeCount=0;
-      for (Iterator iterator = conflictNodeSet.iterator(); iterator.hasNext();) {
-        ConflictNode node = (ConflictNode) iterator.next();
-        if(isWriteNode(node)){
-          writeNodeCount++;
-        }
+      for (Iterator iterator = conflictNodeSet.iterator(); iterator.hasNext(); ) {
+       ConflictNode node = (ConflictNode) iterator.next();
+       if(isWriteNode(node)) {
+         writeNodeCount++;
+       }
       }
       if (count == writeNodeCount) {
-        // connected to all current write nodes in group
-        return newNode;
+       // connected to all current write nodes in group
+       return newNode;
       }
     }
 
@@ -179,17 +179,17 @@ public class SESELock {
       return false;
     }
 
-    ConflictNode nodeToAdd = conflictNodeSet.contains(newEdge.getVertexU()) ? newEdge.getVertexV()
-        : newEdge.getVertexU();
+    ConflictNode nodeToAdd = conflictNodeSet.contains(newEdge.getVertexU())?newEdge.getVertexV()
+                            :newEdge.getVertexU();
 
     HashSet<ConflictNode> nodeSet = new HashSet<ConflictNode>(conflictNodeSet);
 
-    for (Iterator edgeIter = nodeToAdd.getEdgeSet().iterator(); edgeIter.hasNext();) {
+    for (Iterator edgeIter = nodeToAdd.getEdgeSet().iterator(); edgeIter.hasNext(); ) {
       ConflictEdge edge = (ConflictEdge) edgeIter.next();
       if (nodeSet.contains(edge.getVertexU())) {
-        nodeSet.remove(edge.getVertexU());
+       nodeSet.remove(edge.getVertexU());
       } else if (nodeSet.contains(edge.getVertexV())) {
-        nodeSet.remove(edge.getVertexV());
+       nodeSet.remove(edge.getVertexV());
       }
     }
 
@@ -200,7 +200,7 @@ public class SESELock {
   public String toString() {
     String rtr = "";
 
-    for (Iterator<ConflictNode> iterator = conflictNodeSet.iterator(); iterator.hasNext();) {
+    for (Iterator<ConflictNode> iterator = conflictNodeSet.iterator(); iterator.hasNext(); ) {
       ConflictNode node = (ConflictNode) iterator.next();
       rtr += " " + node + "::" + getNodeType(node);
     }