From e1de2fd4dcb1caa750ecc4a25f5fa0033c082f78 Mon Sep 17 00:00:00 2001 From: Alexandre Montplaisir Date: Thu, 6 Nov 2014 20:40:08 +0100 Subject: [PATCH] tmf: Remove source and reference from ITmfEvent Those two notions were originally meant to have every trace type give them a specific meaning, but to have some "common" concepts that would be shown in the default event table. Now that we have the possibility to aggregate columns in the event table from multiple trace types, there is no need for those vague concepts anymore. Every trace is free to implement and show any specific item it wants. The base interface should be for the absolute minimum that is required by the framework. In fact, the notions of "source" and "reference" already meant different things for different trace types (the Source of a CTF event was the source CPU, while the source of a pcap event was the source address). So these should *not* be aggregated in the same event columns since they do not represent the same concepts. Note: For the trace types that did make use of the source and reference fields, this patch simply adds new fields to those traces, with the names "source" and "reference" for now. But now that they will be decoupled from the interface, we will be free to rename them accordingly. Change-Id: I84f9729edee64233893779ca9c375a0a157bfc84 Signed-off-by: Alexandre Montplaisir Reviewed-on: https://git.eclipse.org/r/36131 Tested-by: Hudson CI Reviewed-by: Genevieve Bastien --- .../btf/core/tests/utils/TestBtfTrace.java | 2 +- .../tracecompass/btf/core/event/BtfEvent.java | 33 ++++- .../btf/ui/BtfEventTableColumns.java | 11 +- .../gdbtrace/core/event/GdbTraceEvent.java | 33 ++++- .../ui/views/events/GdbEventTableColumns.java | 6 +- .../LttngKernelCpuUsageStateProvider.java | 8 +- .../kernel/LttngKernelStateProvider.java | 11 +- .../events/LttngEventTableColumns.java | 6 +- .../xml/core/model/TmfXmlStateAttribute.java | 9 +- .../xml/core/model/TmfXmlStateValue.java | 8 +- .../component/TmfProviderManagerTest.java | 2 +- .../core/tests/event/TmfEventFieldTest.java | 2 +- .../tmf/core/tests/event/TmfEventTest.java | 114 +++++------------- .../tests/filter/TmfCollapseFilterTest.java | 12 +- .../mipmap/TmfMipmapStateProviderStub.java | 2 +- .../tests/trace/stub/XmlStubTraceTest.java | 6 - .../TmfAsyncSequenceDiagramEventTest.java | 6 +- .../TmfSyncSequenceDiagramEventTest.java | 4 +- .../tests/stubs/event/TmfSyncEventStub.java | 4 +- .../tests/stubs/trace/TmfEventParserStub.java | 6 +- .../tests/stubs/trace/text/SyslogEvent.java | 12 +- .../tests/stubs/trace/text/SyslogTrace.java | 4 +- .../stubs/trace/xml/TmfXmlTraceStub.java | 5 +- .../tmf/core/event/ITmfEvent.java | 11 -- .../tracecompass/tmf/core/event/TmfEvent.java | 47 +------- .../tmf/core/event/TmfLostEvent.java | 8 +- .../core/filter/model/TmfFilterTreeNode.java | 9 +- .../tmf/core/parsers/custom/CustomEvent.java | 11 +- .../core/parsers/custom/CustomTxtEvent.java | 9 +- .../core/parsers/custom/CustomTxtTrace.java | 2 +- .../core/parsers/custom/CustomXmlEvent.java | 9 +- .../core/parsers/custom/CustomXmlTrace.java | 2 +- .../statesystem/AbstractTmfStateProvider.java | 4 +- .../tmf/core/trace/text/TextTraceEvent.java | 10 +- .../tmf/ctf/core/event/CtfTmfEvent.java | 50 ++++++-- .../tmf/pcap/core/event/PcapEvent.java | 24 +++- .../pcap/ui/editor/PcapEventTableColumns.java | 25 +++- .../table/CollapseEventsInTableTest.java | 10 +- .../TmfBaseColumnDataProviderTest.java | 10 +- .../statistics/TmfBaseStatisticsDataTest.java | 10 +- .../TmfTreeContentProviderTest.java | 8 +- .../uml2sd/trace/TmfUml2SDTestTrace.java | 6 +- .../tmf/ui/commands/ExportToTextRequest.java | 4 - .../events/columns/TmfReferenceColumn.java | 47 -------- .../events/columns/TmfSourceColumn.java | 47 -------- .../events/TmfEventPropertySource.java | 10 -- .../tmf/ui/viewers/events/TmfEventsCache.java | 14 --- .../tmf/ui/viewers/events/TmfEventsTable.java | 2 - .../events/columns/TmfEventTableColumn.java | 8 -- 49 files changed, 273 insertions(+), 430 deletions(-) delete mode 100644 org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/viewers/events/columns/TmfReferenceColumn.java delete mode 100644 org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/viewers/events/columns/TmfSourceColumn.java diff --git a/org.eclipse.tracecompass.btf.core.tests/src/org/eclipse/tracecompass/btf/core/tests/utils/TestBtfTrace.java b/org.eclipse.tracecompass.btf.core.tests/src/org/eclipse/tracecompass/btf/core/tests/utils/TestBtfTrace.java index 7dd0404a52..0b48329099 100644 --- a/org.eclipse.tracecompass.btf.core.tests/src/org/eclipse/tracecompass/btf/core/tests/utils/TestBtfTrace.java +++ b/org.eclipse.tracecompass.btf.core.tests/src/org/eclipse/tracecompass/btf/core/tests/utils/TestBtfTrace.java @@ -62,7 +62,7 @@ public class TestBtfTrace { if (event == null) { System.out.println("null"); } else { - System.out.println(event.getRank() + " " + event.getTimestamp().getValue() + " " + event.getSource() + " " + event.getType().getName() + " " + event.getContent().toString()); + System.out.println(event.getRank() + " " + event.getTimestamp().getValue() + " " + event.getType().getName() + " " + event.getContent().toString()); } } diff --git a/org.eclipse.tracecompass.btf.core/src/org/eclipse/tracecompass/btf/core/event/BtfEvent.java b/org.eclipse.tracecompass.btf.core/src/org/eclipse/tracecompass/btf/core/event/BtfEvent.java index cf11429b1c..e4ac31c3c6 100644 --- a/org.eclipse.tracecompass.btf.core/src/org/eclipse/tracecompass/btf/core/event/BtfEvent.java +++ b/org.eclipse.tracecompass.btf.core/src/org/eclipse/tracecompass/btf/core/event/BtfEvent.java @@ -27,6 +27,8 @@ import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; public class BtfEvent extends TmfEvent { private final String fDescription; + private final String fSource; + private final String fReference; /** * Standard constructor. @@ -48,10 +50,18 @@ public class BtfEvent extends TmfEvent { * @param reference * the event reference */ - public BtfEvent(final ITmfTrace trace, long rank, final ITmfTimestamp timestamp, final String source, - final ITmfEventType type, String description, final ITmfEventField content, final String reference) { - super(trace, rank, timestamp, source, type, content, reference); + public BtfEvent(final ITmfTrace trace, + final long rank, + final ITmfTimestamp timestamp, + final String source, + final ITmfEventType type, + final String description, + final ITmfEventField content, + final String reference) { + super(trace, rank, timestamp, type, content); fDescription = description; + fSource = source; + fReference = reference; } /** @@ -63,4 +73,21 @@ public class BtfEvent extends TmfEvent { return fDescription; } + /** + * Returns the source of this event. + * + * @return This event's source + */ + public String getSource() { + return fSource; + } + + /** + * Returns the reference of this event. + * + * @return This event's reference + */ + public String getReference() { + return fReference; + } } diff --git a/org.eclipse.tracecompass.btf.ui/src/org/eclipse/tracecompass/btf/ui/BtfEventTableColumns.java b/org.eclipse.tracecompass.btf.ui/src/org/eclipse/tracecompass/btf/ui/BtfEventTableColumns.java index 334d4d587d..7a9167fa94 100644 --- a/org.eclipse.tracecompass.btf.ui/src/org/eclipse/tracecompass/btf/ui/BtfEventTableColumns.java +++ b/org.eclipse.tracecompass.btf.ui/src/org/eclipse/tracecompass/btf/ui/BtfEventTableColumns.java @@ -16,6 +16,7 @@ package org.eclipse.tracecompass.btf.ui; import java.util.Collection; import org.eclipse.jdt.annotation.NonNull; +import org.eclipse.tracecompass.btf.core.event.BtfEvent; import org.eclipse.tracecompass.btf.core.trace.BtfColumnNames; import org.eclipse.tracecompass.tmf.core.event.ITmfEvent; import org.eclipse.tracecompass.tmf.ui.viewers.events.columns.ITmfEventTableColumns; @@ -58,7 +59,10 @@ public class BtfEventTableColumns implements ITmfEventTableColumns { @Override public String getItemString(ITmfEvent event) { - String ret = event.getSource(); + if (!(event instanceof BtfEvent)) { + return EMPTY_STRING; + } + String ret = ((BtfEvent) event).getSource(); return (ret == null ? EMPTY_STRING : ret); } @@ -90,7 +94,10 @@ public class BtfEventTableColumns implements ITmfEventTableColumns { @Override public String getItemString(ITmfEvent event) { - String ret = event.getReference(); + if (!(event instanceof BtfEvent)) { + return EMPTY_STRING; + } + String ret = ((BtfEvent) event).getReference(); return (ret == null ? EMPTY_STRING : ret); } diff --git a/org.eclipse.tracecompass.gdbtrace.core/src/org/eclipse/tracecompass/internal/gdbtrace/core/event/GdbTraceEvent.java b/org.eclipse.tracecompass.gdbtrace.core/src/org/eclipse/tracecompass/internal/gdbtrace/core/event/GdbTraceEvent.java index 0f05368a30..0327fe15de 100644 --- a/org.eclipse.tracecompass.gdbtrace.core/src/org/eclipse/tracecompass/internal/gdbtrace/core/event/GdbTraceEvent.java +++ b/org.eclipse.tracecompass.gdbtrace.core/src/org/eclipse/tracecompass/internal/gdbtrace/core/event/GdbTraceEvent.java @@ -25,6 +25,13 @@ import org.eclipse.tracecompass.tmf.core.trace.ITmfContext; */ public class GdbTraceEvent extends TmfEvent { + // ------------------------------------------------------------------------ + // Fields + // ------------------------------------------------------------------------ + + private final String fSource; + private final String fReference; + // ------------------------------------------------------------------------ // Constructors // ------------------------------------------------------------------------ @@ -33,7 +40,9 @@ public class GdbTraceEvent extends TmfEvent { * Default constructor */ public GdbTraceEvent() { - super(null, ITmfContext.UNKNOWN_RANK, null, null, null, null, null); + super(null, ITmfContext.UNKNOWN_RANK, null, null, null); + fSource = null; + fReference = null; } /** @@ -54,7 +63,27 @@ public class GdbTraceEvent extends TmfEvent { */ public GdbTraceEvent(GdbTrace trace, ITmfTimestamp timestamp, String source, ITmfEventType type, GdbTraceEventContent content, String reference) { - super(trace, ITmfContext.UNKNOWN_RANK, timestamp, source, type, content, reference); + super(trace, ITmfContext.UNKNOWN_RANK, timestamp, type, content); + fSource = source; + fReference = reference; + } + + /** + * Return the event's source + * + * @return The event source + */ + public String getSource() { + return fSource; + } + + /** + * Return the event's reference + * + * @return The event reference + */ + public String getReference() { + return fReference; } @Override diff --git a/org.eclipse.tracecompass.gdbtrace.ui/src/org/eclipse/tracecompass/internal/gdbtrace/ui/views/events/GdbEventTableColumns.java b/org.eclipse.tracecompass.gdbtrace.ui/src/org/eclipse/tracecompass/internal/gdbtrace/ui/views/events/GdbEventTableColumns.java index 0e445a4861..4465ea14cf 100644 --- a/org.eclipse.tracecompass.gdbtrace.ui/src/org/eclipse/tracecompass/internal/gdbtrace/ui/views/events/GdbEventTableColumns.java +++ b/org.eclipse.tracecompass.gdbtrace.ui/src/org/eclipse/tracecompass/internal/gdbtrace/ui/views/events/GdbEventTableColumns.java @@ -15,6 +15,7 @@ package org.eclipse.tracecompass.internal.gdbtrace.ui.views.events; import java.util.Collection; import org.eclipse.jdt.annotation.NonNull; +import org.eclipse.tracecompass.internal.gdbtrace.core.event.GdbTraceEvent; import org.eclipse.tracecompass.internal.gdbtrace.core.event.GdbTraceEventContent; import org.eclipse.tracecompass.tmf.core.event.ITmfEvent; import org.eclipse.tracecompass.tmf.ui.viewers.events.columns.ITmfEventTableColumns; @@ -61,7 +62,10 @@ public class GdbEventTableColumns implements ITmfEventTableColumns { @Override public String getItemString(ITmfEvent event) { - String ret = event.getReference(); + if (!(event instanceof GdbTraceEvent)) { + return EMPTY_STRING; + } + String ret = ((GdbTraceEvent) event).getReference(); return (ret == null ? EMPTY_STRING : ret); } diff --git a/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/lttng2/kernel/core/analysis/cpuusage/LttngKernelCpuUsageStateProvider.java b/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/lttng2/kernel/core/analysis/cpuusage/LttngKernelCpuUsageStateProvider.java index 5a34be308c..effeebb66d 100644 --- a/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/lttng2/kernel/core/analysis/cpuusage/LttngKernelCpuUsageStateProvider.java +++ b/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/lttng2/kernel/core/analysis/cpuusage/LttngKernelCpuUsageStateProvider.java @@ -27,6 +27,7 @@ import org.eclipse.tracecompass.tmf.core.event.ITmfEvent; import org.eclipse.tracecompass.tmf.core.event.ITmfEventField; import org.eclipse.tracecompass.tmf.core.statesystem.AbstractTmfStateProvider; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; +import org.eclipse.tracecompass.tmf.ctf.core.event.CtfTmfEvent; /** * Creates a state system with the total time spent on CPU for each thread and @@ -80,7 +81,12 @@ public class LttngKernelCpuUsageStateProvider extends AbstractTmfStateProvider { } @Override - protected void eventHandle(ITmfEvent event) { + protected void eventHandle(ITmfEvent uncheckedEvent) { + if (!(uncheckedEvent instanceof CtfTmfEvent)) { + return; + } + final CtfTmfEvent event = (CtfTmfEvent) uncheckedEvent; + final String eventName = event.getType().getName(); if (eventName.equals(fLayout.eventSchedSwitch())) { diff --git a/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/lttng2/kernel/core/analysis/kernel/LttngKernelStateProvider.java b/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/lttng2/kernel/core/analysis/kernel/LttngKernelStateProvider.java index b670fb0fde..abfe58f6da 100644 --- a/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/lttng2/kernel/core/analysis/kernel/LttngKernelStateProvider.java +++ b/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/lttng2/kernel/core/analysis/kernel/LttngKernelStateProvider.java @@ -28,6 +28,7 @@ import org.eclipse.tracecompass.tmf.core.event.ITmfEvent; import org.eclipse.tracecompass.tmf.core.event.ITmfEventField; import org.eclipse.tracecompass.tmf.core.statesystem.AbstractTmfStateProvider; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; +import org.eclipse.tracecompass.tmf.ctf.core.event.CtfTmfEvent; import com.google.common.collect.ImmutableMap; @@ -140,11 +141,11 @@ public class LttngKernelStateProvider extends AbstractTmfStateProvider { } @Override - protected void eventHandle(ITmfEvent event) { - /* - * AbstractStateChangeInput should have already checked for the correct - * class type - */ + protected void eventHandle(ITmfEvent uncheckedEvent) { + if (!(uncheckedEvent instanceof CtfTmfEvent)) { + return; + } + final CtfTmfEvent event = (CtfTmfEvent) uncheckedEvent; final String eventName = event.getType().getName(); final long ts = event.getTimestamp().getValue(); diff --git a/org.eclipse.tracecompass.lttng2.kernel.ui/src/org/eclipse/tracecompass/internal/lttng2/kernel/ui/viewers/events/LttngEventTableColumns.java b/org.eclipse.tracecompass.lttng2.kernel.ui/src/org/eclipse/tracecompass/internal/lttng2/kernel/ui/viewers/events/LttngEventTableColumns.java index 0eb5f98284..2528b87b81 100644 --- a/org.eclipse.tracecompass.lttng2.kernel.ui/src/org/eclipse/tracecompass/internal/lttng2/kernel/ui/viewers/events/LttngEventTableColumns.java +++ b/org.eclipse.tracecompass.lttng2.kernel.ui/src/org/eclipse/tracecompass/internal/lttng2/kernel/ui/viewers/events/LttngEventTableColumns.java @@ -16,6 +16,7 @@ import java.util.Collection; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.tracecompass.tmf.core.event.ITmfEvent; +import org.eclipse.tracecompass.tmf.ctf.core.event.CtfTmfEvent; import org.eclipse.tracecompass.tmf.ui.viewers.events.columns.ITmfEventTableColumns; import org.eclipse.tracecompass.tmf.ui.viewers.events.columns.TmfEventTableColumn; @@ -49,7 +50,10 @@ public class LttngEventTableColumns implements ITmfEventTableColumns { @Override public String getItemString(ITmfEvent event) { - String ret = event.getReference(); + if (!(event instanceof CtfTmfEvent)) { + return EMPTY_STRING; + } + String ret = ((CtfTmfEvent) event).getReference(); return (ret == null ? EMPTY_STRING : ret); } diff --git a/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/tmf/analysis/xml/core/model/TmfXmlStateAttribute.java b/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/tmf/analysis/xml/core/model/TmfXmlStateAttribute.java index 96a418392b..cf9fdf94a3 100644 --- a/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/tmf/analysis/xml/core/model/TmfXmlStateAttribute.java +++ b/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/tmf/analysis/xml/core/model/TmfXmlStateAttribute.java @@ -221,9 +221,10 @@ public abstract class TmfXmlStateAttribute implements ITmfXmlStateAttribute { return quark; } /* special case if field is CPU which is not in the field */ - if (fName.equals(TmfXmlStrings.CPU)) { - quark = getQuarkRelativeAndAdd(startQuark, event.getSource()); - } else { + /* FIXME Disabled until we can use event criteria */ +// if (fName.equals(TmfXmlStrings.CPU)) { +// quark = getQuarkRelativeAndAdd(startQuark, event.getSource()); +// } else { final ITmfEventField content = event.getContent(); /* stop if the event field doesn't exist */ if (content.getField(fName) == null) { @@ -242,7 +243,7 @@ public abstract class TmfXmlStateAttribute implements ITmfXmlStateAttribute { Integer fieldInterger = (Integer) field; quark = getQuarkRelativeAndAdd(startQuark, fieldInterger.toString()); } - } +// } return quark; } case QUERY: { diff --git a/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/tmf/analysis/xml/core/model/TmfXmlStateValue.java b/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/tmf/analysis/xml/core/model/TmfXmlStateValue.java index df92e0387a..5ebe3fc0a4 100644 --- a/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/tmf/analysis/xml/core/model/TmfXmlStateValue.java +++ b/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/tmf/analysis/xml/core/model/TmfXmlStateValue.java @@ -253,10 +253,10 @@ public abstract class TmfXmlStateValue implements ITmfXmlStateValue { final ITmfEventField content = event.getContent(); /* Exception for "CPU", returns the source of this event */ - /* FIXME : Nameclash if a eventfield have "cpu" for name. */ - if (fieldName.equals(TmfXmlStrings.CPU)) { - return TmfStateValue.newValueInt(Integer.valueOf(event.getSource())); - } + /* FIXME Disabled until we can use event criteria instead */ +// if (fieldName.equals(TmfXmlStrings.CPU)) { +// return TmfStateValue.newValueInt(Integer.valueOf(event.getSource())); +// } /* Exception also for "TIMESTAMP", returns the timestamp of this event */ if (fieldName.equals(TmfXmlStrings.TIMESTAMP)) { return TmfStateValue.newValueLong(event.getTimestamp().getValue()); diff --git a/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/component/TmfProviderManagerTest.java b/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/component/TmfProviderManagerTest.java index 12929a902d..b9978af2b0 100644 --- a/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/component/TmfProviderManagerTest.java +++ b/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/component/TmfProviderManagerTest.java @@ -77,7 +77,7 @@ public class TmfProviderManagerTest { private class TmfEvent3 extends TmfEvent { private TmfEvent3() { - super(null, ITmfContext.UNKNOWN_RANK, null, null, null, null, null); + super(null, ITmfContext.UNKNOWN_RANK, null, null, null); } } diff --git a/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/event/TmfEventFieldTest.java b/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/event/TmfEventFieldTest.java index 2814d93864..0e3b00bdf6 100644 --- a/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/event/TmfEventFieldTest.java +++ b/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/event/TmfEventFieldTest.java @@ -289,7 +289,7 @@ public class TmfEventFieldTest { public void testNonEqualsValue() { final String fieldName = "myfield"; final Object value1 = new String("test-string"); - final Object value2 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, null, null, null, null, null); + final Object value2 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, null, null, null); final TmfEventField[] fields = { fField1, fField2 }; final TmfEventField field1 = new TmfEventField(fieldName, value1, fields); diff --git a/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/event/TmfEventTest.java b/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/event/TmfEventTest.java index 025dc1f93c..297b646ae1 100644 --- a/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/event/TmfEventTest.java +++ b/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/event/TmfEventTest.java @@ -46,7 +46,6 @@ public class TmfEventTest { // Variables // ------------------------------------------------------------------------ - private final String fSource = "Source"; private final @NonNull ITmfTrace fTrace = STUB_TRACE.getTrace(); private final String fTypeId = "TestType"; @@ -63,8 +62,7 @@ public class TmfEventTest { private final String fRawContent1 = fField1a.toString() + fField1b.toString(); private final ITmfEventField fContent1 = new TmfEventField(fRawContent1, null, fFields1); private final TmfTimestamp fTimestamp1 = new TmfTimestamp(12345, 2); - private final String fReference1 = "Some reference"; - private final @NonNull ITmfEvent fEvent1 = new TmfEvent(fTrace, 0, fTimestamp1, fSource, fType, fContent1, fReference1); + private final @NonNull ITmfEvent fEvent1 = new TmfEvent(fTrace, 0, fTimestamp1, fType, fContent1); private final Object fValue2a = "Another string"; private final Object fValue2b = Integer.valueOf(-4); @@ -74,8 +72,7 @@ public class TmfEventTest { private final String fRawContent2 = fField2a.toString() + fField2b.toString(); private final ITmfEventField fContent2 = new TmfEventField(fRawContent2, null, fFields2); private final TmfTimestamp fTimestamp2 = new TmfTimestamp(12350, 2); - private final String fReference2 = "Some other reference"; - private final @NonNull ITmfEvent fEvent2 = new TmfEvent(fTrace, 1, fTimestamp2, fSource, fType, fContent2, fReference2); + private final @NonNull ITmfEvent fEvent2 = new TmfEvent(fTrace, 1, fTimestamp2, fType, fContent2); // ------------------------------------------------------------------------ // Helper functions @@ -92,14 +89,12 @@ public class TmfEventTest { @Test public void testDefaultConstructor() { - final ITmfEvent event = new TmfEvent(fTrace, ITmfContext.UNKNOWN_RANK, null, null, null, null, null); + final ITmfEvent event = new TmfEvent(fTrace, ITmfContext.UNKNOWN_RANK, null, null, null); assertNotNull("getTrace", event.getTrace()); assertEquals("getRank", ITmfContext.UNKNOWN_RANK, event.getRank()); assertNull("getTimestamp", event.getTimestamp()); - assertNull("getSource", event.getSource()); assertNull("getType", event.getType()); assertNull("getContent", event.getContent()); - assertNull("getReference", event.getReference()); } @Test @@ -107,43 +102,35 @@ public class TmfEventTest { assertNotNull("getTrace", fEvent1.getTrace()); assertEquals("getRank", 0, fEvent1.getRank()); assertEquals("getTimestamp", fTimestamp1, fEvent1.getTimestamp()); - assertEquals("getSource", fSource, fEvent1.getSource()); assertEquals("getType", fType, fEvent1.getType()); assertEquals("getContent", fContent1, fEvent1.getContent()); - assertEquals("getReference", fReference1, fEvent1.getReference()); assertNotNull("getTrace", fEvent2.getTrace()); assertEquals("getRank", 1, fEvent2.getRank()); assertEquals("getTimestamp", fTimestamp2, fEvent2.getTimestamp()); - assertEquals("getSource", fSource, fEvent2.getSource()); assertEquals("getType", fType, fEvent2.getType()); assertEquals("getContent", fContent2, fEvent2.getContent()); - assertEquals("getReference", fReference2, fEvent2.getReference()); } @Test public void testNoRankConstructor() { - final ITmfEvent event = new TmfEvent(fTrace, ITmfContext.UNKNOWN_RANK, fTimestamp1, fSource, fType, fContent1, fReference1); + final ITmfEvent event = new TmfEvent(fTrace, ITmfContext.UNKNOWN_RANK, fTimestamp1, fType, fContent1); assertNotNull("getTrace", event.getTrace()); assertEquals("getRank", ITmfContext.UNKNOWN_RANK, event.getRank()); assertEquals("getTimestamp", fTimestamp1, event.getTimestamp()); - assertEquals("getSource", fSource, event.getSource()); assertEquals("getType", fType, event.getType()); assertEquals("getContent", fContent1, event.getContent()); - assertEquals("getReference", fReference1, event.getReference()); } @Test public void testConstructorWithTrace() { final ITmfTrace trace = fTrace; - final ITmfEvent event = new TmfEvent(trace, 0, fTimestamp1, fSource, fType, fContent1, fReference1); + final ITmfEvent event = new TmfEvent(trace, 0, fTimestamp1, fType, fContent1); assertNotNull("getTrace", event.getTrace()); assertEquals("getRank", 0, event.getRank()); assertEquals("getTimestamp", fTimestamp1, event.getTimestamp()); - assertEquals("getSource", fSource, event.getSource()); assertEquals("getType", fType, event.getType()); assertEquals("getContent", fContent1, event.getContent()); - assertEquals("getReference", fReference1, event.getReference()); trace.dispose(); } @@ -153,10 +140,8 @@ public class TmfEventTest { assertNotNull("getTrace", event.getTrace()); assertEquals("getRank", 0, event.getRank()); assertEquals("getTimestamp", fTimestamp1, event.getTimestamp()); - assertEquals("getSource", fSource, event.getSource()); assertEquals("getType", fType, event.getType()); assertEquals("getContent", fContent1, event.getContent()); - assertEquals("getReference", fReference1, event.getReference()); } // ------------------------------------------------------------------------ @@ -165,14 +150,14 @@ public class TmfEventTest { @Test public void testHashCode() { - ITmfEvent event1 = new TmfEvent(fTrace, ITmfContext.UNKNOWN_RANK, null, null, null, null, null); - ITmfEvent event2 = new TmfEvent(fTrace, ITmfContext.UNKNOWN_RANK, null, null, null, null, null); + ITmfEvent event1 = new TmfEvent(fTrace, ITmfContext.UNKNOWN_RANK, null, null, null); + ITmfEvent event2 = new TmfEvent(fTrace, ITmfContext.UNKNOWN_RANK, null, null, null); assertTrue("hashCode", event1.hashCode() == event2.hashCode()); final ITmfTrace trace = fTrace; - event1 = new TmfEvent(trace, 0, fTimestamp1, fSource, fType, fContent1, fReference1); - event2 = new TmfEvent(trace, 1, fTimestamp2, fSource, fType, fContent2, fReference2); + event1 = new TmfEvent(trace, 0, fTimestamp1, fType, fContent1); + event2 = new TmfEvent(trace, 1, fTimestamp2, fType, fContent2); final ITmfEvent event1b = new TmfEvent(event1); final ITmfEvent event2b = new TmfEvent(event2); @@ -238,12 +223,12 @@ public class TmfEventTest { final ITmfTrace trace1 = fTrace; final ITmfTrace trace2 = STUB_TRACE.getTrace(); - final ITmfEvent event1 = new TmfEvent(trace1, 0, fTimestamp1, fSource, fType, fContent1, fReference1); - ITmfEvent event2 = new TmfEvent(trace1, 0, fTimestamp1, fSource, fType, fContent1, fReference1); + final ITmfEvent event1 = new TmfEvent(trace1, 0, fTimestamp1, fType, fContent1); + ITmfEvent event2 = new TmfEvent(trace1, 0, fTimestamp1, fType, fContent1); assertTrue("equals", event1.equals(event2)); assertTrue("equals", event2.equals(event1)); - event2 = new TmfEvent(trace2, 0, fTimestamp1, fSource, fType, fContent1, fReference1); + event2 = new TmfEvent(trace2, 0, fTimestamp1, fType, fContent1); assertFalse("equals", event1.equals(event2)); assertFalse("equals", event2.equals(event1)); @@ -252,52 +237,36 @@ public class TmfEventTest { @Test public void testNonEqualRanks() { - final ITmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1); - ITmfEvent event2 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1); + final ITmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fType, fContent1); + ITmfEvent event2 = new TmfEvent(null, 0, fTimestamp1, fType, fContent1); assertTrue("equals", event1.equals(event2)); assertTrue("equals", event2.equals(event1)); - event2 = new TmfEvent(null, 1, fTimestamp1, fSource, fType, fContent1, fReference1); + event2 = new TmfEvent(null, 1, fTimestamp1, fType, fContent1); assertFalse("equals", event1.equals(event2)); assertFalse("equals", event2.equals(event1)); } @Test public void testNonEqualTimestamps() { - final ITmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1); - ITmfEvent event2 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1); + final ITmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fType, fContent1); + ITmfEvent event2 = new TmfEvent(null, 0, fTimestamp1, fType, fContent1); assertTrue("equals", event1.equals(event2)); assertTrue("equals", event2.equals(event1)); - event2 = new TmfEvent(null, 0, fTimestamp2, fSource, fType, fContent1, fReference1); + event2 = new TmfEvent(null, 0, fTimestamp2, fType, fContent1); assertFalse("equals", event1.equals(event2)); assertFalse("equals", event2.equals(event1)); - event2 = new TmfEvent(null, 0, null, fSource, fType, fContent1, fReference1); - assertFalse("equals", event1.equals(event2)); - assertFalse("equals", event2.equals(event1)); - } - - @Test - public void testNonEqualSources() { - final ITmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1); - ITmfEvent event2 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1); - assertTrue("equals", event1.equals(event2)); - assertTrue("equals", event2.equals(event1)); - - event2 = new TmfEvent(null, 0, fTimestamp1, fSource + "x", fType, fContent1, fReference1); - assertFalse("equals", event1.equals(event2)); - assertFalse("equals", event2.equals(event1)); - - event2 = new TmfEvent(null, 0, fTimestamp1, null, fType, fContent1, fReference1); + event2 = new TmfEvent(null, 0, null, fType, fContent1); assertFalse("equals", event1.equals(event2)); assertFalse("equals", event2.equals(event1)); } @Test public void testNonEqualTypes() { - final ITmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1); - ITmfEvent event2 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1); + final ITmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fType, fContent1); + ITmfEvent event2 = new TmfEvent(null, 0, fTimestamp1, fType, fContent1); assertTrue("equals", event1.equals(event2)); assertTrue("equals", event2.equals(event1)); @@ -305,43 +274,27 @@ public class TmfEventTest { final String[] labels = new String[] { fLabel2, fLabel1 }; final TmfEventType newType = new TmfEventType(typeId, TmfEventField.makeRoot(labels)); - event2 = new TmfEvent(null, 0, fTimestamp1, fSource, newType, fContent1, fReference1); + event2 = new TmfEvent(null, 0, fTimestamp1, newType, fContent1); assertFalse("equals", event1.equals(event2)); assertFalse("equals", event2.equals(event1)); - event2 = new TmfEvent(null, 0, fTimestamp1, fSource, null, fContent1, fReference1); + event2 = new TmfEvent(null, 0, fTimestamp1, null, fContent1); assertFalse("equals", event1.equals(event2)); assertFalse("equals", event2.equals(event1)); } @Test public void testNonEqualContents() { - final ITmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1); - ITmfEvent event2 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1); - assertTrue("equals", event1.equals(event2)); - assertTrue("equals", event2.equals(event1)); - - event2 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent2, fReference1); - assertFalse("equals", event1.equals(event2)); - assertFalse("equals", event2.equals(event1)); - - event2 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, null, fReference1); - assertFalse("equals", event1.equals(event2)); - assertFalse("equals", event2.equals(event1)); - } - - @Test - public void testNonEqualReferences() { - final ITmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1); - ITmfEvent event2 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1); + final ITmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fType, fContent1); + ITmfEvent event2 = new TmfEvent(null, 0, fTimestamp1, fType, fContent1); assertTrue("equals", event1.equals(event2)); assertTrue("equals", event2.equals(event1)); - event2 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference2); + event2 = new TmfEvent(null, 0, fTimestamp1, fType, fContent2); assertFalse("equals", event1.equals(event2)); assertFalse("equals", event2.equals(event1)); - event2 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, null); + event2 = new TmfEvent(null, 0, fTimestamp1, fType, null); assertFalse("equals", event1.equals(event2)); assertFalse("equals", event2.equals(event1)); } @@ -352,12 +305,12 @@ public class TmfEventTest { @Test public void testToString() { - final String expected1 = "TmfEvent [fTimestamp=" + fTimestamp1 + ", fTrace=" + fTrace + ", fRank=0, fSource=" + fSource - + ", fType=" + fType + ", fContent=" + fContent1 + ", fReference=" + fReference1 + "]"; + final String expected1 = "TmfEvent [fTimestamp=" + fTimestamp1 + ", fTrace=" + fTrace + + ", fRank=0, fType=" + fType + ", fContent=" + fContent1 + "]"; assertEquals("toString", expected1, fEvent1.toString()); - final String expected2 = "TmfEvent [fTimestamp=" + fTimestamp2 + ", fTrace=" + fTrace + ", fRank=1, fSource=" + fSource - + ", fType=" + fType + ", fContent=" + fContent2 + ", fReference=" + fReference2 + "]"; + final String expected2 = "TmfEvent [fTimestamp=" + fTimestamp2 + ", fTrace=" + fTrace + + ", fRank=1, fType=" + fType + ", fContent=" + fContent2 + "]"; assertEquals("toString", expected2, fEvent2.toString()); } @@ -374,9 +327,8 @@ public class TmfEventTest { } ExtendedEvent event = new ExtendedEvent(fEvent1); String expected = "ExtendedEvent [fTimestamp=" + fTimestamp1 - + ", fTrace=" + fTrace + ", fRank=0, fSource=" + fSource - + ", fType=" + fType + ", fContent=" + fContent1 - + ", fReference=" + fReference1 + "]"; + + ", fTrace=" + fTrace + ", fRank=0" + + ", fType=" + fType + ", fContent=" + fContent1 + "]"; assertEquals(expected, event.toString()); } diff --git a/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/filter/TmfCollapseFilterTest.java b/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/filter/TmfCollapseFilterTest.java index 7a29afd60d..99c3438fec 100644 --- a/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/filter/TmfCollapseFilterTest.java +++ b/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/filter/TmfCollapseFilterTest.java @@ -134,7 +134,7 @@ public class TmfCollapseFilterTest { private final boolean fIsCollapsible; CollapsibleEvent(boolean isCollapsible) { - super(fTrace, ITmfContext.UNKNOWN_RANK, null, null, null, null, null); + super(fTrace, ITmfContext.UNKNOWN_RANK, null, null, null); fIsCollapsible = isCollapsible; } @@ -166,11 +166,6 @@ public class TmfCollapseFilterTest { return new TmfNanoTimestamp(100); } - @Override - public String getSource() { - return ""; - } - @Override public ITmfEventType getType() { return new TmfEventType(); @@ -180,10 +175,5 @@ public class TmfCollapseFilterTest { public ITmfEventField getContent() { return new TmfEventField("testField", "test", null); } - - @Override - public String getReference() { - return "remote"; - } } } diff --git a/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/statesystem/mipmap/TmfMipmapStateProviderStub.java b/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/statesystem/mipmap/TmfMipmapStateProviderStub.java index 153cd9328c..a12480304c 100644 --- a/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/statesystem/mipmap/TmfMipmapStateProviderStub.java +++ b/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/statesystem/mipmap/TmfMipmapStateProviderStub.java @@ -111,7 +111,7 @@ class TmfMipmapStateProviderStub extends AbstractTmfMipmapStateProvider { ITmfTimestamp timestamp = new TmfNanoTimestamp(time); ITmfEventType eventType = new TmfEventType(MIPMAP_ID, null); ITmfEventField content = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, value, null); - ITmfEvent event = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, timestamp, null, eventType, content, null); + ITmfEvent event = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, timestamp, eventType, content); return event; } } diff --git a/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/stub/XmlStubTraceTest.java b/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/stub/XmlStubTraceTest.java index e4a20ff57d..91dbb54991 100644 --- a/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/stub/XmlStubTraceTest.java +++ b/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/stub/XmlStubTraceTest.java @@ -128,9 +128,6 @@ public class XmlStubTraceTest { switch (event.getType().getName()) { case EVENT_A: { ITmfEventField content = event.getContent(); - if (!event.getSource().equals("1")) { - return new Status(IStatus.ERROR, TmfCoreTestPlugin.PLUGIN_ID, "Events of type A should have source 1 but was " + event.getSource()); - } if (content.getField(FIELD_A) == null) { return new Status(IStatus.ERROR, TmfCoreTestPlugin.PLUGIN_ID, String.format("Field %s does not exist in event %s", FIELD_A, EVENT_A)); } @@ -138,9 +135,6 @@ public class XmlStubTraceTest { } case EVENT_B: { ITmfEventField content = event.getContent(); - if (!event.getSource().equals("2")) { - return new Status(IStatus.ERROR, TmfCoreTestPlugin.PLUGIN_ID, "Events of type B should have source 2 but was " + event.getSource()); - } if (content.getField(FIELD_B) == null) { return new Status(IStatus.ERROR, TmfCoreTestPlugin.PLUGIN_ID, String.format("Field %s does not exist in event %s", FIELD_B, EVENT_B)); } diff --git a/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/uml2sd/TmfAsyncSequenceDiagramEventTest.java b/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/uml2sd/TmfAsyncSequenceDiagramEventTest.java index 7553ddd450..68d19ae05c 100644 --- a/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/uml2sd/TmfAsyncSequenceDiagramEventTest.java +++ b/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/uml2sd/TmfAsyncSequenceDiagramEventTest.java @@ -39,9 +39,7 @@ public class TmfAsyncSequenceDiagramEventTest { private final TmfTimestamp fTimestamp1 = new TmfTimestamp(12345, (byte) 2); private final TmfTimestamp fTimestamp2 = new TmfTimestamp(12350, (byte) 2); - private final String fSource = "Source"; private final TmfEventType fType = new TmfEventType(fTypeId, TmfEventField.makeRoot(fLabels)); - private final String fReference = "Some reference"; private final ITmfEvent fEvent1; private final ITmfEvent fEvent2; @@ -53,10 +51,10 @@ public class TmfAsyncSequenceDiagramEventTest { */ public TmfAsyncSequenceDiagramEventTest() { fContent1 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some content", null); - fEvent1 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp1, fSource, fType, fContent1, fReference); + fEvent1 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp1, fType, fContent1); fContent2 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some other content", null); - fEvent2 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp2, fSource, fType, fContent2, fReference); + fEvent2 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp2, fType, fContent2); } /** diff --git a/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/uml2sd/TmfSyncSequenceDiagramEventTest.java b/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/uml2sd/TmfSyncSequenceDiagramEventTest.java index a9227d1132..f68093cbaa 100644 --- a/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/uml2sd/TmfSyncSequenceDiagramEventTest.java +++ b/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/uml2sd/TmfSyncSequenceDiagramEventTest.java @@ -38,9 +38,7 @@ public class TmfSyncSequenceDiagramEventTest { private final String[] fLabels = new String[] { fLabel0, fLabel1 }; private final TmfTimestamp fTimestamp1 = new TmfTimestamp(12345, (byte) 2); - private final String fSource = "Source"; private final TmfEventType fType = new TmfEventType(fTypeId, TmfEventField.makeRoot(fLabels)); - private final String fReference = "Some reference"; private final ITmfEvent fEvent1; private final TmfEventField fContent1; @@ -50,7 +48,7 @@ public class TmfSyncSequenceDiagramEventTest { */ public TmfSyncSequenceDiagramEventTest() { fContent1 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some content", null); - fEvent1 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp1, fSource, fType, fContent1, fReference); + fEvent1 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp1, fType, fContent1); } /** diff --git a/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/event/TmfSyncEventStub.java b/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/event/TmfSyncEventStub.java index 93d32242b2..6cb2ae7298 100644 --- a/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/event/TmfSyncEventStub.java +++ b/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/event/TmfSyncEventStub.java @@ -39,9 +39,7 @@ public class TmfSyncEventStub extends TmfEvent { super(trace, ITmfContext.UNKNOWN_RANK, timestamp, - stub, new TmfEventTypeStub(), - new TmfEventField(stub, stub, null), - stub); + new TmfEventField(stub, stub, null)); } } diff --git a/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/TmfEventParserStub.java b/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/TmfEventParserStub.java index bd14908ce7..d0f7456e38 100644 --- a/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/TmfEventParserStub.java +++ b/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/TmfEventParserStub.java @@ -91,9 +91,9 @@ public class TmfEventParserStub implements ITmfEventParser { stream.seek(location); final long ts = stream.readLong(); - final String source = stream.readUTF(); + stream.readUTF(); /* Previously source, now unused */ final String type = stream.readUTF(); - final int reference = stream.readInt(); + stream.readInt(); /* Previously reference, now unused */ final int typeIndex = Integer.parseInt(type.substring(typePrefix.length())); final String[] fields = new String[typeIndex]; for (int i = 0; i < typeIndex; i++) { @@ -113,7 +113,7 @@ public class TmfEventParserStub implements ITmfEventParser { final ITmfEvent event = new TmfEvent(fEventStream, ITmfContext.UNKNOWN_RANK, fEventStream.createTimestamp(ts * 1000000L), - source, fTypes[typeIndex], root, String.valueOf(reference)); + fTypes[typeIndex], root); return event; } catch (final EOFException e) { } catch (final IOException e) { diff --git a/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/text/SyslogEvent.java b/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/text/SyslogEvent.java index a9c28b1825..961e108bfd 100644 --- a/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/text/SyslogEvent.java +++ b/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/text/SyslogEvent.java @@ -31,7 +31,7 @@ public class SyslogEvent extends TextTraceEvent implements ITmfCollapsibleEvent * Default constructor */ public SyslogEvent() { - super(null, null, null, new SyslogEventType(), null, null); + super(null, null, new SyslogEventType(), null); } /** @@ -52,18 +52,14 @@ public class SyslogEvent extends TextTraceEvent implements ITmfCollapsibleEvent * the parent trace * @param timestamp * the event timestamp - * @param source - * the event source * @param type * the event type * @param content * the event content (payload) - * @param reference - * the event reference */ - public SyslogEvent(SyslogTrace parentTrace, final ITmfTimestamp timestamp, final String source, - final ITmfEventType type, final TextTraceEventContent content, final String reference) { - super(parentTrace, timestamp, source, type, content, reference); + public SyslogEvent(SyslogTrace parentTrace, final ITmfTimestamp timestamp, + final ITmfEventType type, final TextTraceEventContent content) { + super(parentTrace, timestamp, type, content); } @Override diff --git a/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/text/SyslogTrace.java b/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/text/SyslogTrace.java index 6b4102f1d6..5243b38088 100644 --- a/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/text/SyslogTrace.java +++ b/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/text/SyslogTrace.java @@ -91,10 +91,8 @@ public class SyslogTrace extends TextTrace { SyslogEvent event = new SyslogEvent( this, timestamp, - "", //$NON-NLS-1$ SyslogEventType.INSTANCE, - content, - ""); //$NON-NLS-1$ + content); //$NON-NLS-1$ return event; } diff --git a/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/xml/TmfXmlTraceStub.java b/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/xml/TmfXmlTraceStub.java index b6c921fd87..04aec45d13 100644 --- a/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/xml/TmfXmlTraceStub.java +++ b/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/xml/TmfXmlTraceStub.java @@ -74,7 +74,6 @@ public class TmfXmlTraceStub extends TmfTrace { /* XML elements and attributes names */ private static final String EVENT_NAME_FIELD = "Message"; //$NON-NLS-1$ private static final String FIELD_NAMES_FIELD = "fields"; //$NON-NLS-1$ - private static final String SOURCE_FIELD = "source"; //$NON-NLS-1$ private static final String VALUES_FIELD = "values"; //$NON-NLS-1$ private static final String TYPES_FIELD = "type"; //$NON-NLS-1$ private static final String VALUES_SEPARATOR = " \\| "; //$NON-NLS-1$ @@ -242,7 +241,9 @@ public class TmfXmlTraceStub extends TmfTrace { ITmfEventType customEventType = event.getType(); TmfEventType eventType = new TmfEventType(getStringValue(content, EVENT_NAME_FIELD), customEventType.getRootField()); ITmfEventField eventFields = new CustomEventContent(content.getName(), content.getValue(), fieldsArray); - TmfEvent newEvent = new TmfEvent(this, ITmfContext.UNKNOWN_RANK, event.getTimestamp(), getStringValue(content, SOURCE_FIELD), eventType, eventFields, event.getReference()); + // FIXME We used to use getSource() to get the CPU. Now this will have + // to be done differently. + TmfEvent newEvent = new TmfEvent(this, ITmfContext.UNKNOWN_RANK, event.getTimestamp(), eventType, eventFields); updateAttributes(savedContext, event.getTimestamp()); context.increaseRank(); diff --git a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/ITmfEvent.java b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/ITmfEvent.java index 8e1ef8a360..9026ac25f6 100644 --- a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/ITmfEvent.java +++ b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/ITmfEvent.java @@ -90,11 +90,6 @@ public interface ITmfEvent extends IAdaptable { */ ITmfTimestamp getTimestamp(); - /** - * @return the event source - */ - String getSource(); - /** * @return the event type */ @@ -104,10 +99,4 @@ public interface ITmfEvent extends IAdaptable { * @return the event content */ ITmfEventField getContent(); - - /** - * @return the event reference - */ - String getReference(); - } diff --git a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/TmfEvent.java b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/TmfEvent.java index c1f93454db..91a3101864 100644 --- a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/TmfEvent.java +++ b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/TmfEvent.java @@ -39,10 +39,8 @@ public class TmfEvent extends PlatformObject implements ITmfEvent { private final ITmfTrace fTrace; private final long fRank; private final ITmfTimestamp fTimestamp; - private final String fSource; private final ITmfEventType fType; private final ITmfEventField fContent; - private final String fReference; // ------------------------------------------------------------------------ // Constructors @@ -53,12 +51,12 @@ public class TmfEvent extends PlatformObject implements ITmfEvent { * used normally. * * @deprecated Do not use, extension-point use only. Use - * {@link #TmfEvent(ITmfTrace, long, ITmfTimestamp, String, ITmfEventType, ITmfEventField, String)} + * {@link #TmfEvent(ITmfTrace, long, ITmfTimestamp, ITmfEventType, ITmfEventField)} * instead. */ @Deprecated public TmfEvent() { - this(null, ITmfContext.UNKNOWN_RANK, null, null, null, null, null); + this(null, ITmfContext.UNKNOWN_RANK, null, null, null); } /** @@ -71,30 +69,22 @@ public class TmfEvent extends PlatformObject implements ITmfEvent { * {@link ITmfContext#UNKNOWN_RANK} as default value * @param timestamp * the event timestamp - * @param source - * the event source * @param type * the event type * @param content * the event content (payload) - * @param reference - * the event reference * @since 2.0 */ public TmfEvent(final ITmfTrace trace, final long rank, final ITmfTimestamp timestamp, - final String source, final ITmfEventType type, - final ITmfEventField content, - final String reference) { + final ITmfEventField content) { fTrace = trace; fRank = rank; fTimestamp = timestamp; - fSource = source; fType = type; fContent = content; - fReference = reference; } /** @@ -106,10 +96,8 @@ public class TmfEvent extends PlatformObject implements ITmfEvent { fTrace = event.getTrace(); fRank = event.getRank(); fTimestamp = event.getTimestamp(); - fSource = event.getSource(); fType = event.getType(); fContent = event.getContent(); - fReference = event.getReference(); } // ------------------------------------------------------------------------ @@ -138,11 +126,6 @@ public class TmfEvent extends PlatformObject implements ITmfEvent { return fTimestamp; } - @Override - public String getSource() { - return fSource; - } - @Override public ITmfEventType getType() { return fType; @@ -153,11 +136,6 @@ public class TmfEvent extends PlatformObject implements ITmfEvent { return fContent; } - @Override - public String getReference() { - return fReference; - } - // ------------------------------------------------------------------------ // Object // ------------------------------------------------------------------------ @@ -169,10 +147,8 @@ public class TmfEvent extends PlatformObject implements ITmfEvent { result = prime * result + ((fTrace == null) ? 0 : fTrace.hashCode()); result = prime * result + (int) (fRank ^ (fRank >>> 32)); result = prime * result + ((fTimestamp == null) ? 0 : fTimestamp.hashCode()); - result = prime * result + ((fSource == null) ? 0 : fSource.hashCode()); result = prime * result + ((fType == null) ? 0 : fType.hashCode()); result = prime * result + ((fContent == null) ? 0 : fContent.hashCode()); - result = prime * result + ((fReference == null) ? 0 : fReference.hashCode()); return result; } @@ -205,13 +181,6 @@ public class TmfEvent extends PlatformObject implements ITmfEvent { } else if (!fTimestamp.equals(other.fTimestamp)) { return false; } - if (fSource == null) { - if (other.fSource != null) { - return false; - } - } else if (!fSource.equals(other.fSource)) { - return false; - } if (fType == null) { if (other.fType != null) { return false; @@ -226,13 +195,6 @@ public class TmfEvent extends PlatformObject implements ITmfEvent { } else if (!fContent.equals(other.fContent)) { return false; } - if (fReference == null) { - if (other.fReference != null) { - return false; - } - } else if (!fReference.equals(other.fReference)) { - return false; - } return true; } @@ -241,8 +203,7 @@ public class TmfEvent extends PlatformObject implements ITmfEvent { public String toString() { return getClass().getSimpleName() + " [fTimestamp=" + getTimestamp() + ", fTrace=" + getTrace() + ", fRank=" + getRank() - + ", fSource=" + getSource() + ", fType=" + getType() - + ", fContent=" + getContent() + ", fReference=" + getReference() + + ", fType=" + getType() + ", fContent=" + getContent() + "]"; } diff --git a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/TmfLostEvent.java b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/TmfLostEvent.java index e9aea22517..2b0a339d39 100644 --- a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/TmfLostEvent.java +++ b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/TmfLostEvent.java @@ -46,12 +46,8 @@ public class TmfLostEvent extends TmfEvent implements ITmfLostEvent { * the event rank (in the trace) * @param timestamp * the event timestamp - * @param source - * the event source * @param type * the event type - * @param reference - * the event reference * @param timeRange * the 'problematic' time range * @param nbLostEvents @@ -61,12 +57,10 @@ public class TmfLostEvent extends TmfEvent implements ITmfLostEvent { public TmfLostEvent(final ITmfTrace trace, final long rank, final ITmfTimestamp timestamp, - final String source, final ITmfEventType type, - final String reference, final TmfTimeRange timeRange, final long nbLostEvents) { - super(trace, rank, timestamp, source, type, null, reference); + super(trace, rank, timestamp, type, null); fTimeRange = timeRange; fNbLostEvents = nbLostEvents; } diff --git a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/filter/model/TmfFilterTreeNode.java b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/filter/model/TmfFilterTreeNode.java index ca21892006..ef9ee9f918 100644 --- a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/filter/model/TmfFilterTreeNode.java +++ b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/filter/model/TmfFilterTreeNode.java @@ -142,14 +142,7 @@ public abstract class TmfFilterTreeNode implements ITmfFilterTreeNode, Cloneable } else if (ITmfEvent.EVENT_FIELD_TIMESTAMP.equals(field)) { value = event.getTimestamp().toString(); - } - else if (ITmfEvent.EVENT_FIELD_SOURCE.equals(field)) { - value = event.getSource(); - } - else if (ITmfEvent.EVENT_FIELD_REFERENCE.equals(field)) { - value = event.getReference(); - } - else { + } else { if (field == null) { return null; } diff --git a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomEvent.java b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomEvent.java index 15b46267ab..446629b9b6 100644 --- a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomEvent.java +++ b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomEvent.java @@ -68,7 +68,7 @@ public class CustomEvent extends TmfEvent { * The trace definition to which this event belongs */ public CustomEvent(CustomTraceDefinition definition) { - super(null, ITmfContext.UNKNOWN_RANK, null, null, null, null, null); + super(null, ITmfContext.UNKNOWN_RANK, null, null, null); fDefinition = definition; fData = new HashMap<>(); } @@ -101,18 +101,13 @@ public class CustomEvent extends TmfEvent { * Parent trace object * @param timestamp * Timestamp of this event - * @param source - * Source of the event * @param type * Event type - * @param reference - * Event reference */ public CustomEvent(CustomTraceDefinition definition, ITmfTrace parentTrace, - ITmfTimestamp timestamp, String source, TmfEventType type, - String reference) { + ITmfTimestamp timestamp, TmfEventType type) { /* Do not use upstream's fields for stuff we override */ - super(parentTrace, ITmfContext.UNKNOWN_RANK, null, source, null, null, reference); + super(parentTrace, ITmfContext.UNKNOWN_RANK, null, null, null); fDefinition = definition; fData = new HashMap<>(); diff --git a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomTxtEvent.java b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomTxtEvent.java index 0968134941..b7433a49c5 100644 --- a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomTxtEvent.java +++ b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomTxtEvent.java @@ -63,17 +63,12 @@ public class CustomTxtEvent extends CustomEvent { * Parent trace object * @param timestamp * Timestamp of this event - * @param source - * Source of this event * @param type * Event type - * @param reference - * Reference if this event */ public CustomTxtEvent(CustomTxtTraceDefinition definition, - ITmfTrace parentTrace, ITmfTimestamp timestamp, String source, - TmfEventType type, String reference) { - super(definition, parentTrace, timestamp, source, type, reference); + ITmfTrace parentTrace, ITmfTimestamp timestamp, TmfEventType type) { + super(definition, parentTrace, timestamp, type); } @Override diff --git a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomTxtTrace.java b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomTxtTrace.java index b31ec1d8e1..4932929ac3 100644 --- a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomTxtTrace.java +++ b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomTxtTrace.java @@ -385,7 +385,7 @@ public class CustomTxtTrace extends TmfTrace implements ITmfEventParser, ITmfPer * @return The first event */ public CustomTxtEvent parseFirstLine(final CustomTxtTraceContext context) { - final CustomTxtEvent event = new CustomTxtEvent(fDefinition, this, TmfTimestamp.ZERO, "", fEventType, ""); //$NON-NLS-1$ //$NON-NLS-2$ + final CustomTxtEvent event = new CustomTxtEvent(fDefinition, this, TmfTimestamp.ZERO, fEventType); event.processGroups(context.inputLine, context.firstLineMatcher); event.setContent(new CustomEventContent(event, new StringBuffer(context.firstLine))); return event; diff --git a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomXmlEvent.java b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomXmlEvent.java index df0cb435ce..a4f3c59223 100644 --- a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomXmlEvent.java +++ b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomXmlEvent.java @@ -59,15 +59,12 @@ public class CustomXmlEvent extends CustomEvent { * Parent trace object * @param timestamp * Timestamp of the event - * @param source - * Source of the event * @param type * Event type - * @param reference - * Reference of the event */ - public CustomXmlEvent(CustomXmlTraceDefinition definition, ITmfTrace parentTrace, ITmfTimestamp timestamp, String source, TmfEventType type, String reference) { - super(definition, parentTrace, timestamp, source, type, reference); + public CustomXmlEvent(CustomXmlTraceDefinition definition, + ITmfTrace parentTrace, ITmfTimestamp timestamp, TmfEventType type) { + super(definition, parentTrace, timestamp, type); } @Override diff --git a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomXmlTrace.java b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomXmlTrace.java index fba0bfb4ed..f4b7ba5e3f 100644 --- a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomXmlTrace.java +++ b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomXmlTrace.java @@ -479,7 +479,7 @@ public class CustomXmlTrace extends TmfTrace implements ITmfEventParser, ITmfPer * @return The extracted event */ public CustomXmlEvent extractEvent(final Element element, final InputElement inputElement) { - final CustomXmlEvent event = new CustomXmlEvent(fDefinition, this, TmfTimestamp.ZERO, "", fEventType, ""); //$NON-NLS-1$ //$NON-NLS-2$ + final CustomXmlEvent event = new CustomXmlEvent(fDefinition, this, TmfTimestamp.ZERO, fEventType); event.setContent(new CustomEventContent(event, new StringBuffer())); parseElement(element, event, inputElement); return event; diff --git a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statesystem/AbstractTmfStateProvider.java b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statesystem/AbstractTmfStateProvider.java index 6101b0a97a..599d5fa3c2 100644 --- a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statesystem/AbstractTmfStateProvider.java +++ b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statesystem/AbstractTmfStateProvider.java @@ -164,14 +164,14 @@ public abstract class AbstractTmfStateProvider implements ITmfStateProvider { /** Fake event indicating the build is over, and the provider should close */ private static class EndEvent extends TmfEvent { public EndEvent() { - super(null, ITmfContext.UNKNOWN_RANK, null, null, null, null, null); + super(null, ITmfContext.UNKNOWN_RANK, null, null, null); } } /** Fake event indicating we want to clear the current queue */ private static class EmptyQueueEvent extends TmfEvent { public EmptyQueueEvent() { - super(null, ITmfContext.UNKNOWN_RANK, null, null, null, null, null); + super(null, ITmfContext.UNKNOWN_RANK, null, null, null); } } diff --git a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/trace/text/TextTraceEvent.java b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/trace/text/TextTraceEvent.java index 3f9ad4aab2..18bc7e80e1 100644 --- a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/trace/text/TextTraceEvent.java +++ b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/trace/text/TextTraceEvent.java @@ -36,22 +36,16 @@ public abstract class TextTraceEvent extends TmfEvent { * The parent trace * @param timestamp * The event timestamp - * @param source - * The event source * @param type * The event type * @param content * The event content (payload) - * @param reference - * The event reference */ public TextTraceEvent(TextTrace parentTrace, final ITmfTimestamp timestamp, - final String source, final ITmfEventType type, - final TextTraceEventContent content, - final String reference) { - super(parentTrace, ITmfContext.UNKNOWN_RANK, timestamp, source, type, content, reference); + final TextTraceEventContent content) { + super(parentTrace, ITmfContext.UNKNOWN_RANK, timestamp, type, content); } /** diff --git a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/CtfTmfEvent.java b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/CtfTmfEvent.java index a2349be550..5c7670987c 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/CtfTmfEvent.java +++ b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/CtfTmfEvent.java @@ -63,8 +63,11 @@ public class CtfTmfEvent extends TmfEvent private final long fTypeId; private final String fEventName; private final IEventDeclaration fEventDeclaration; - @NonNull - private final EventDefinition fEvent; + private final @NonNull EventDefinition fEvent; + private final String fSource; + private final String fReference; + + /** Lazy-loaded field containing the event's payload */ private ITmfEventField fContent; // ------------------------------------------------------------------------ @@ -79,12 +82,16 @@ public class CtfTmfEvent extends TmfEvent super(trace, rank, timestamp, - String.valueOf(cpu), // Source - null, // Event type. We don't use TmfEvent's field here, we - // re-implement getType() - null, // Content handled with a lazy loaded re-implemented in - // getContent() - fileName // Reference + /* + * Event type. We don't use TmfEvent's field here, we + * re-implement getType(). + */ + null, + /* + * Content handled with a lazy-loaded field re-implemented in + * getContent(). + */ + null ); fEventDeclaration = declaration; @@ -92,7 +99,8 @@ public class CtfTmfEvent extends TmfEvent fTypeId = declaration.getId().longValue(); fEventName = declaration.getName(); fEvent = eventDefinition; - + fSource = String.valueOf(cpu); + fReference = fileName; } /** @@ -111,14 +119,14 @@ public class CtfTmfEvent extends TmfEvent ITmfContext.UNKNOWN_RANK, new CtfTmfTimestamp(-1), null, - null, - new TmfEventField("", null, new CtfTmfEventField[0]), //$NON-NLS-1$ - null); + new TmfEventField("", null, new CtfTmfEventField[0])); //$NON-NLS-1$ fSourceCPU = -1; fTypeId = -1; fEventName = EMPTY_CTF_EVENT_NAME; fEventDeclaration = null; fEvent = EventDefinition.NULL_EVENT; + fSource = null; + fReference = null; } /** @@ -155,6 +163,24 @@ public class CtfTmfEvent extends TmfEvent return fTypeId; } + /** + * Return this event's source CPU. + * + * @return The source CPU + */ + public String getSource() { + return fSource; + } + + /** + * Return this event's reference + * + * @return The event's reference + */ + public String getReference() { + return fReference; + } + @Override public CtfTmfTrace getTrace() { /* diff --git a/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/event/PcapEvent.java b/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/event/PcapEvent.java index 0bfc40b6ce..3dc2b6e7a3 100644 --- a/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/event/PcapEvent.java +++ b/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/event/PcapEvent.java @@ -50,6 +50,8 @@ public class PcapEvent extends TmfEvent { private static final String EMPTY_STRING = ""; //$NON-NLS-1$ private final Packet fPacket; + private final String fSource; + private final String fReference; /** * Lazy-loaded field representing all the protocols in this event @@ -85,8 +87,28 @@ public class PcapEvent extends TmfEvent { String reference, Packet packet) { - super(trace, rank, timestamp, source, type, content, reference); + super(trace, rank, timestamp, type, content); fPacket = packet; + fSource = source; + fReference = reference; + } + + /** + * Return this event's source. + * + * @return The event's source + */ + public String getSource() { + return fSource; + } + + /** + * Return this event's reference + * + * @return The event's reference + */ + public String getReference() { + return fReference; } /** diff --git a/org.eclipse.tracecompass.tmf.pcap.ui/src/org/eclipse/tracecompass/internal/tmf/pcap/ui/editor/PcapEventTableColumns.java b/org.eclipse.tracecompass.tmf.pcap.ui/src/org/eclipse/tracecompass/internal/tmf/pcap/ui/editor/PcapEventTableColumns.java index 7318a15244..a4eb206357 100644 --- a/org.eclipse.tracecompass.tmf.pcap.ui/src/org/eclipse/tracecompass/internal/tmf/pcap/ui/editor/PcapEventTableColumns.java +++ b/org.eclipse.tracecompass.tmf.pcap.ui/src/org/eclipse/tracecompass/internal/tmf/pcap/ui/editor/PcapEventTableColumns.java @@ -41,7 +41,7 @@ public class PcapEventTableColumns implements ITmfEventTableColumns { TmfEventTableColumn.BaseColumns.TIMESTAMP, new PcapSourceColumn(), new PcapDestinationColumn(), - TmfEventTableColumn.BaseColumns.REFERENCE, + new PcapReferenceColumn(), new PcapProtocolColumn(), TmfEventTableColumn.BaseColumns.CONTENTS ); @@ -97,6 +97,29 @@ public class PcapEventTableColumns implements ITmfEventTableColumns { } } + /** + * The "packet reference" column for pcap events + */ + private static class PcapReferenceColumn extends TmfEventTableColumn { + + public PcapReferenceColumn() { + super(getString(Messages.PcapEventsTable_Reference)); + } + + @Override + public String getItemString(ITmfEvent event) { + if (!(event instanceof PcapEvent)) { + return EMPTY_STRING; + } + return ((PcapEvent) event).getReference(); + } + + @Override + public @Nullable String getFilterFieldId() { + return ITmfEvent.EVENT_FIELD_REFERENCE; + } + } + /** * The "packet protocol" column for pcap events */ diff --git a/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/table/CollapseEventsInTableTest.java b/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/table/CollapseEventsInTableTest.java index a531ee9bd4..8267c4a3bf 100644 --- a/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/table/CollapseEventsInTableTest.java +++ b/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/table/CollapseEventsInTableTest.java @@ -152,15 +152,9 @@ public class CollapseEventsInTableTest { assertEquals("first timestamp", "Jan 1 06:06:06", filterString); filterString = tableBot.cell(7, 2); - assertEquals("source", "", filterString); - - filterString = tableBot.cell(7, 3); assertEquals("type", "Syslog", filterString); - filterString = tableBot.cell(7, 4); - assertEquals("file", "", filterString); - - filterString = tableBot.cell(7, 5); + filterString = tableBot.cell(7, 3); assertEquals("content", "Timestamp=Jan 1 06:06:06, Host=HostF, Logger=LoggerF, Message=Message F", filterString); filterString = tableBot.cell(8, 0); @@ -169,7 +163,7 @@ public class CollapseEventsInTableTest { filterString = tableBot.cell(8, 1); assertEquals("first timestamp (2nd collapse)", "Jan 1 06:06:21", filterString); - filterString = tableBot.cell(8, 5); + filterString = tableBot.cell(8, 3); assertEquals("content", "Timestamp=Jan 1 06:06:21, Host=HostF, Logger=LoggerF, Message=Message D", filterString); /* Clear Filter */ diff --git a/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/statistics/TmfBaseColumnDataProviderTest.java b/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/statistics/TmfBaseColumnDataProviderTest.java index 9abfb2fda8..69ade0f8fa 100644 --- a/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/statistics/TmfBaseColumnDataProviderTest.java +++ b/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/statistics/TmfBaseColumnDataProviderTest.java @@ -69,14 +69,10 @@ public class TmfBaseColumnDataProviderTest { private final TmfTimestamp fTimestamp2 = new TmfTimestamp(12350, (byte) 2); private final TmfTimestamp fTimestamp3 = new TmfTimestamp(12355, (byte) 2); - private final String fSource = "Source"; - private final TmfEventType fType1 = new TmfEventType(fTypeId1, TmfEventField.makeRoot(fLabels)); private final TmfEventType fType2 = new TmfEventType(fTypeId1, TmfEventField.makeRoot(fLabels)); private final TmfEventType fType3 = new TmfEventType(fTypeId2, TmfEventField.makeRoot(fLabels)); - private final String fReference = "Some reference"; - private final ITmfEvent fEvent1; private final ITmfEvent fEvent2; private final ITmfEvent fEvent3; @@ -96,13 +92,13 @@ public class TmfBaseColumnDataProviderTest { */ public TmfBaseColumnDataProviderTest() { fContent1 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some content", null); - fEvent1 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp1, fSource, fType1, fContent1, fReference); + fEvent1 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp1, fType1, fContent1); fContent2 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some other content", null); - fEvent2 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp2, fSource, fType2, fContent2, fReference); + fEvent2 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp2, fType2, fContent2); fContent3 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some other different content", null); - fEvent3 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp3, fSource, fType3, fContent3, fReference); + fEvent3 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp3, fType3, fContent3); fStatsData = new TmfStatisticsTree(); diff --git a/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/statistics/TmfBaseStatisticsDataTest.java b/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/statistics/TmfBaseStatisticsDataTest.java index dc772dc786..76faf17016 100755 --- a/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/statistics/TmfBaseStatisticsDataTest.java +++ b/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/statistics/TmfBaseStatisticsDataTest.java @@ -60,14 +60,10 @@ public class TmfBaseStatisticsDataTest { private final TmfTimestamp fTimestamp2 = new TmfTimestamp(12350, (byte) 2); private final TmfTimestamp fTimestamp3 = new TmfTimestamp(12355, (byte) 2); - private final String fSource = "Source"; - private final TmfEventType fType1 = new TmfEventType(fTypeId1, TmfEventField.makeRoot(fLabels)); private final TmfEventType fType2 = new TmfEventType(fTypeId1, TmfEventField.makeRoot(fLabels)); private final TmfEventType fType3 = new TmfEventType(fTypeId2, TmfEventField.makeRoot(fLabels)); - private final String fReference = "Some reference"; - private final ITmfEvent fEvent1; private final ITmfEvent fEvent2; private final ITmfEvent fEvent3; @@ -87,13 +83,13 @@ public class TmfBaseStatisticsDataTest { */ public TmfBaseStatisticsDataTest() { fContent1 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some content", null); - fEvent1 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp1, fSource, fType1, fContent1, fReference); + fEvent1 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp1, fType1, fContent1); fContent2 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some other content", null); - fEvent2 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp2, fSource, fType2, fContent2, fReference); + fEvent2 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp2, fType2, fContent2); fContent3 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some other different content", null); - fEvent3 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp3, fSource, fType3, fContent3, fReference); + fEvent3 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp3, fType3, fContent3); fStatsTree = new TmfStatisticsTree(); diff --git a/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/statistics/TmfTreeContentProviderTest.java b/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/statistics/TmfTreeContentProviderTest.java index 383ee1fc00..34c3b1339c 100755 --- a/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/statistics/TmfTreeContentProviderTest.java +++ b/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/statistics/TmfTreeContentProviderTest.java @@ -56,13 +56,9 @@ public class TmfTreeContentProviderTest { private final TmfTimestamp fTimestamp1 = new TmfTimestamp(12345, (byte) 2); private final TmfTimestamp fTimestamp2 = new TmfTimestamp(12350, (byte) 2); - private final String fSource = "Source"; - private final TmfEventType fType1 = new TmfEventType(fTypeId1, TmfEventField.makeRoot(fLabels)); private final TmfEventType fType2 = new TmfEventType(fTypeId2, TmfEventField.makeRoot(fLabels)); - private final String fReference = "Some reference"; - private final ITmfEvent fEvent1; private final ITmfEvent fEvent2; @@ -82,10 +78,10 @@ public class TmfTreeContentProviderTest { */ public TmfTreeContentProviderTest() { fContent1 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some content", null); - fEvent1 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp1, fSource, fType1, fContent1, fReference); + fEvent1 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp1, fType1, fContent1); fContent2 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some other content", null); - fEvent2 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp2, fSource, fType2, fContent2, fReference); + fEvent2 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp2, fType2, fContent2); fStatsData = new TmfStatisticsTree(); diff --git a/org.eclipse.tracecompass.tmf.ui.tests/widgetStubs/org/eclipse/tracecompass/tmf/ui/tests/uml2sd/trace/TmfUml2SDTestTrace.java b/org.eclipse.tracecompass.tmf.ui.tests/widgetStubs/org/eclipse/tracecompass/tmf/ui/tests/uml2sd/trace/TmfUml2SDTestTrace.java index 0e422360cc..08f6b45cb2 100644 --- a/org.eclipse.tracecompass.tmf.ui.tests/widgetStubs/org/eclipse/tracecompass/tmf/ui/tests/uml2sd/trace/TmfUml2SDTestTrace.java +++ b/org.eclipse.tracecompass.tmf.ui.tests/widgetStubs/org/eclipse/tracecompass/tmf/ui/tests/uml2sd/trace/TmfUml2SDTestTrace.java @@ -76,9 +76,9 @@ public class TmfUml2SDTestTrace implements ITmfEventParser { stream.seek(location); long ts = stream.readLong(); - String source = stream.readUTF(); + stream.readUTF(); /* Previously source, now unused */ String type = stream.readUTF(); - String reference = stream.readUTF(); + stream.readUTF(); /* Previously reference, now unused */ String sender = stream.readUTF(); String receiver = stream.readUTF(); String signal = stream.readUTF(); @@ -100,7 +100,7 @@ public class TmfUml2SDTestTrace implements ITmfEventParser { fields[2] = new TmfEventField("signal", signal, null); ITmfEventField tmfContent = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, content, fields); - ITmfEvent tmfEvent = new TmfEvent(fEventStream, ITmfContext.UNKNOWN_RANK, new TmfTimestamp(ts, -9), source, tmfEventType, tmfContent, reference); + ITmfEvent tmfEvent = new TmfEvent(fEventStream, ITmfContext.UNKNOWN_RANK, new TmfTimestamp(ts, -9), tmfEventType, tmfContent); return tmfEvent; } catch (final EOFException e) { diff --git a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/commands/ExportToTextRequest.java b/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/commands/ExportToTextRequest.java index 4a1c6afce0..e1aec6a9fb 100644 --- a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/commands/ExportToTextRequest.java +++ b/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/commands/ExportToTextRequest.java @@ -80,12 +80,8 @@ public class ExportToTextRequest extends TmfEventRequest { } else { // fallback to default formatting fWriter.write(event.getTimestamp().toString()); fWriter.write('\t'); - fWriter.write(event.getSource()); - fWriter.write('\t'); fWriter.write(event.getType().getName()); fWriter.write('\t'); - fWriter.write(event.getReference()); - fWriter.write('\t'); ITmfEventField content = event.getContent(); Object value = content.getValue(); if (value != null) { diff --git a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/viewers/events/columns/TmfReferenceColumn.java b/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/viewers/events/columns/TmfReferenceColumn.java deleted file mode 100644 index 2b0d20f1f0..0000000000 --- a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/viewers/events/columns/TmfReferenceColumn.java +++ /dev/null @@ -1,47 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Ericsson - * - * All rights reserved. This program and the accompanying materials are - * made available under the terms of the Eclipse Public License v1.0 which - * accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Alexandre Montplaisir - Initial API and implementation - ******************************************************************************/ - -package org.eclipse.tracecompass.internal.tmf.ui.viewers.events.columns; - -import org.eclipse.jdt.annotation.NonNull; -import org.eclipse.tracecompass.internal.tmf.ui.Messages; -import org.eclipse.tracecompass.tmf.core.event.ITmfEvent; -import org.eclipse.tracecompass.tmf.ui.viewers.events.columns.TmfEventTableColumn; - -/** - * Column for the event reference - * - * TODO Remove me, replace with trace-type-specific columns - */ -public final class TmfReferenceColumn extends TmfEventTableColumn { - - @SuppressWarnings("null") - private static final @NonNull String HEADER = Messages.TmfEventsTable_ReferenceColumnHeader; - - /** - * Constructor - */ - public TmfReferenceColumn() { - super(HEADER); - } - - @Override - public String getItemString(ITmfEvent event) { - String ref = event.getReference(); - return (ref == null ? EMPTY_STRING : ref); - } - - @Override - public String getFilterFieldId() { - return ITmfEvent.EVENT_FIELD_REFERENCE; - } -} \ No newline at end of file diff --git a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/viewers/events/columns/TmfSourceColumn.java b/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/viewers/events/columns/TmfSourceColumn.java deleted file mode 100644 index 85d3cde65f..0000000000 --- a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/viewers/events/columns/TmfSourceColumn.java +++ /dev/null @@ -1,47 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Ericsson - * - * All rights reserved. This program and the accompanying materials are - * made available under the terms of the Eclipse Public License v1.0 which - * accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Alexandre Montplaisir - Initial API and implementation - ******************************************************************************/ - -package org.eclipse.tracecompass.internal.tmf.ui.viewers.events.columns; - -import org.eclipse.jdt.annotation.NonNull; -import org.eclipse.tracecompass.internal.tmf.ui.Messages; -import org.eclipse.tracecompass.tmf.core.event.ITmfEvent; -import org.eclipse.tracecompass.tmf.ui.viewers.events.columns.TmfEventTableColumn; - -/** - * Column for the event source - * - * TODO Remove me, replace with trace-type-specific columns - */ -public final class TmfSourceColumn extends TmfEventTableColumn { - - @SuppressWarnings("null") - private static final @NonNull String HEADER = Messages.TmfEventsTable_SourceColumnHeader; - - /** - * Constructor - */ - public TmfSourceColumn() { - super(HEADER); - } - - @Override - public String getItemString(ITmfEvent event) { - String source = event.getSource(); - return (source == null ? EMPTY_STRING : source); - } - - @Override - public String getFilterFieldId() { - return ITmfEvent.EVENT_FIELD_SOURCE; - } -} \ No newline at end of file diff --git a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/TmfEventPropertySource.java b/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/TmfEventPropertySource.java index 1dfeb92b02..91e71c4c28 100644 --- a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/TmfEventPropertySource.java +++ b/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/TmfEventPropertySource.java @@ -34,9 +34,7 @@ import org.eclipse.ui.views.properties.IPropertySource; public class TmfEventPropertySource implements IPropertySource { private static final String ID_TIMESTAMP = "event_timestamp"; //$NON-NLS-1$ - private static final String ID_SOURCE = "event_source"; //$NON-NLS-1$ private static final String ID_TYPE = "event_type"; //$NON-NLS-1$ - private static final String ID_REFERENCE = "event_reference"; //$NON-NLS-1$ private static final String ID_TRACE = "trace_attribute"; //$NON-NLS-1$ private static final String ID_CONTENT = "event_content"; //$NON-NLS-1$ private static final String ID_SOURCE_LOOKUP = "event_lookup"; //$NON-NLS-1$ @@ -44,9 +42,7 @@ public class TmfEventPropertySource implements IPropertySource { private static final String ID_CUSTOM_ATTRIBUTE = "custom_attribute"; //$NON-NLS-1$ private static final String NAME_TIMESTAMP = "Timestamp"; //$NON-NLS-1$ - private static final String NAME_SOURCE = "Source"; //$NON-NLS-1$ private static final String NAME_TYPE = "Type"; //$NON-NLS-1$ - private static final String NAME_REFERENCE = "Reference"; //$NON-NLS-1$ private static final String NAME_TRACE = "Trace"; //$NON-NLS-1$ private static final String NAME_CONTENT = "Content"; //$NON-NLS-1$ private static final String NAME_SOURCE_LOOKUP = "Source Lookup"; //$NON-NLS-1$ @@ -281,9 +277,7 @@ public class TmfEventPropertySource implements IPropertySource { /* Display basic event information */ descriptors.add(new ReadOnlyTextPropertyDescriptor(ID_TIMESTAMP, NAME_TIMESTAMP)); - descriptors.add(new ReadOnlyTextPropertyDescriptor(ID_SOURCE, NAME_SOURCE)); descriptors.add(new ReadOnlyTextPropertyDescriptor(ID_TYPE, NAME_TYPE)); - descriptors.add(new ReadOnlyTextPropertyDescriptor(ID_REFERENCE, NAME_REFERENCE)); descriptors.add(new ReadOnlyTextPropertyDescriptor(ID_TRACE, NAME_TRACE)); /* Display event fields */ @@ -314,12 +308,8 @@ public class TmfEventPropertySource implements IPropertySource { public Object getPropertyValue(Object id) { if (id.equals(ID_TIMESTAMP) && fEvent.getTimestamp() != null) { return new TimestampPropertySource(fEvent.getTimestamp()); - } else if (id.equals(ID_SOURCE) && fEvent.getSource() != null) { - return fEvent.getSource().toString(); } else if (id.equals(ID_TYPE) && fEvent.getType() != null) { return fEvent.getType().toString(); - } else if (id.equals(ID_REFERENCE) && fEvent.getReference() != null) { - return fEvent.getReference().toString(); } else if (id.equals(ID_TRACE)) { return fEvent.getTrace().getName(); } else if (id.equals(ID_MODEL_URI)) { diff --git a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/TmfEventsCache.java b/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/TmfEventsCache.java index 1ef789b368..ff22c3025b 100644 --- a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/TmfEventsCache.java +++ b/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/TmfEventsCache.java @@ -113,13 +113,6 @@ public class TmfEventsCache { * @since 3.2 */ @Override - public String getSource() { - return event.getSource(); - } - /** - * @since 3.2 - */ - @Override public ITmfEventType getType() { return event.getType(); } @@ -130,13 +123,6 @@ public class TmfEventsCache { public ITmfEventField getContent() { return event.getContent(); } - /** - * @since 3.2 - */ - @Override - public String getReference() { - return event.getReference(); - } } private final CachedEvent[] fCache; diff --git a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/TmfEventsTable.java b/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/TmfEventsTable.java index e6731664f2..0238a4e324 100644 --- a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/TmfEventsTable.java +++ b/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/TmfEventsTable.java @@ -209,9 +209,7 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, IColorS */ public static final Collection DEFAULT_COLUMNS = ImmutableList.of( TmfEventTableColumn.BaseColumns.TIMESTAMP, - TmfEventTableColumn.BaseColumns.SOURCE, TmfEventTableColumn.BaseColumns.EVENT_TYPE, - TmfEventTableColumn.BaseColumns.REFERENCE, TmfEventTableColumn.BaseColumns.CONTENTS ); diff --git a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/columns/TmfEventTableColumn.java b/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/columns/TmfEventTableColumn.java index 1aaa2fd514..80906e8559 100644 --- a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/columns/TmfEventTableColumn.java +++ b/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/columns/TmfEventTableColumn.java @@ -15,8 +15,6 @@ package org.eclipse.tracecompass.tmf.ui.viewers.events.columns; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.tracecompass.internal.tmf.ui.viewers.events.columns.TmfContentsColumn; -import org.eclipse.tracecompass.internal.tmf.ui.viewers.events.columns.TmfReferenceColumn; -import org.eclipse.tracecompass.internal.tmf.ui.viewers.events.columns.TmfSourceColumn; import org.eclipse.tracecompass.internal.tmf.ui.viewers.events.columns.TmfTimestampColumn; import org.eclipse.tracecompass.internal.tmf.ui.viewers.events.columns.TmfTypeColumn; import org.eclipse.tracecompass.tmf.core.event.ITmfEvent; @@ -48,15 +46,9 @@ public abstract class TmfEventTableColumn { /** Column showing the event timestamp */ TmfEventTableColumn TIMESTAMP = new TmfTimestampColumn(); - /** Column showing the event's source */ - TmfEventTableColumn SOURCE = new TmfSourceColumn(); - /** Column showing the event type */ TmfEventTableColumn EVENT_TYPE = new TmfTypeColumn(); - /** Column showing the event reference */ - TmfEventTableColumn REFERENCE = new TmfReferenceColumn(); - /** Column showing the aggregated event contents (fields) */ TmfEventTableColumn CONTENTS = new TmfContentsColumn(); } -- 2.34.1