From 1ea8bf70b0f32f924314eecac87f1eceaef31804 Mon Sep 17 00:00:00 2001
From: Kui LIU <brucekuiliu@gmail.com>
Date: Sat, 12 Aug 2017 20:00:06 +0200
Subject: [PATCH] Remove BreakStatements.

---
 .../regroup/HierarchicalRegrouper.java        | 52 +++++++++----------
 .../gumtree/regroup/HunkActionFilter.java     | 18 +++----
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/main/java/edu/lu/uni/serval/gumtree/regroup/HierarchicalRegrouper.java b/src/main/java/edu/lu/uni/serval/gumtree/regroup/HierarchicalRegrouper.java
index 621d508..a267cf7 100644
--- a/src/main/java/edu/lu/uni/serval/gumtree/regroup/HierarchicalRegrouper.java
+++ b/src/main/java/edu/lu/uni/serval/gumtree/regroup/HierarchicalRegrouper.java
@@ -122,19 +122,19 @@ public class HierarchicalRegrouper {
 				}
 				break;
 			} else {
-				if (!(action instanceof Addition) && !(act instanceof Addition)) {
-//						|| (action instanceof Insert && (act instanceof Insert))) {
-					int startPosition = act.getPosition();
-					int length = act.getLength();
-					int startP = action.getPosition();
-					int leng = action.getLength();
-					
-					if (startP > startPosition + length) {
-						break;
-					} else if (startP + leng < startPosition) {
-						continue;
-					}
-				}
+//				if (!(action instanceof Addition) && !(act instanceof Addition)) {
+////						|| (action instanceof Insert && (act instanceof Insert))) {
+//					int startPosition = act.getPosition();
+//					int length = act.getLength();
+//					int startP = action.getPosition();
+//					int leng = action.getLength();
+//					
+//					if (startP > startPosition + length) {
+//						break;
+//					} else if (startP + leng < startPosition) {
+//						continue;
+//					}
+//				}
 				// SubAction range： startP <= startPosition && startPosition + length <= startP + leng
 				addToActionSets(actionSet, parentAct, actSet.getSubActions());
 			}
@@ -156,19 +156,19 @@ public class HierarchicalRegrouper {
 				actionSet.getSubActions().add(actSet);
 				return true;
 			} else {
-				if (!(action instanceof Addition) && !(act instanceof Addition)) {
-//					|| (action instanceof Insert && (act instanceof Insert))) {
-					int startPosition = act.getPosition();
-					int length = act.getLength();
-					int startP = action.getPosition();
-					int leng = action.getLength();
-					
-					if (startP > startPosition + length) {
-						break;
-					} else if (startP + leng < startPosition) {
-						continue;
-					}
-				}
+//				if (!(action instanceof Addition) && !(act instanceof Addition)) {
+////					|| (action instanceof Insert && (act instanceof Insert))) {
+//					int startPosition = act.getPosition();
+//					int length = act.getLength();
+//					int startP = action.getPosition();
+//					int leng = action.getLength();
+//					
+//					if (startP > startPosition + length) {
+//						break;
+//					} else if (startP + leng < startPosition) {
+//						continue;
+//					}
+//				}
 				// SubAction range： startP <= startPosition && startPosition + length <= startP + leng
 				List<HierarchicalActionSet> subActionSets = actionSet.getSubActions();
 				if (subActionSets.size() > 0) {
diff --git a/src/main/java/edu/lu/uni/serval/gumtree/regroup/HunkActionFilter.java b/src/main/java/edu/lu/uni/serval/gumtree/regroup/HunkActionFilter.java
index 559356e..b117a55 100644
--- a/src/main/java/edu/lu/uni/serval/gumtree/regroup/HunkActionFilter.java
+++ b/src/main/java/edu/lu/uni/serval/gumtree/regroup/HunkActionFilter.java
@@ -329,9 +329,9 @@ public class HunkActionFilter {
 						}
 					}
 				} else {
-					if (bugEndLine < actionBugStartLine)  {
-						break;
-					}
+//					if (bugEndLine < actionBugStartLine)  {
+//						break;
+//					}
 					if (bugStartLine <= actionBugStartLine && actionBugEndLine <= bugEndLine) {
 						if (startLine <= actionBugEndLine && endLine >= actionBugStartLine) {
 							violation.getActionSets().add(actionSet);
@@ -402,9 +402,9 @@ public class HunkActionFilter {
 						}
 					}
 				} else {
-					if (bugHunkEndLine < actionBugStartLine) {
-						break;
-					}
+//					if (bugHunkEndLine < actionBugStartLine) {
+//						break;
+//					}
 					if (bugHunkStartLine <= actionBugStartLine && actionBugEndLine <= bugHunkEndLine) {
 						if (violationStartLine <= actionBugEndLine && violationEndLine >= actionBugStartLine) {
 							violation.getActionSets().add(actionSet);
@@ -570,9 +570,9 @@ public class HunkActionFilter {
 						}
 					}
 				} else {
-					if (endLine < actionBugStartLine)  {
-						break;
-					}
+//					if (endLine < actionBugStartLine)  {
+//						break;
+//					}
 					if (startLine <= actionBugStartLine && actionBugEndLine <= endLine) {
 						if (startLine <= actionBugEndLine && endLine >= actionBugStartLine) {
 							violation.getActionSets().add(actionSet);