diff --git a/src/main/java/com/lavinia/inspect/FileHistoryInspect.java b/src/main/java/com/lavinia/inspect/FileHistoryInspect.java index bb620c5..c4b1a2b 100644 --- a/src/main/java/com/lavinia/inspect/FileHistoryInspect.java +++ b/src/main/java/com/lavinia/inspect/FileHistoryInspect.java @@ -43,7 +43,7 @@ public void addToResult(GenericVisitor visitor, ArrayList lineChanges, lineChanges.add(visitor.getTotal()); result.put(visitor.getIdentifier(), lineChanges); } - logger.info("---> Total: " + (visitor.getTotal() > 0 ? "+" + visitor.getTotal() : visitor.getTotal()) + "\n"); + //logger.info("---> Total: " + (visitor.getTotal() > 0 ? "+" + visitor.getTotal() : visitor.getTotal()) + "\n"); } @SuppressWarnings("rawtypes") @@ -70,8 +70,8 @@ public void getHistoryFunctionsAnalyze() { commit.setRevision(he.getRevision()); commit.setAuthor(he.getAuthor()); commit.setDate(he.getDate()); - logger.info("----------------------------------------------------------\n"); - logger.info(commit.toString()); + //logger.info("----------------------------------------------------------\n"); + //logger.info(commit.toString()); ArrayList lineChanges = null; SourceFileTransaction sourceFileTransaction = he.getTransaction(); List nodeEditList = sourceFileTransaction.getNodeEdits(); @@ -92,8 +92,10 @@ public void getHistoryFunctionsAnalyze() { visitor = new NodeVisitor(logger, fileName); Set members = ((Node.Type) node).getMembers(); for (Node n : members) { - ((NodeVisitor) visitor).visit(n); - //addToResult(visitor, lineChanges, logger); + if (n instanceof Node.Function) { + ((NodeVisitor) visitor).visit(n); + addToResult(visitor, lineChanges, logger); + } } } } diff --git a/src/main/java/com/lavinia/visitor/EditVisitor.java b/src/main/java/com/lavinia/visitor/EditVisitor.java index 24c6e99..6de66f6 100644 --- a/src/main/java/com/lavinia/visitor/EditVisitor.java +++ b/src/main/java/com/lavinia/visitor/EditVisitor.java @@ -28,9 +28,9 @@ public EditVisitor(Logger logger, String fileName) { public void visit(Add add) { Node n = ((NodeSetEdit.Add) add).getNode(); identifier = fileName + ":\t" + ((NodeSetEdit.Add) add).getNode().getIdentifier(); - logger.info("\n" + identifier); + //logger.info("\n" + identifier); List body = ((Node.Function) n).getBody(); - logger.info("Add: +" + body.size() + ": " + body); + //logger.info("Add: +" + body.size() + ": " + body); total += body.size(); } @@ -38,7 +38,7 @@ public void visit(Add add) { @Override public void visit(Remove remove) { identifier = fileName + ":\t" + ((NodeSetEdit.Remove) remove).getIdentifier(); - logger.info("Remove: " + identifier); + //logger.info("Remove: " + identifier); total -= 1; } @@ -46,15 +46,15 @@ public void visit(Remove remove) { @Override public void visit(Change change) { identifier = fileName + ":\t" + ((NodeSetEdit.Change) change).getIdentifier(); - logger.info(identifier); + //logger.info(identifier); Transaction t1 = ((NodeSetEdit.Change) change).getTransaction(); List> bodyEdits = ((FunctionTransaction) t1).getBodyEdits(); for (ListEdit le : bodyEdits) { if (le instanceof ListEdit.Add) { - logger.info("Change: +1: " + le); + //logger.info("Change: +1: " + le); total += 1; } else if (le instanceof ListEdit.Remove) { - logger.info("Change: -1: " + le); + //logger.info("Change: -1: " + le); total -= 1; } } diff --git a/src/main/java/com/lavinia/visitor/NodeVisitor.java b/src/main/java/com/lavinia/visitor/NodeVisitor.java index 50c078c..f4e535d 100644 --- a/src/main/java/com/lavinia/visitor/NodeVisitor.java +++ b/src/main/java/com/lavinia/visitor/NodeVisitor.java @@ -58,6 +58,7 @@ public void visit(Function function) { // logger.info("Visit Function"); // String signature = function.getSignature(); // logger.info("Function signature: " + signature); + total = 0; List body = function.getBody(); // logger.info("Body size: " + body.size()); functionSize.put(function.getIdentifier(), body.size()); @@ -65,8 +66,8 @@ public void visit(Function function) { * for (String b : body) { logger.info(b); } logger.info("\n"); */ identifier = fileName + ":\t" + function.getSignature(); - logger.info(identifier); - logger.info("Add: +" + function.getBody().size() + " " + function.getBody()); + //logger.info(identifier); + //logger.info("Add: +" + function.getBody().size() + " " + function.getBody()); total += function.getBody().size(); }