Merge pull request #213 from barbosamaatheus/master

Update regex patterns for code and method change detection

Author: pauloborba

src/main/services/dataCollectors/modifiedLinesCollector/DiffJParser.groovy

@@ -15,7 +15,8 @@ class DiffJParser {
     private final String REMOVED_FLAG = "d";
 
     private final String FLAGS_REGEX = "(${ADDED_FLAG}|${CHANGED_FLAG}|${REMOVED_FLAG})"
-    private final Pattern METHOD_CHANGE_HEADER_REGEX = Pattern.compile("^.* code (added|changed|removed) in .*")
+    private final Pattern STATEMENT_CHANGE_HEADER_REGEX = Pattern.compile("^.* code (added|changed|removed) in .*")
+    private final Pattern METHOD_DECLARATION_CHANGE_HEADER_REGEX = Pattern.compile("^.* method (added|changed|removed): .*")
 
     public Map<String, int[]> parse (List<String> lines) {
         def result = new HashMap<String, int[]>();
@@ -75,16 +76,18 @@ class DiffJParser {
         if (iterator.hasNext()) {
             iterator.next();
         }
-    } 
+    }
 
     private boolean isMethodChangeLine(String line) {
-        Matcher matcher = METHOD_CHANGE_HEADER_REGEX.matcher(line);
+        Matcher codeMatcher = STATEMENT_CHANGE_HEADER_REGEX.matcher(line);
+
+        Matcher methodMatcher = METHOD_DECLARATION_CHANGE_HEADER_REGEX.matcher(line);
 
-        return matcher.find();
+        return codeMatcher.find() || methodMatcher.find();
     }
 
     private String getMethodName(String headerLine) {
-        return headerLine.replaceFirst(/^.* code (added|changed|removed) in /, "");
+        return headerLine.replaceFirst(/^.* code (added|changed|removed) in /, "").replaceFirst(/^.* method (added|changed|removed): /, "");
     }
 
     private int[] getModifiedLinesRange(String headerLine) {
@@ -118,4 +121,4 @@ class DiffJParser {
         }
     }
 
-}
+}

src/main/services/outputProcessors/soot/ConflictDetectionAlgorithm.groovy

@@ -38,6 +38,10 @@ class ConflictDetectionAlgorithm {
         this.depthLimit = depthLimit;
     }
 
+    String getMode() {
+        return mode
+    }
+
     String getName() {
         return name
     }
@@ -147,4 +151,5 @@ class ConflictDetectionAlgorithm {
         }
         return result
     }
+
 }

src/main/services/outputProcessors/soot/NonCommutativeConflictDetectionAlgorithm.groovy

@@ -49,14 +49,14 @@ class NonCommutativeConflictDetectionAlgorithm extends ConflictDetectionAlgorith
     }
 
     private SootConfig buildSootConfig(String filePath, Scenario scenario) {
-        SootConfig config = new SootConfig(filePath, scenario.getClassPath(), this.mode);
+        SootConfig config = new SootConfig(filePath, scenario.getClassPath(), super.getMode());
         config.addOption("-entrypoints", scenario.getEntrypoints());
         config.addOption("-depthLimit", this.getDepthLimit());
         return config;
     }
 
     @Override
     public String toString() {
-        return "NonCommutativeConflictDetectionAlgorithm{name = ${this.name}}";
+        return "NonCommutativeConflictDetectionAlgorithm{name = ${super.getName()}}";
     }
 }