projects
/
IRC.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f5357c9
)
bug fix: RCR sets its proper conflict type.
author
yeom
<yeom>
Tue, 26 Oct 2010 00:14:31 +0000
(
00:14
+0000)
committer
yeom
<yeom>
Tue, 26 Oct 2010 00:14:31 +0000
(
00:14
+0000)
Robust/src/Analysis/OoOJava/ConflictGraph.java
patch
|
blob
|
history
diff --git
a/Robust/src/Analysis/OoOJava/ConflictGraph.java
b/Robust/src/Analysis/OoOJava/ConflictGraph.java
index 7d49343b982a45711d9dfba04e56bd97b0cc6375..ae569b8d0198d5f7be8f5c5f7d6e99f72c5e8a68 100644
(file)
--- a/
Robust/src/Analysis/OoOJava/ConflictGraph.java
+++ b/
Robust/src/Analysis/OoOJava/ConflictGraph.java
@@
-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;
}