diff --git a/src/main/java/edu/lu/uni/serval/FixPatternParser/Parser.java b/src/main/java/edu/lu/uni/serval/FixPatternParser/Parser.java index f5eb979..29ea314 100644 --- a/src/main/java/edu/lu/uni/serval/FixPatternParser/Parser.java +++ b/src/main/java/edu/lu/uni/serval/FixPatternParser/Parser.java @@ -148,6 +148,7 @@ public abstract class Parser implements ParserInterface { } private String handleSimpleNameNode(String singleEdit, String actionStr, int index) { + // TODO if (singleEdit.endsWith("SimpleName")) { actionStr = actionStr.substring(index + 2); if (actionStr.startsWith("MethodName")) { @@ -430,7 +431,7 @@ public abstract class Parser implements ParserInterface { return editScripts; } - private String getActionString(HierarchicalActionSet actionSet, int bugEndPosition, int fixEndPosition, String startStr) { + private String getActionString(HierarchicalActionSet actionSet, int bugEndPosition, int fixEndPosition, String hierarchicalLabel) { String editScripts = ""; String actionStr = actionSet.getActionString(); @@ -439,7 +440,7 @@ public abstract class Parser implements ParserInterface { singleEdit = handleSimpleNameNode(singleEdit, actionStr, index); - editScripts += startStr + singleEdit + "\n"; + editScripts += hierarchicalLabel + singleEdit + "\n"; for (HierarchicalActionSet subActionSet : actionSet.getSubActions()) { int position = subActionSet.getAction().getPosition(); @@ -447,7 +448,7 @@ public abstract class Parser implements ParserInterface { if (isOutofPosition(actionStr, position, bugEndPosition, fixEndPosition)) { continue; } - editScripts += getActionString(subActionSet, bugEndPosition, fixEndPosition, startStr + "---"); + editScripts += getActionString(subActionSet, bugEndPosition, fixEndPosition, hierarchicalLabel + "---"); } return editScripts; diff --git a/src/main/java/edu/lu/uni/serval/FixPatternParser/violations/FixedViolationHunkParser.java b/src/main/java/edu/lu/uni/serval/FixPatternParser/violations/FixedViolationHunkParser.java index 78bbc01..9ea9bb8 100644 --- a/src/main/java/edu/lu/uni/serval/FixPatternParser/violations/FixedViolationHunkParser.java +++ b/src/main/java/edu/lu/uni/serval/FixPatternParser/violations/FixedViolationHunkParser.java @@ -108,7 +108,7 @@ public class FixedViolationHunkParser extends FixedViolationParser { // continue; } if ((bugEndLine - bugStartLine > Configuration.HUNK_SIZE && !isPureInsert) || fixEndLine - fixStartLine > Configuration.HUNK_SIZE) { -// continue; +// continue; //TODO filter out the }