diff --git a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/ArrayAccess.java b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/ArrayAccess.java index 0ecfc2f..a161efb 100644 --- a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/ArrayAccess.java +++ b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/ArrayAccess.java @@ -1,6 +1,5 @@ package org.ntlab.traceCollector.tracer.trace; - public class ArrayAccess extends Statement { private String arrayClassName; private String arrayObjectId; diff --git a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/ArrayCreate.java b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/ArrayCreate.java index 9932018..f67dccc 100644 --- a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/ArrayCreate.java +++ b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/ArrayCreate.java @@ -1,6 +1,5 @@ package org.ntlab.traceCollector.tracer.trace; - public class ArrayCreate extends Statement { private String arrayClassName; private String arrayObjectId; diff --git a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/ArrayUpdate.java b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/ArrayUpdate.java index 4087b32..b747885 100644 --- a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/ArrayUpdate.java +++ b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/ArrayUpdate.java @@ -1,6 +1,5 @@ package org.ntlab.traceCollector.tracer.trace; - public class ArrayUpdate extends Statement { private String arrayClassName; private String arrayObjectId; diff --git a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/BlockEnter.java b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/BlockEnter.java index b7c454c..f2bda88 100644 --- a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/BlockEnter.java +++ b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/BlockEnter.java @@ -1,6 +1,5 @@ package org.ntlab.traceCollector.tracer.trace; - public class BlockEnter extends Statement { private int blockId; private int incomings; diff --git a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/FieldAccess.java b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/FieldAccess.java index 36d8284..4068cff 100644 --- a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/FieldAccess.java +++ b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/FieldAccess.java @@ -1,6 +1,5 @@ package org.ntlab.traceCollector.tracer.trace; - public class FieldAccess extends Statement { private String fieldName; private String containerClassName; diff --git a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/FieldUpdate.java b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/FieldUpdate.java index 6261ec8..c05171e 100644 --- a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/FieldUpdate.java +++ b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/FieldUpdate.java @@ -1,6 +1,5 @@ package org.ntlab.traceCollector.tracer.trace; - public class FieldUpdate extends Statement { private String fieldName; private String containerClassName; diff --git a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/IStatementVisitor.java b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/IStatementVisitor.java index 6fe1473..11e174d 100644 --- a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/IStatementVisitor.java +++ b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/IStatementVisitor.java @@ -1,6 +1,5 @@ package org.ntlab.traceCollector.tracer.trace; - public interface IStatementVisitor { abstract public boolean preVisitStatement(Statement statement); abstract public boolean postVisitStatement(Statement statement); diff --git a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/MethodExecution.java b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/MethodExecution.java index 3eabbf5..32f7388 100644 --- a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/MethodExecution.java +++ b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/MethodExecution.java @@ -3,7 +3,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; -import java.util.List; public class MethodExecution { private String signature; diff --git a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/MethodInvocation.java b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/MethodInvocation.java index 923d6c8..1faa8ea 100644 --- a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/MethodInvocation.java +++ b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/MethodInvocation.java @@ -1,6 +1,5 @@ package org.ntlab.traceCollector.tracer.trace; - public class MethodInvocation extends Statement { private MethodExecution calledMethodExecution = null; protected String thisClassName; @@ -48,5 +47,5 @@ public String getCallerSideMethodName() { return callerSideMethodName; - } + } } diff --git a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/Reference.java b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/Reference.java index 79985c9..1819605 100644 --- a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/Reference.java +++ b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/Reference.java @@ -1,6 +1,5 @@ package org.ntlab.traceCollector.tracer.trace; - public class Reference { private String id; private ObjectReference srcObj; // �Q�ƌ��I�u�W�F�N�g diff --git a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/Statement.java b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/Statement.java index c669fee..307b0c7 100644 --- a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/Statement.java +++ b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/Statement.java @@ -25,5 +25,5 @@ public long getTimeStamp() { return timeStamp; - } + } } \ No newline at end of file diff --git a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/ThreadInstance.java b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/ThreadInstance.java index faf635c..341c0b9 100644 --- a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/ThreadInstance.java +++ b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/ThreadInstance.java @@ -4,7 +4,6 @@ import java.util.Collection; import java.util.HashMap; import java.util.HashSet; -import java.util.List; public class ThreadInstance { private ArrayList roots = new ArrayList(); @@ -171,7 +170,7 @@ public MethodExecution getCurrentMethodExecution() { return curMethodExecution; } - + public TracePoint getCurrentTracePoint() { return new TracePoint(curMethodExecution, curMethodExecution.getStatements().size() - 1); } diff --git a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/TraceJSON.java b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/TraceJSON.java index 3f1f6ab..8a1c4e7 100644 --- a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/TraceJSON.java +++ b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/trace/TraceJSON.java @@ -25,7 +25,7 @@ * �w�肵��JSON�̃g���[�X�t�@�C������ǂ��� Trace �I�u�W�F�N�g�𐶐����� * @param file �g���[�X�t�@�C�� */ - private TraceJSON(BufferedReader file) { + public TraceJSON(BufferedReader file) { try { readJSON(file); file.close(); @@ -38,7 +38,7 @@ * �w�肵��JSON�̃g���[�X�t�@�C������ǂ��� Trace �I�u�W�F�N�g�𐶐����� * @param traceFile �g���[�X�t�@�C���̃p�X */ - private TraceJSON(String traceFile) { + public TraceJSON(String traceFile) { BufferedReader file; try { file = new BufferedReader(new FileReader(traceFile));