Before variable nodes in CFG

src/main/java/tfm/graphs/sdg/MethodCallReplacer.java

@@ -28,7 +28,7 @@ class MethodCallReplacer {
                     return; // We don't have visited the code (e.g. the MethodDeclaration for a method call)
                 }
 
-                optionalRootNode.get().getAstNode().accept(new MethodCallReplacerVisitor(), context);
+                optionalRootNode.get().getAstNode().accept(new MethodCallReplacerVisitor(sdg), context);
             });
     }
 }

src/main/java/tfm/graphs/sdg/MethodCallReplacerVisitor.java

@@ -9,10 +9,6 @@ import com.github.javaparser.ast.expr.VariableDeclarationExpr;
 import com.github.javaparser.ast.stmt.ExpressionStmt;
 import com.github.javaparser.ast.type.Type;
 import com.github.javaparser.ast.visitor.VoidVisitorAdapter;
-import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
-import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver;
-import com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver;
-import tfm.graphs.pdg.PDG;
 import tfm.nodes.GraphNode;
 import tfm.utils.Context;
 import tfm.utils.Logger;
@@ -27,10 +23,6 @@ class MethodCallReplacerVisitor extends VoidVisitorAdapter<Context> {
     private SDG sdg;
     private GraphNode<ExpressionStmt> methodCallNode;
 
-    public MethodCallReplacerVisitor() {
-
-    }
-
     public MethodCallReplacerVisitor(SDG sdg) {
         this.sdg = sdg;
     }

src/main/java/tfm/graphs/sdg/SDGBuilder.java

@@ -11,11 +11,6 @@ import tfm.arcs.Arc;
 import tfm.graphs.pdg.PDG;
 import tfm.nodes.GraphNode;
 import tfm.utils.Context;
-import tfm.utils.Logger;
-
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
 
 class SDGBuilder extends VoidVisitorAdapter<Context> {