diff --git a/JavassistTest/src/tracer/OutputStatementsGenerator.java b/JavassistTest/src/tracer/OutputStatementsGenerator.java index e60398d..17e3278 100644 --- a/JavassistTest/src/tracer/OutputStatementsGenerator.java +++ b/JavassistTest/src/tracer/OutputStatementsGenerator.java @@ -26,9 +26,9 @@ "tracer.MyPrintStream.print(\"set:" + declaredClassName + ":0:\"); " + "} " + "if ($1 != null) {" + // o[0] - "tracer.MyPrintStream.println($1.getClass().getName() + \":\" + System.identityHashCode($1) + " + OutputStatementsGenerator.LINE_AND_THREAD + ");" + + "tracer.MyPrintStream.println($1.getClass().getName() + \":\" + System.identityHashCode($1) + " + LINE_AND_THREAD + ");" + "} else {" + - "tracer.MyPrintStream.println(\"---:0\" + " + OutputStatementsGenerator.LINE_AND_THREAD + ");" + + "tracer.MyPrintStream.println(\"---:0\" + " + LINE_AND_THREAD + ");" + "}" + "}"; } @@ -56,15 +56,15 @@ } static String generateReplaceStatementsForCall(CtClass cls, CtBehavior m) throws NotFoundException { - return "{" + OutputStatementsGenerator.generateInsertBeforeStatements(cls, m, true) + " $_ = $proceed($$); " + OutputStatementsGenerator.generateInsertAfterStatements(cls, m, true) + "}"; + return "{" + generateInsertBeforeStatements(cls, m, true) + " $_ = $proceed($$); " + generateInsertAfterStatements(cls, m, true) + "}"; } static String generateInsertBeforeStatementsForMethodBody(CtClass cls, CtBehavior m) throws NotFoundException { - return "{" + OutputStatementsGenerator.generateInsertBeforeStatements(cls, m, false) + "}"; + return "{" + generateInsertBeforeStatements(cls, m, false) + "}"; } static String generateInsertAfterStatementsForMethodBody(CtClass cls, CtBehavior m) throws NotFoundException { - return "{" + OutputStatementsGenerator.generateInsertAfterStatements(cls, m, false) + "}"; + return "{" + generateInsertAfterStatements(cls, m, false) + "}"; } /**