From affe46e28485665415c57f885d22c1067fdf6cd1 Mon Sep 17 00:00:00 2001 From: Kui LIU Date: Thu, 21 Dec 2017 22:39:20 +0100 Subject: [PATCH] Update --- .../java/edu/lu/uni/serval/diffentry/DiffEntryReader.java | 4 ++++ .../edu/lu/uni/serval/gumtree/regroup/HunkActionFilter.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/edu/lu/uni/serval/diffentry/DiffEntryReader.java b/src/main/java/edu/lu/uni/serval/diffentry/DiffEntryReader.java index d635c99..117fc5d 100644 --- a/src/main/java/edu/lu/uni/serval/diffentry/DiffEntryReader.java +++ b/src/main/java/edu/lu/uni/serval/diffentry/DiffEntryReader.java @@ -176,10 +176,14 @@ public class DiffEntryReader { if (buggyStartLine > 0) { DiffEntryHunk diffEntryHunk = new DiffEntryHunk(buggyStartLine, fixedStartLine, buggyRange, fixedRange); diffEntryHunk.setHunk(hunk.toString()); + diffEntryHunk.setBuggyHunkSize(buggyHunkSize); + diffEntryHunk.setFixedHunkSize(fixedHunkSize); diffentryHunks.add(diffEntryHunk); } hunk.setLength(0); } + buggyHunkSize = 0; + fixedHunkSize = 0; int plusIndex = line.indexOf("+"); String lineNum = line.substring(4, plusIndex); String[] nums = lineNum.split(","); 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 8e60907..1b64b87 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 @@ -419,7 +419,7 @@ public class HunkActionFilter { violation.getActionSets().add(actionSet); } } - } else if (!actionStr.startsWith("MOV")){// ignore move actions. + } else {//if (!actionStr.startsWith("MOV")){// ignore move actions. if (bugHunkStartLine <= actionBugStartLine && violationEndLine <= bugHunkEndLine) { if (violationStartLine <= actionBugEndLine && violationEndLine >= actionBugStartLine) { violation.getActionSets().add(actionSet);