From 57df75093d6d058f930485c6855b0ff0298442b0 Mon Sep 17 00:00:00 2001 From: "Azalea (on HyDEV-Daisy)" Date: Tue, 7 Jun 2022 10:27:49 -0400 Subject: [PATCH] [O] Optimize --- .../lu/uni/serval/gumtree/GumTreeComparer.java | 17 +++++++---------- .../gumtreediff/gen/srcml/GumTreeCComparer.java | 2 ++ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/gumtree/gen.jdt/src/main/java/edu/lu/uni/serval/gumtree/GumTreeComparer.java b/gumtree/gen.jdt/src/main/java/edu/lu/uni/serval/gumtree/GumTreeComparer.java index 0eaf110..040cc58 100644 --- a/gumtree/gen.jdt/src/main/java/edu/lu/uni/serval/gumtree/GumTreeComparer.java +++ b/gumtree/gen.jdt/src/main/java/edu/lu/uni/serval/gumtree/GumTreeComparer.java @@ -36,19 +36,16 @@ public class GumTreeComparer { log.info("Null GumTree of Revised File: " + revFile.getPath()); throw new NullPointerException(revFile.getPath()); } - } - if (oldTree != null && newTree != null) { - Matcher m = Matchers.getInstance().getMatcher(oldTree, newTree); - m.match(); - ActionGenerator ag = new ActionGenerator(oldTree, newTree, m.getMappings()); - ag.generate(); - List actions = ag.getActions(); // change actions from bug to patch + if (oldTree == null || newTree == null) return null; - return actions; - } + Matcher m = Matchers.getInstance().getMatcher(oldTree, newTree); + m.match(); + ActionGenerator ag = new ActionGenerator(oldTree, newTree, m.getMappings()); + ag.generate(); + List actions = ag.getActions(); // change actions from bug to patch - return null; + return actions; } public List compareCFilesWithGumTree(File prevFile, File revFile) { diff --git a/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/GumTreeCComparer.java b/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/GumTreeCComparer.java index e05d1f7..af52df9 100644 --- a/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/GumTreeCComparer.java +++ b/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/GumTreeCComparer.java @@ -31,9 +31,11 @@ public class GumTreeCComparer { newTree = new SrcmlCTreeGenerator(srcmlPath).generateFromFile(revFile).getRoot(); } catch (Exception e) { if (oldTree == null) { + e.printStackTrace(); log.info("Null GumTree of Previous File: " + prevFile.getPath()); throw new NullPointerException(prevFile.getPath()); } else if (newTree == null) { + e.printStackTrace(); log.info("Null GumTree of Revised File: " + revFile.getPath()); throw new NullPointerException(revFile.getPath()); }