diff --git a/org.ntlab.reverseDebugger/src/org/ntlab/reversedebugger/CallStackModel.java b/org.ntlab.reverseDebugger/src/org/ntlab/reversedebugger/CallStackModel.java index 86040d9..c5503b5 100644 --- a/org.ntlab.reverseDebugger/src/org/ntlab/reversedebugger/CallStackModel.java +++ b/org.ntlab.reverseDebugger/src/org/ntlab/reversedebugger/CallStackModel.java @@ -14,25 +14,14 @@ import com.sun.jdi.VirtualMachine; public class CallStackModel { - private ObjectReference methodExecution; -// private ObjectReference childMethodExecution; private MethodCaller methodExecutionMc; private int callLineNo; -// public CallStackModel(VirtualMachine vm, ThreadReference thread, ObjectReference methodExecution, ObjectReference childMethodExecution) { -// methodExecutionMc = new MethodCaller(vm, thread, methodExecution); -// this.methodExecution = methodExecution; -// this.childMethodExecution = childMethodExecution; -// } - public CallStackModel(VirtualMachine vm, ThreadReference thread, ObjectReference methodExecution, int callLineNo) { methodExecutionMc = new MethodCaller(vm, thread, methodExecution); - this.methodExecution = methodExecution; this.callLineNo = callLineNo; -// this.childMethodExecution = childMethodExecution; } - public VirtualMachine getVm() { return methodExecutionMc.getVm(); } @@ -49,22 +38,6 @@ return callLineNo; } -// public int getCallLineNo() { -// if (childMethodExecution == null) { -// return -1; -// } -// int callLineNo = -1; -// try { -// ObjectReference callStatement = (ObjectReference)methodExecutionMc.callInstanceMethod("getMethodInvocation", childMethodExecution); -// MethodCaller callStatementMc = new MethodCaller(methodExecutionMc.getVm(), methodExecutionMc.getThread(), callStatement); -// callLineNo = ((IntegerValue)callStatementMc.callInstanceMethod("getLineNo")).value(); -// } catch (InvalidTypeException | ClassNotLoadedException -// | InvocationException | IncompatibleThreadStateException e) { -// e.printStackTrace(); -// } -// return callLineNo; -// } - public String getSignature() { String signature = ""; try { diff --git a/org.ntlab.reverseDebugger/src/org/ntlab/reversedebugger/CallStackView.java b/org.ntlab.reverseDebugger/src/org/ntlab/reversedebugger/CallStackView.java index 536f7c7..ce7e090 100644 --- a/org.ntlab.reverseDebugger/src/org/ntlab/reversedebugger/CallStackView.java +++ b/org.ntlab.reverseDebugger/src/org/ntlab/reversedebugger/CallStackView.java @@ -100,7 +100,7 @@ if (nodes == null || nodes[0] == null) { return; } - viewer.setInput(callStackModels.getCallStackModelsTreeNodes()); + viewer.setInput(nodes); viewer.expandAll(); } diff --git a/org.ntlab.reverseDebugger/src/org/ntlab/reversedebugger/ObjectFlowAliasView.java b/org.ntlab.reverseDebugger/src/org/ntlab/reversedebugger/ObjectFlowAliasView.java index f882cbb..6dcbfcc 100644 --- a/org.ntlab.reverseDebugger/src/org/ntlab/reversedebugger/ObjectFlowAliasView.java +++ b/org.ntlab.reverseDebugger/src/org/ntlab/reversedebugger/ObjectFlowAliasView.java @@ -101,7 +101,6 @@ public void setFocus() { // TODO Auto-generated method stub viewer.getControl().setFocus(); -// viewer.setInput(objectFlowAliases.getObjectFlowSingleList(true)); } private void createActions() { diff --git a/org.ntlab.reverseDebugger/src/org/ntlab/reversedebugger/SeedAliasView.java b/org.ntlab.reverseDebugger/src/org/ntlab/reversedebugger/SeedAliasView.java index aa3dcee..75d92d0 100644 --- a/org.ntlab.reverseDebugger/src/org/ntlab/reversedebugger/SeedAliasView.java +++ b/org.ntlab.reverseDebugger/src/org/ntlab/reversedebugger/SeedAliasView.java @@ -32,7 +32,7 @@ private static SeedAliases seedAliases = new SeedAliases(); private static JavaEditorOperator javaEditorOperator = new JavaEditorOperator(); public static final String ID = "org.ntlab.reverseDebugger.seedAliasView"; - + public SeedAliasView() { // TODO Auto-generated constructor stub System.out.println("SeedAliasView�N���X���������ꂽ��!"); @@ -60,21 +60,8 @@ viewer.setLabelProvider(new SeedAliasLabelProvider()); viewer.setInput(seedAliases.getSeedAliases()); CallStackView.refresh(); - - // �I�������J�����ɑΉ�����V�[�h�G�C���A�X���N�_�ɃI�u�W�F�N�g�t���[�����s�����郊�X�i�[��o�^ -// viewer.addSelectionChangedListener(new ISelectionChangedListener() { -// @Override -// public void selectionChanged(SelectionChangedEvent event) { -// IStructuredSelection sel = (IStructuredSelection)event.getSelection(); -// Object element = sel.getFirstElement(); -// if (element instanceof MethodCaller) { -// MethodCaller seedAlias = (MethodCaller)element; -// ObjectFlowAliasView.createObjectFlow(seedAlias); -// ObjectFlowAliasView.refresh(); -// } -// } -// }); + // �I�������J�����ɑΉ�����V�[�h�G�C���A�X���t�B�[���h�ɋL�^���Ă������X�i�[��o�^ (�I��������ɉE�N���b�N�ŃI�u�W�F�N�g�t���[�����s������ۂɕK�v) viewer.addSelectionChangedListener(new ISelectionChangedListener() { @Override public void selectionChanged(SelectionChangedEvent event) { @@ -97,7 +84,6 @@ public void setFocus() { // TODO Auto-generated method stub viewer.getControl().setFocus(); -// viewer.refresh(); } private void createActions() { @@ -178,7 +164,6 @@ CallStackView.reset(); } viewer.refresh(); -// CallStackView.refresh(); } private void reset() {