azalea/fixminer_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the bug of DEL actions' hierarchical subactions.

Browse Source
This commit is contained in:
Kui LIU
2017-08-11 18:38:55 +02:00
parent cb4cb22da8
commit ce630f2402
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/edu/lu/uni/serval/gumtree/regroup/HierarchicalRegrouper.java
+6
View File
@@ -5,6 +5,7 @@ import java.util.List;
import com.github.gumtreediff.actions.model.Action; import com.github.gumtreediff.actions.model.Action;
import com.github.gumtreediff.actions.model.Addition; import com.github.gumtreediff.actions.model.Addition;
import com.github.gumtreediff.actions.model.Delete;
import com.github.gumtreediff.actions.model.Insert; import com.github.gumtreediff.actions.model.Insert;
import com.github.gumtreediff.actions.model.Move; import com.github.gumtreediff.actions.model.Move;
import com.github.gumtreediff.tree.ITree; import com.github.gumtreediff.tree.ITree;
@@ -109,6 +110,7 @@ public class HierarchicalRegrouper {
Action action = actSet.getAction(); Action action = actSet.getAction();
if (action instanceof Move && !(act instanceof Move)) continue; // If action is MOV, its children must be MOV. if (action instanceof Move && !(act instanceof Move)) continue; // If action is MOV, its children must be MOV.
if (action instanceof Insert && !(act instanceof Addition)) continue;// If action is INS, its children must be MOV or INS. if (action instanceof Insert && !(act instanceof Addition)) continue;// If action is INS, its children must be MOV or INS.
if (action instanceof Delete && !(act instanceof Delete)) continue;// If action is DEL, its children must be DEL.
if (action.equals(parentAct)) { // actSet is the parent of actionSet. if (action.equals(parentAct)) { // actSet is the parent of actionSet.
actionSet.setParent(actSet); actionSet.setParent(actSet);
@@ -146,6 +148,7 @@ public class HierarchicalRegrouper {
Action action = actionSet.getAction(); Action action = actionSet.getAction();
if (action instanceof Move && !(act instanceof Move)) continue; // If action is MOV, its children must be MOV. if (action instanceof Move && !(act instanceof Move)) continue; // If action is MOV, its children must be MOV.
if (action instanceof Insert && !(act instanceof Addition)) continue;// If action is INS, its children must be MOV or INS. if (action instanceof Insert && !(act instanceof Addition)) continue;// If action is INS, its children must be MOV or INS.
if (action instanceof Delete && !(act instanceof Delete)) continue;// If action is DEL, its children must be DEL.
ITree tree = action.getNode(); ITree tree = action.getNode();
if (tree.equals(parentTree)) { // actionSet is the parent of actSet. if (tree.equals(parentTree)) { // actionSet is the parent of actSet.
@@ -192,6 +195,9 @@ public class HierarchicalRegrouper {
if (act instanceof Move && !(action instanceof Move)) { if (act instanceof Move && !(action instanceof Move)) {
continue; continue;
} }
if (act instanceof Delete && !(action instanceof Delete)) {
continue;
}
return act; return act;
} }
} }