diff --git a/org.ntlab.reverseDebugger/src/org/ntlab/reversedebugger/ObjectFlowAliasLabelProvider.java b/org.ntlab.reverseDebugger/src/org/ntlab/reversedebugger/ObjectFlowAliasLabelProvider.java index c102080..035e55b 100644 --- a/org.ntlab.reverseDebugger/src/org/ntlab/reversedebugger/ObjectFlowAliasLabelProvider.java +++ b/org.ntlab.reverseDebugger/src/org/ntlab/reversedebugger/ObjectFlowAliasLabelProvider.java @@ -12,6 +12,7 @@ import com.sun.jdi.IntegerValue; import com.sun.jdi.InvalidTypeException; import com.sun.jdi.InvocationException; +import com.sun.jdi.ObjectReference; import com.sun.jdi.StringReference; public class ObjectFlowAliasLabelProvider extends LabelProvider implements ITableLabelProvider { @@ -30,12 +31,14 @@ case 1: return ((StringReference)mc.callInstanceMethod("getClassName")).value(); case 2: - return String.valueOf(((IntegerValue)mc.callInstanceMethod("getLineNo")).value()); + return ((StringReference)mc.callInstanceMethod("getMethodExecutionClassName")).value(); case 3: - return ((StringReference)mc.callInstanceMethod("getStatementType")).value(); + return String.valueOf(((IntegerValue)mc.callInstanceMethod("getLineNo")).value()); case 4: - return ((StringReference)mc.callInstanceMethod("getStatementSignature")).value(); + return ((StringReference)mc.callInstanceMethod("getStatementType")).value(); case 5: + return ((StringReference)mc.callInstanceMethod("getStatementSignature")).value(); + case 6: return ((StringReference)mc.callInstanceMethod("getOccurrenceText")).value(); } } catch (InvalidTypeException | ClassNotLoadedException diff --git a/org.ntlab.reverseDebugger/src/org/ntlab/reversedebugger/ObjectFlowAliasView.java b/org.ntlab.reverseDebugger/src/org/ntlab/reversedebugger/ObjectFlowAliasView.java index daae2d3..e836290 100644 --- a/org.ntlab.reverseDebugger/src/org/ntlab/reversedebugger/ObjectFlowAliasView.java +++ b/org.ntlab.reverseDebugger/src/org/ntlab/reversedebugger/ObjectFlowAliasView.java @@ -50,8 +50,8 @@ table.setLinesVisible(true); // �e�[�u���̃J�������쐬 - String[] tableColumnTexts = {"objectID", "class", "lineNo", "statementType", "statementSignature", "occurrence"}; - int[] tableColumnWidth = {150, 160, 80, 180, 300, 110}; + String[] tableColumnTexts = {"objectID", "objectType", "srcFile", "lineNo", "statementType", "statementSignature", "occurrence"}; + int[] tableColumnWidth = {150, 160, 160, 80, 180, 300, 110}; TableColumn[] tableColumns = new TableColumn[tableColumnTexts.length]; for (int i = 0; i < tableColumns.length; i++) { tableColumns[i] = new TableColumn(table, SWT.NULL); diff --git a/org.ntlab.reverseDebugger/src/org/ntlab/reversedebugger/SeedAliasLabelProvider.java b/org.ntlab.reverseDebugger/src/org/ntlab/reversedebugger/SeedAliasLabelProvider.java index fb9b740..e686586 100644 --- a/org.ntlab.reverseDebugger/src/org/ntlab/reversedebugger/SeedAliasLabelProvider.java +++ b/org.ntlab.reverseDebugger/src/org/ntlab/reversedebugger/SeedAliasLabelProvider.java @@ -29,12 +29,14 @@ case 1: return ((StringReference)mc.callInstanceMethod("getClassName")).value(); case 2: - return String.valueOf(((IntegerValue)mc.callInstanceMethod("getLineNo")).value()); + return ((StringReference)mc.callInstanceMethod("getMethodExecutionClassName")).value(); case 3: - return ((StringReference)mc.callInstanceMethod("getStatementType")).value(); + return String.valueOf(((IntegerValue)mc.callInstanceMethod("getLineNo")).value()); case 4: - return ((StringReference)mc.callInstanceMethod("getStatementSignature")).value(); + return ((StringReference)mc.callInstanceMethod("getStatementType")).value(); case 5: + return ((StringReference)mc.callInstanceMethod("getStatementSignature")).value(); + case 6: return ((StringReference)mc.callInstanceMethod("getOccurrenceText")).value(); } } catch (InvalidTypeException | ClassNotLoadedException diff --git a/org.ntlab.reverseDebugger/src/org/ntlab/reversedebugger/SeedAliasView.java b/org.ntlab.reverseDebugger/src/org/ntlab/reversedebugger/SeedAliasView.java index 73568ae..6c6c043 100644 --- a/org.ntlab.reverseDebugger/src/org/ntlab/reversedebugger/SeedAliasView.java +++ b/org.ntlab.reverseDebugger/src/org/ntlab/reversedebugger/SeedAliasView.java @@ -48,8 +48,8 @@ table.setLinesVisible(true); // �e�[�u���̃J�������쐬 - String[] tableColumnTexts = {"objectID", "class", "lineNo", "statementType", "statementSignature", "occurrence"}; - int[] tableColumnWidth = {150, 160, 80, 180, 300, 110}; + String[] tableColumnTexts = {"objectID", "objectType", "srcFile", "lineNo", "statementType", "statementSignature", "occurrence"}; + int[] tableColumnWidth = {150, 160, 160, 80, 180, 300, 110}; TableColumn[] tableColumns = new TableColumn[tableColumnTexts.length]; for (int i = 0; i < tableColumns.length; i++) { tableColumns[i] = new TableColumn(table, SWT.NULL);