diff --git a/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/Variables.java b/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/Variables.java index 27f1335..18dc2e7 100644 --- a/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/Variables.java +++ b/org.ntlab.reverseDebugger/src/org/ntlab/reverseDebugger/Variables.java @@ -152,8 +152,8 @@ // �擾�����t�B�[���h���I�u�W�F�N�g��z��̏ꍇ�ɁA���̃I�u�W�F�N�g��z�񂪎��ƒt�B�[���h�ɂ‚��Ă̏������s�� switch (checkDeepHierarchy(fieldData)) { case NONE: break; - case FIELD: getFieldsState(vm, thread, fieldData, tp, indent); break; - case ARRAY: getArrayState(vm, thread, fieldData, tp, indent); break; + case FIELD: getFieldsState(vm, thread, fieldData, tp, (indent + " ")); break; + case ARRAY: getArrayState(vm, thread, fieldData, tp, (indent + " ")); break; } } } catch (JavaModelException e) { @@ -166,7 +166,7 @@ * (�ϐ��r���[�ɕ\��������f�[�^���ċA�I�ɋ��߂邽�߂�, �Ăяo�����Ŏ��ɂǂ̃��\�b�h���ĂԂ��𔻒f����̂ɗ��p) * * @param objData - * @return FIELD: �Q�ƌ^�I�u�W�F�N�g�̏ꍇ, ARRAY: �z��̏ꍇ, NONE: ����ȊO�̏ꍇ + * @return FIELD: �Q�ƌ^�I�u�W�F�N�g�̏ꍇ
ARRAY: �z��̏ꍇ
NONE: ����ȊO�̏ꍇ */ private DeepHierarchy checkDeepHierarchy(VariableData objData) { // �t�B�[���h��ID��Type���Ȃ��ꍇ��AType(=ActualType)��"---"�̏ꍇ�͉������Ȃ� @@ -179,13 +179,11 @@ final String ARRAY_SIGNATURE_HEAD = "["; // �z��̃V�O�l�`���̐擪�́A�z��̎��������� [ ���A�Ȃ� if (objData.getClassName().startsWith(ARRAY_SIGNATURE_HEAD)) { - // �t�B�[���h��Type���z��^(�@[ �Ŏn�܂�@)�ꍇ (���̔z�񂪎��Še�v�f�ɂ‚��Ă���Ȃ�f�[�^�擾�������Ăяo��) - return DeepHierarchy.ARRAY; + return DeepHierarchy.ARRAY; // �t�B�[���h��Type���z��^( [ �Ŏn�܂�)�ꍇ } else { String[] primitives = {"byte", "short", "int", "long", "float", "double", "char", "boolean"}; if (!Arrays.asList(primitives).contains(objData.getClassName())) { - // �t�B�[���h��Type���Q�ƌ^(=�I�u�W�F�N�g)�̏ꍇ (���̃I�u�W�F�N�g�������Ă���t�B�[���h�ɂ‚��Ă���Ȃ�f�[�^�擾�������Ăяo��) - return DeepHierarchy.FIELD; + return DeepHierarchy.FIELD; // �t�B�[���h��Type���Q�ƌ^(=�I�u�W�F�N�g)�̏ꍇ } } return DeepHierarchy.NONE; @@ -217,8 +215,8 @@ // �擾�����z��v�f���I�u�W�F�N�g��z��̏ꍇ�ɁA���̃I�u�W�F�N�g��z�񂪎��ƒt�B�[���h�ɂ‚��Ă̏������s�� switch (checkDeepHierarchy(arrayIndexData)) { case NONE: break; - case FIELD: getFieldsState(vm, thread, arrayIndexData, tp, indent); break; - case ARRAY: getArrayState(vm, thread, arrayIndexData, tp, indent); break; + case FIELD: getFieldsState(vm, thread, arrayIndexData, tp, (indent + " ")); break; + case ARRAY: getArrayState(vm, thread, arrayIndexData, tp, (indent + " ")); break; } } } @@ -247,8 +245,8 @@ argsData.add(argData); switch (checkDeepHierarchy(argData)) { case NONE: break; - case FIELD: getFieldsState(vm, thread, argData, tp, indent); break; - case ARRAY: getArrayState(vm, thread, argData, tp, indent); break; + case FIELD: getFieldsState(vm, thread, argData, tp, (indent + " ")); break; + case ARRAY: getArrayState(vm, thread, argData, tp, (indent + " ")); break; } } }