super(ITmfEventField.ROOT_FIELD_ID,
content.replaceAll("\r?\n", " | "), //$NON-NLS-1$ //$NON-NLS-2$
new ITmfEventField[] {
- new TmfEventField(TRACE_FRAME, frameNumber),
- new TmfEventField(TRACEPOINT, tracepointNumber)}
- );
+ new TmfEventField(TRACE_FRAME, frameNumber, null),
+ new TmfEventField(TRACEPOINT, tracepointNumber, null)
+ });
fTracepointNumber = tracepointNumber;
fFrameNumber = frameNumber;
if (event != null) {
GdbTraceEventContent content = (GdbTraceEventContent) event.getContent();
fields = new TmfEventField[] {
- new TmfEventField(TRACE_FRAME_COLUMN, content.getFrameNumber()),
- new TmfEventField(TRACEPOINT_COLUMN, content.getTracepointNumber()),
- new TmfEventField(FILE_COLUMN, event.getReference()),
- new TmfEventField(CONTENT_COLUMN, content.toString())
+ new TmfEventField(TRACE_FRAME_COLUMN, content.getFrameNumber(), null),
+ new TmfEventField(TRACEPOINT_COLUMN, content.getTracepointNumber(), null),
+ new TmfEventField(FILE_COLUMN, event.getReference(), null),
+ new TmfEventField(CONTENT_COLUMN, content.toString(), null)
};
}
return fields;
ITmfEventField[] fields = new TmfEventField[0];
if (event != null) {
fields = new TmfEventField[] {
- new TmfEventField(ITmfEvent.EVENT_FIELD_TIMESTAMP, event.getTimestamp().toString()),
- new TmfEventField(ITmfEvent.EVENT_FIELD_REFERENCE, event.getReference()),
- new TmfEventField(ITmfEvent.EVENT_FIELD_TYPE, event.getType().getName()),
- new TmfEventField(ITmfEvent.EVENT_FIELD_CONTENT, event.getContent().toString())
+ new TmfEventField(ITmfEvent.EVENT_FIELD_TIMESTAMP, event.getTimestamp().toString(), null),
+ new TmfEventField(ITmfEvent.EVENT_FIELD_REFERENCE, event.getReference(), null),
+ new TmfEventField(ITmfEvent.EVENT_FIELD_TYPE, event.getType().getName(), null),
+ new TmfEventField(ITmfEvent.EVENT_FIELD_CONTENT, event.getContent().toString(), null)
};
}
return fields;
@Test
public void testCtfTmfEventType() {
String eventName = "";
- ITmfEventField content = new TmfEventField("", new ITmfEventField[] {});
+ ITmfEventField content = new TmfEventField("", null, new ITmfEventField[] {});
CtfTmfEventType result = new CtfTmfEventType( eventName, content);
assertNotNull(result);
*/
@Test
public void testToString() {
- ITmfEventField emptyField = new TmfEventField("", new ITmfEventField[] {});
+ ITmfEventField emptyField = new TmfEventField("", null, new ITmfEventField[] {});
CtfTmfEventType fixture = new CtfTmfEventType("", emptyField);
String result = fixture.toString();
private final Object fValue1 = "Value";
private final Object fValue2 = Integer.valueOf(10);
- private final TmfEventField fField1 = new TmfEventField(fFieldName1, fValue1);
+ private final TmfEventField fField1 = new TmfEventField(fFieldName1, fValue1, null);
private final TmfEventField fField2 = new TmfEventField(fFieldName2, fValue2, null);
private final TmfEventField fField3 = new TmfEventField(fFieldName1, fValue2, null);
private final String fStructRootFieldName = "Root-S";
private final String[] fStructFieldNames = new String[] { fFieldName1, fFieldName2 };
- private final TmfEventField fStructTerminalField1 = new TmfEventField(fFieldName1, null);
- private final TmfEventField fStructTerminalField2 = new TmfEventField(fFieldName2, null);
- private final TmfEventField fStructTerminalField3 = new TmfEventField(fFieldName1, null);
- private final TmfEventField fStructRootField = new TmfEventField(fStructRootFieldName,
+ private final TmfEventField fStructTerminalField1 = new TmfEventField(fFieldName1, null, null);
+ private final TmfEventField fStructTerminalField2 = new TmfEventField(fFieldName2, null, null);
+ private final TmfEventField fStructTerminalField3 = new TmfEventField(fFieldName1, null, null);
+ private final TmfEventField fStructRootField = new TmfEventField(fStructRootFieldName, null,
new ITmfEventField[] { fStructTerminalField1, fStructTerminalField2 });
private final String fRootFieldName = "Root";
private final String[] fFieldNames = new String[] { fFieldName1, fFieldName2 };
- private final TmfEventField fRootField = new TmfEventField(fRootFieldName,
+ private final TmfEventField fRootField = new TmfEventField(fRootFieldName, null,
new ITmfEventField[] { fField1, fField2 });
// ------------------------------------------------------------------------
@Test
public void testNonEqualValues() {
- final TmfEventField copy1 = new TmfEventField(fFieldName1, fValue1);
- TmfEventField copy2 = new TmfEventField(fFieldName1, fValue1);
+ final TmfEventField copy1 = new TmfEventField(fFieldName1, fValue1, null);
+ TmfEventField copy2 = new TmfEventField(fFieldName1, fValue1, null);
assertTrue("equals", copy1.equals(copy2));
assertTrue("equals", copy2.equals(copy1));
- copy2 = new TmfEventField(fFieldName1, fValue2);
+ copy2 = new TmfEventField(fFieldName1, fValue2, null);
assertFalse("equals", copy1.equals(copy2));
assertFalse("equals", copy2.equals(copy1));
- copy2 = new TmfEventField(fFieldName1, null);
+ copy2 = new TmfEventField(fFieldName1, null, null);
assertFalse("equals", copy1.equals(copy2));
assertFalse("equals", copy2.equals(copy1));
}
private final Object fValue1a = "Some string";
private final Object fValue1b = Integer.valueOf(10);
- private final ITmfEventField fField1a = new TmfEventField(fLabel1, fValue1a);
- private final ITmfEventField fField1b = new TmfEventField(fLabel2, fValue1b);
+ private final ITmfEventField fField1a = new TmfEventField(fLabel1, fValue1a, null);
+ private final ITmfEventField fField1b = new TmfEventField(fLabel2, fValue1b, null);
private final ITmfEventField[] fFields1 = new ITmfEventField[] { fField1a, fField1b };
private final String fRawContent1 = fField1a.toString() + fField1b.toString();
- private final ITmfEventField fContent1 = new TmfEventField(fRawContent1, fFields1);
+ private final ITmfEventField fContent1 = new TmfEventField(fRawContent1, null, fFields1);
private final TmfTimestamp fTimestamp1 = new TmfTimestamp(12345, 2, 5);
private final String fReference1 = "Some reference";
private final ITmfEvent fEvent1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1);
private final Object fValue2a = "Another string";
private final Object fValue2b = Integer.valueOf(-4);
- private final ITmfEventField fField2a = new TmfEventField(fLabel1, fValue2a);
- private final ITmfEventField fField2b = new TmfEventField(fLabel2, fValue2b);
+ private final ITmfEventField fField2a = new TmfEventField(fLabel1, fValue2a, null);
+ private final ITmfEventField fField2b = new TmfEventField(fLabel2, fValue2b, null);
private final ITmfEventField[] fFields2 = new ITmfEventField[] { fField2a, fField2b };
private final String fRawContent2 = fField2a.toString() + fField2b.toString();
- private final ITmfEventField fContent2 = new TmfEventField(fRawContent2, fFields2);
+ private final ITmfEventField fContent2 = new TmfEventField(fRawContent2, null, fFields2);
private final TmfTimestamp fTimestamp2 = new TmfTimestamp(12350, 2, 5);
private final String fReference2 = "Some other reference";
private final ITmfEvent fEvent2 = new TmfEvent(null, 1, fTimestamp2, fSource, fType, fContent2, fReference2);
* Constructor for the test case
*/
public TmfAsyncSequenceDiagramEventTest() {
- fContent1 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some content");
+ fContent1 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some content", null);
fEvent1 = new TmfEvent(null, fTimestamp1, fSource, fType, fContent1, fReference);
- fContent2 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some other content");
+ fContent2 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some other content", null);
fEvent2 = new TmfEvent(null, fTimestamp2, fSource, fType, fContent2, fReference);
}
* Constructor for the test case
*/
public TmfSyncSequenceDiagramEventTest() {
- fContent1 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some content");
+ fContent1 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some content", null);
fEvent1 = new TmfEvent(null, fTimestamp1, fSource, fType, fContent1, fReference);
}
@SuppressWarnings("javadoc")
public class TmfEventTypeStub extends TmfEventType {
- private static final ITmfEventField FIELD_1 = new TmfEventField("Field1", null);
- private static final ITmfEventField FIELD_2 = new TmfEventField("Field2", null);
- private static final ITmfEventField FIELD_3 = new TmfEventField("Field3", null);
- private static final ITmfEventField FIELD_4 = new TmfEventField("Field4", null);
- private static final ITmfEventField FIELD_5 = new TmfEventField("Field5", null);
+ private static final ITmfEventField FIELD_1 = new TmfEventField("Field1", null, null);
+ private static final ITmfEventField FIELD_2 = new TmfEventField("Field2", null, null);
+ private static final ITmfEventField FIELD_3 = new TmfEventField("Field3", null, null);
+ private static final ITmfEventField FIELD_4 = new TmfEventField("Field4", null, null);
+ private static final ITmfEventField FIELD_5 = new TmfEventField("Field5", null, null);
private static final ITmfEventField[] FIELDS = new ITmfEventField[] {
FIELD_1, FIELD_2, FIELD_3, FIELD_4, FIELD_5 };
- private static ITmfEventField ROOT = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, FIELDS);
+ private static ITmfEventField ROOT = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, null, FIELDS);
public TmfEventTypeStub() {
super("UnitTest", "TmfEventTypeStub", ROOT);
}
content.append("]");
- final TmfEventField root = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, content.toString());
+ final TmfEventField root = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, content.toString(), null);
final ITmfEvent event = new TmfEvent(fEventStream,
new TmfTimestamp(ts, -3, 0), // millisecs
source, fTypes[typeIndex], root, reference.toString());
new CtfTmfTimestamp(-1),
null,
null,
- new TmfEventField("", new CtfTmfEventField[0]), //$NON-NLS-1$
+ new TmfEventField("", null, new CtfTmfEventField[0]), //$NON-NLS-1$
NO_STREAM);
this.sourceCPU = -1;
this.typeId = -1;
int sourceCPU = eventDef.getCPU();
ITmfEventField content = new TmfEventField(
- ITmfEventField.ROOT_FIELD_ID, parseFields(eventDef));
+ ITmfEventField.ROOT_FIELD_ID, null, parseFields(eventDef));
String reference = fileName == null ? CtfTmfEvent.NO_STREAM : fileName;
// Constructors
// ------------------------------------------------------------------------
- /**
- * Constructor for a structural field
- *
- * @param name the event field id
- * @param fields the list of subfields
- */
- public TmfEventField(final String name, final ITmfEventField[] fields) {
- this(name, null, fields);
- }
-
- /**
- * Constructor for a terminal field (no subfields)
- *
- * @param name the event field id
- * @param value the event field value
- */
- public TmfEventField(final String name, final Object value) {
- this(name, value, null);
- }
-
/**
* Full constructor
*
public final static ITmfEventField makeRoot(final String[] labels) {
final ITmfEventField[] fields = new ITmfEventField[labels.length];
for (int i = 0; i < labels.length; i++) {
- fields[i] = new TmfEventField(labels[i], null);
+ fields[i] = new TmfEventField(labels[i], null, null);
}
// Return a new root field;
- return new TmfEventField(ITmfEventField.ROOT_FIELD_ID, fields);
+ return new TmfEventField(ITmfEventField.ROOT_FIELD_ID, null, fields);
}
// ------------------------------------------------------------------------
* Constructor
*/
public TmfBaseColumnDataProviderTest() {
- fContent1 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some content");
+ fContent1 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some content", null);
fEvent1 = new TmfEvent(null, fTimestamp1, fSource, fType1, fContent1, fReference);
- fContent2 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some other content");
+ fContent2 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some other content", null);
fEvent2 = new TmfEvent(null, fTimestamp2, fSource, fType2, fContent2, fReference);
- fContent3 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some other different content");
+ fContent3 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some other different content", null);
fEvent3 = new TmfEvent(null, fTimestamp3, fSource, fType3, fContent3, fReference);
fStatsData = new TmfStatisticsTree();
* Constructor
*/
public TmfBaseStatisticsDataTest() {
- fContent1 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some content");
+ fContent1 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some content", null);
fEvent1 = new TmfEvent(null, fTimestamp1, fSource, fType1, fContent1, fReference);
- fContent2 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some other content");
+ fContent2 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some other content", null);
fEvent2 = new TmfEvent(null, fTimestamp2, fSource, fType2, fContent2, fReference);
- fContent3 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some other different content");
+ fContent3 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some other different content", null);
fEvent3 = new TmfEvent(null, fTimestamp3, fSource, fType3, fContent3, fReference);
fStatsTree = new TmfStatisticsTree();
* Constructor
*/
public TmfTreeContentProviderTest() {
- fContent1 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some content");
+ fContent1 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some content", null);
fEvent1 = new TmfEvent(null, fTimestamp1, fSource, fType1, fContent1, fReference);
- fContent2 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some other content");
+ fContent2 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some other content", null);
fEvent2 = new TmfEvent(null, fTimestamp2, fSource, fType2, fContent2, fReference);
fStatsData = new TmfStatisticsTree();
// Pre-parse the content
TmfEventField[] fields = new TmfEventField[3];
- fields[0] = new TmfEventField("sender", sender);
- fields[1] = new TmfEventField("receiver", receiver);
- fields[2] = new TmfEventField("signal", signal);
+ fields[0] = new TmfEventField("sender", sender, null);
+ fields[1] = new TmfEventField("receiver", receiver, null);
+ fields[2] = new TmfEventField("signal", signal, null);
ITmfEventField tmfContent = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, content, fields);
ITmfEvent tmfEvent = new TmfEvent(fEventStream, new TmfTimestamp(ts, -9), source, tmfEventType, tmfContent, reference);
String value = fData.get(outputColumn.name);
if (outputColumn.name.equals(CustomTraceDefinition.TAG_TIMESTAMP) && date != null) {
SimpleDateFormat dateFormat = new SimpleDateFormat(fDefinition.timeStampOutputFormat);
- fColumnData[i++] = new TmfEventField(outputColumn.name, dateFormat.format(date));
+ fColumnData[i++] = new TmfEventField(outputColumn.name, dateFormat.format(date), null);
} else {
- fColumnData[i++] = new TmfEventField(outputColumn.name, (value != null ? value : "")); //$NON-NLS-1$
+ fColumnData[i++] = new TmfEventField(outputColumn.name, (value != null ? value : ""), null); //$NON-NLS-1$
}
}
CustomEventContent curContent = (CustomEventContent) getContent();
* Event content
*/
public CustomEventContent(CustomEvent parent, StringBuffer content) {
- super(ITmfEventField.ROOT_FIELD_ID, content);
+ super(ITmfEventField.ROOT_FIELD_ID, content, null);
}
/**
private static ITmfEventField getRootField(CustomTraceDefinition definition) {
ITmfEventField[] fields = new ITmfEventField[definition.outputs.size()];
for (int i = 0; i < fields.length; i++) {
- fields[i] = new TmfEventField(definition.outputs.get(i).name, null);
+ fields[i] = new TmfEventField(definition.outputs.get(i).name, null, null);
}
- ITmfEventField rootField = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, fields);
+ ITmfEventField rootField = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, null, fields);
return rootField;
}
final String reference = event.getReference();
final String content = event.getContent().toString();
fields = new TmfEventField[] {
- new TmfEventField(ITmfEvent.EVENT_FIELD_TIMESTAMP, timestamp),
- new TmfEventField(ITmfEvent.EVENT_FIELD_SOURCE, source),
- new TmfEventField(ITmfEvent.EVENT_FIELD_TYPE, type),
- new TmfEventField(ITmfEvent.EVENT_FIELD_REFERENCE, reference),
- new TmfEventField(ITmfEvent.EVENT_FIELD_CONTENT, content)
+ new TmfEventField(ITmfEvent.EVENT_FIELD_TIMESTAMP, timestamp, null),
+ new TmfEventField(ITmfEvent.EVENT_FIELD_SOURCE, source, null),
+ new TmfEventField(ITmfEvent.EVENT_FIELD_TYPE, type, null),
+ new TmfEventField(ITmfEvent.EVENT_FIELD_REFERENCE, reference, null),
+ new TmfEventField(ITmfEvent.EVENT_FIELD_CONTENT, content, null)
};
}
return fields;
projects / deliverable / tracecompass.git / commitdiff
