bug fix: RCR sets its proper conflict type.
authoryeom <yeom>
Tue, 26 Oct 2010 00:14:31 +0000 (00:14 +0000)
committeryeom <yeom>
Tue, 26 Oct 2010 00:14:31 +0000 (00:14 +0000)
Robust/src/Analysis/OoOJava/ConflictGraph.java

index 7d49343b982a45711d9dfba04e56bd97b0cc6375..ae569b8d0198d5f7be8f5c5f7d6e99f72c5e8a68 100644 (file)
@@ -327,6 +327,7 @@ public class ConflictGraph {
                   if (!nodeA.equals(nodeB)) {
                     addCoarseEffect(nodeB, asB, effectB);
                   }
+                  conflictType=ConflictGraph.COARSE_GRAIN_EDGE;
                 } else {
                   return ConflictGraph.COARSE_GRAIN_EDGE;
                 }
@@ -439,6 +440,7 @@ public class ConflictGraph {
                   if (!nodeA.equals(nodeB)) {
                     addCoarseEffect(nodeB, asB, effectB);
                   }
+                  conflictType=ConflictGraph.COARSE_GRAIN_EDGE;
                 } else {
                   return ConflictGraph.COARSE_GRAIN_EDGE;
                 }