Fork: 0
nitta-lab / MagnetRON

Eclipse (Debug All) のレイアウトが崩れていたのを修正． #64

Merged a-hongo merged 2 commits into nitta-lab:master from nitta-lab:eclipseDebugLayout on 16 Sep 2021
Patch
Unified Split
Showing 2 changed files
View
12
■■■■■
 src/org/ntlab/deltaViewer/CollaborationLayout.java
String srcObjId = methodExec.getThisObjId();
String dstObjId = methodExec.getReturnValue().getId();
String srcClassName = methodExec.getThisClassName();
String dstClassName = methodExec.getReturnValue().getActualType();
idx = references.indexOf(new Reference(srcObjId, dstObjId, srcClassName, dstClassName));
Reference r = new Reference(srcObjId, dstObjId, srcClassName, dstClassName);
idx = references.indexOf(r);
if (idx < 0) {
references.add(r);
idx = references.indexOf(r);
}
}
} else if (a.getAliasType() == AliasType.CONSTRACTOR_INVOCATION) {
MethodInvocation c = (MethodInvocation) a.getOccurrencePoint().getStatement();
String srcObjId = a.getMethodExecution().getThisObjId();
View
14
■■■■■
 src/org/ntlab/deltaViewer/CollaborationViewer.java
}
}
for (Alias alias: aliasCollector.getAliasList()) {
if (alias.getAliasType() == Alias.AliasType.THIS) {
if (!objectToVertexMap.containsKey(alias.getObjectId())) {
if (!objectToVertexMap.containsKey(alias.getObjectId()) && alias.getMethodExecution().isStatic()) {
// When both of the calling and called method are static.
String thisObjId = alias.getObjectId();
String thisClassName = alias.getMethodExecution().getThisClassName();
mxICell vertex = (mxICell) mxgraph.insertDeltaVertex(getMxDefaultParent(), thisObjId, thisClassName, 0, 0, objecVertexWidth, ObjectVertexHeight, "fillColor=white"); //creates a white vertex.
srcClassName = methodInvocation.getThisClassName();
fieldName = nextAliasObjId;
}
}
if(statement != null && statement instanceof FieldAccess
&& curAliasObjId.equals(((FieldAccess)statement).getContainerObjId())) { // Contains alias type of nextAlias is FIELD.
if (statement != null && statement instanceof FieldAccess) {
FieldAccess fieldAccess = (FieldAccess)statement;
String containerId = fieldAccess.getContainerObjId();
if (fieldAccess.getFieldName() != null) {
String fieldNames[] = formatFieldName(fieldAccess.getFieldName());
srcClassName = fieldNames[0];
fieldName = fieldNames[1];
} else {
srcClassName = fieldAccess.getContainerClassName();
fieldName = nextAliasObjId;
}
if (containerId.matches("0")) {
containerId = "0:" + srcClassName;
}
if (!curAliasObjId.equals(containerId)) { // Contains alias type of nextAlias is FIELD.
srcClassName = null;
fieldName = null;
}
}
}
System.out.println(TAG + ": srcClassName=" + srcClassName + "(curObjectId=" + curAliasObjId + ") -- fieldName=" + fieldName + " --> " + "(nextObjectId" + nextAliasObjId + ")");