diff --git a/JavassistTest/src/tracer/OutputStatementsGenerator.java b/JavassistTest/src/tracer/OutputStatementsGenerator.java index e60398d..879742f 100644 --- a/JavassistTest/src/tracer/OutputStatementsGenerator.java +++ b/JavassistTest/src/tracer/OutputStatementsGenerator.java @@ -117,7 +117,7 @@ String longName = null; if ((m.getModifiers() & Modifier.STATIC) != 0) { // static���\�b�h�̏ꍇ - longName = modifiers + m.getLongName().replace('$', '.'); // AspectJ�ł̓��\�b�h�V�O�j�`�����ł͖����N���X�̓h�b�g�ŋ�؂��� + longName = modifiers + ((CtMethod)m).getReturnType().getName() + " " + m.getLongName().replace('$', '.'); // AspectJ�ł̓��\�b�h�V�O�j�`�����ł͖����N���X�̓h�b�g�ŋ�؂��� methodOutput = "tracer.MyPrintStream.println(\"Method " + declaredClassName + "," + longName + ":\" + 0 + " + LINE + " + System.nanoTime() + \":ThreadNo \" + Thread.currentThread().getId());"; classOutput = "tracer.MyPrintStream.println(\"Class " + declaredClassName + ":\" + 0 + " + LINE_AND_THREAD + ");"; @@ -216,7 +216,7 @@ "} " + "tracer.MyPrintStream.println(\"\" + System.identityHashCode($0) + " + LINE_AND_THREAD + ");"; } else { - returnOutput = "tracer.MyPrintStream.print(\"Return execution(" + shortName + "):" + ((CtMethod)m).getReturnType().getName() + ":\" + $_ + \":\");" + + returnOutput = "tracer.MyPrintStream.print(\"Return call(" + shortName + "):" + ((CtMethod)m).getReturnType().getName() + ":\" + $_ + \":\");" + "tracer.MyPrintStream.println(\"\" + System.identityHashCode($0) + " + LINE_AND_THREAD + ");"; } }