Skip to content

Commit 6500168

Browse files
committed
Remove msglen field from EMO
This value can easily be accessed via the EMO's creation message.
1 parent 882de25 commit 6500168

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

src/projections/Tools/Timeline/EntryMethodObject.java

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ class EntryMethodObject implements Comparable, Range1D, ActionListener, MainPane
4040
// save space. Take care to convert to an unsigned int when using, as Java
4141
// has no unsigned short type.
4242
private short entryPoint;
43-
private int msglen;
4443
int EventID;
4544
private ObjectId tid;
4645
int pe;
@@ -138,7 +137,6 @@ protected EntryMethodObject(Data data, TimelineEvent tle,
138137
this.packs= packs;
139138

140139
EventID = tle.EventID;
141-
msglen = tle.MsgLen;
142140
if (tle.id != null) {
143141
tid = ObjectId.createObjectId(tle.id);
144142
} else {
@@ -167,11 +165,11 @@ public String getToolTipText(){
167165

168166
infoString.append("<b>" + MainWindow.runObject[data.myRun].getEntryFullNameByID(entry, true) + "</b><br><br>");
169167

170-
if(msglen > 0) {
171-
infoString.append("<i>Msg Len</i>: " + msglen + "<br>");
168+
final TimelineMessage creationMessage = this.creationMessage();
169+
if(creationMessage != null && creationMessage.MsgLen > 0) {
170+
infoString.append("<i>Msg Len</i>: " + creationMessage.MsgLen + "<br>");
172171
}
173172

174-
175173
infoString.append("<i>Begin Time</i>: " + format_.format(beginTime));
176174
if (cpuElapsed > 0)
177175
infoString.append(" (" + format_.format(cpuBegin) + ")");
@@ -196,16 +194,15 @@ public String getToolTipText(){
196194
infoString.append("<i>Msgs created</i>: " + messages.size() + "<br>");
197195
else
198196
infoString.append("<i>Msgs created</i>: 0<br>");
199-
200-
TimelineMessage created_message = this.creationMessage();
197+
201198
boolean usedCommThreadSender = false;
202-
if(created_message != null)
199+
if(creationMessage != null)
203200
{
204-
infoString.append("<i>Msg latency is </i>: " + (beginTime - created_message.Time) + "<br>");
201+
infoString.append("<i>Msg latency is </i>: " + (beginTime - creationMessage.Time) + "<br>");
205202

206203
// If the message came from a comm thread, trace back to the actual creator if possible
207204
if (data.isCommThd(pCreation)) {
208-
final EntryMethodObject commThreadSender = created_message.getSender();
205+
final EntryMethodObject commThreadSender = creationMessage.getSender();
209206
if (commThreadSender != null) {
210207
TimelineMessage origMsg = commThreadSender.creationMessage();
211208
if (origMsg != null) {

0 commit comments

Comments
 (0)