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

Remove BreakStatements.

Browse Source
This commit is contained in:
Kui LIU
2017-08-12 20:00:06 +02:00
parent 325d66d7a9
commit 1ea8bf70b0
2 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/edu/lu/uni/serval/gumtree/regroup/HierarchicalRegrouper.java
+26 -26
View File
@@ -122,19 +122,19 @@ public class HierarchicalRegrouper {
} }
break; break;
} else { } else {
if (!(action instanceof Addition) && !(act instanceof Addition)) { // if (!(action instanceof Addition) && !(act instanceof Addition)) {
// || (action instanceof Insert && (act instanceof Insert))) { //// || (action instanceof Insert && (act instanceof Insert))) {
int startPosition = act.getPosition(); // int startPosition = act.getPosition();
int length = act.getLength(); // int length = act.getLength();
int startP = action.getPosition(); // int startP = action.getPosition();
int leng = action.getLength(); // int leng = action.getLength();
//
if (startP > startPosition + length) { // if (startP > startPosition + length) {
break; // break;
} else if (startP + leng < startPosition) { // } else if (startP + leng < startPosition) {
continue; // continue;
} // }
} // }
// SubAction range： startP <= startPosition && startPosition + length <= startP + leng // SubAction range： startP <= startPosition && startPosition + length <= startP + leng
addToActionSets(actionSet, parentAct, actSet.getSubActions()); addToActionSets(actionSet, parentAct, actSet.getSubActions());
} }
@@ -156,19 +156,19 @@ public class HierarchicalRegrouper {
actionSet.getSubActions().add(actSet); actionSet.getSubActions().add(actSet);
return true; return true;
} else { } else {
if (!(action instanceof Addition) && !(act instanceof Addition)) { // if (!(action instanceof Addition) && !(act instanceof Addition)) {
// || (action instanceof Insert && (act instanceof Insert))) { //// || (action instanceof Insert && (act instanceof Insert))) {
int startPosition = act.getPosition(); // int startPosition = act.getPosition();
int length = act.getLength(); // int length = act.getLength();
int startP = action.getPosition(); // int startP = action.getPosition();
int leng = action.getLength(); // int leng = action.getLength();
//
if (startP > startPosition + length) { // if (startP > startPosition + length) {
break; // break;
} else if (startP + leng < startPosition) { // } else if (startP + leng < startPosition) {
continue; // continue;
} // }
} // }
// SubAction range： startP <= startPosition && startPosition + length <= startP + leng // SubAction range： startP <= startPosition && startPosition + length <= startP + leng
List<HierarchicalActionSet> subActionSets = actionSet.getSubActions(); List<HierarchicalActionSet> subActionSets = actionSet.getSubActions();
if (subActionSets.size() > 0) { if (subActionSets.size() > 0) {
src/main/java/edu/lu/uni/serval/gumtree/regroup/HunkActionFilter.java
+9 -9
View File
@@ -329,9 +329,9 @@ public class HunkActionFilter {
} }
} }
} else { } else {
if (bugEndLine < actionBugStartLine) { // if (bugEndLine < actionBugStartLine) {
break; // break;
} // }
if (bugStartLine <= actionBugStartLine && actionBugEndLine <= bugEndLine) { if (bugStartLine <= actionBugStartLine && actionBugEndLine <= bugEndLine) {
if (startLine <= actionBugEndLine && endLine >= actionBugStartLine) { if (startLine <= actionBugEndLine && endLine >= actionBugStartLine) {
violation.getActionSets().add(actionSet); violation.getActionSets().add(actionSet);
@@ -402,9 +402,9 @@ public class HunkActionFilter {
} }
} }
} else { } else {
if (bugHunkEndLine < actionBugStartLine) { // if (bugHunkEndLine < actionBugStartLine) {
break; // break;
} // }
if (bugHunkStartLine <= actionBugStartLine && actionBugEndLine <= bugHunkEndLine) { if (bugHunkStartLine <= actionBugStartLine && actionBugEndLine <= bugHunkEndLine) {
if (violationStartLine <= actionBugEndLine && violationEndLine >= actionBugStartLine) { if (violationStartLine <= actionBugEndLine && violationEndLine >= actionBugStartLine) {
violation.getActionSets().add(actionSet); violation.getActionSets().add(actionSet);
@@ -570,9 +570,9 @@ public class HunkActionFilter {
} }
} }
} else { } else {
if (endLine < actionBugStartLine) { // if (endLine < actionBugStartLine) {
break; // break;
} // }
if (startLine <= actionBugStartLine && actionBugEndLine <= endLine) { if (startLine <= actionBugStartLine && actionBugEndLine <= endLine) {
if (startLine <= actionBugEndLine && endLine >= actionBugStartLine) { if (startLine <= actionBugEndLine && endLine >= actionBugStartLine) {
violation.getActionSets().add(actionSet); violation.getActionSets().add(actionSet);