From 33803b9b600e79f9973ab1d49f1221f7447af371 Mon Sep 17 00:00:00 2001 From: Alexandre Montplaisir Date: Fri, 17 Jan 2014 15:23:35 -0500 Subject: [PATCH] tmf: Remove redundant CtfTmfEvent.getEventName() method ITmfEvent.getType().getName() does the same thing, and is in the interface. Change-Id: Ia19b190cda820863955504bf980139a17e1a7ded Signed-off-by: Alexandre Montplaisir Reviewed-on: https://git.eclipse.org/r/20770 Reviewed-by: Genevieve Bastien Tested-by: Hudson CI --- .../core/stateprovider/LttngKernelStateProvider.java | 2 +- .../trace/callstack/LttngUstCallStackProvider.java | 4 ++-- .../tmf/core/tests/ctfadaptor/CtfTmfEventTest.java | 4 ++-- .../tmf/core/tests/ctfadaptor/FunkyTraceTest.java | 8 ++++---- .../tmf/core/tests/ctfadaptor/headless/Benchmark.java | 2 +- .../linuxtools/tmf/core/ctfadaptor/CtfTmfEvent.java | 11 +---------- 6 files changed, 11 insertions(+), 20 deletions(-) diff --git a/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/internal/lttng2/kernel/core/stateprovider/LttngKernelStateProvider.java b/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/internal/lttng2/kernel/core/stateprovider/LttngKernelStateProvider.java index 36aa89d6db..a229fec351 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/internal/lttng2/kernel/core/stateprovider/LttngKernelStateProvider.java +++ b/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/internal/lttng2/kernel/core/stateprovider/LttngKernelStateProvider.java @@ -96,7 +96,7 @@ public class LttngKernelStateProvider extends AbstractTmfStateProvider { ITmfStateValue value; final ITmfEventField content = event.getContent(); - final String eventName = event.getEventName(); + final String eventName = event.getType().getName(); final long ts = event.getTimestamp().getValue(); try { diff --git a/org.eclipse.linuxtools.lttng2.ust.core/src/org/eclipse/linuxtools/internal/lttng2/ust/core/trace/callstack/LttngUstCallStackProvider.java b/org.eclipse.linuxtools.lttng2.ust.core/src/org/eclipse/linuxtools/internal/lttng2/ust/core/trace/callstack/LttngUstCallStackProvider.java index 5f5519ad79..72850bd6fc 100644 --- a/org.eclipse.linuxtools.lttng2.ust.core/src/org/eclipse/linuxtools/internal/lttng2/ust/core/trace/callstack/LttngUstCallStackProvider.java +++ b/org.eclipse.linuxtools.lttng2.ust.core/src/org/eclipse/linuxtools/internal/lttng2/ust/core/trace/callstack/LttngUstCallStackProvider.java @@ -128,7 +128,7 @@ public class LttngUstCallStackProvider extends CallStackStateProvider { @Override public String functionEntry(ITmfEvent event) { - String eventName = ((CtfTmfEvent) event).getEventName(); + String eventName = event.getType().getName(); if (!FUNC_ENTRY_EVENTS.contains(eventName)) { return null; } @@ -138,7 +138,7 @@ public class LttngUstCallStackProvider extends CallStackStateProvider { @Override public String functionExit(ITmfEvent event) { - String eventName = ((CtfTmfEvent) event).getEventName(); + String eventName = event.getType().getName(); if (!FUNC_EXIT_EVENTS.contains(eventName)) { return null; } diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfTmfEventTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfTmfEventTest.java index 6071b6473b..b4bf0f1a07 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfTmfEventTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfTmfEventTest.java @@ -92,7 +92,7 @@ public class CtfTmfEventTest { */ @Test public void testGetEventName() { - String result = nullEvent.getEventName(); + String result = nullEvent.getType().getName(); assertEquals("Empty CTF event", result); } @@ -214,7 +214,7 @@ public class CtfTmfEventTest { assertSame(nullEvent2, nullEvent); assertNotNull(nullEvent); assertEquals(-1, nullEvent.getCPU()); - assertEquals("Empty CTF event", nullEvent.getEventName()); + assertEquals("Empty CTF event", nullEvent.getType().getName()); assertEquals("No stream", nullEvent.getReference()); assertArrayEquals(new ITmfEventField[0], nullEvent.getContent().getFields()); assertEquals(-1L, nullEvent.getID()); diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/FunkyTraceTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/FunkyTraceTest.java index 58c4bcd95a..84ae3dd1b3 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/FunkyTraceTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/FunkyTraceTest.java @@ -85,7 +85,7 @@ public class FunkyTraceTest { @Test public void testFirstEvent() { CtfTmfEvent event = getEvent(0); - assertEquals("Simple Event", event.getEventName()); + assertEquals("Simple Event", event.getType().getName()); assertEquals(1234567, event.getTimestamp().getValue()); assertEquals(42, ((Long) event.getContent().getField("integer_field").getValue()).intValue()); assertEquals(3.1415, ((Double) event.getContent().getField("float_field").getValue()).doubleValue(), DELTA); @@ -97,7 +97,7 @@ public class FunkyTraceTest { @Test public void testSecondEvent() { CtfTmfEvent event = getEvent(1); - assertEquals("Spammy_Event", event.getEventName()); + assertEquals("Spammy_Event", event.getType().getName()); assertEquals(1234568, event.getTimestamp().getValue()); assertEquals(0, ((Long) event.getContent().getField("field_1").getValue()).intValue()); assertEquals("This is a test", event.getContent().getField("a_string").getValue()); @@ -109,7 +109,7 @@ public class FunkyTraceTest { @Test public void testSecondToLastEvent() { CtfTmfEvent event = getEvent(100000); - assertEquals("Spammy_Event", event.getEventName()); + assertEquals("Spammy_Event", event.getType().getName()); assertEquals(1334567, event.getTimestamp().getValue()); assertEquals(99999, ((Long) event.getContent().getField("field_1").getValue()).intValue()); assertEquals("This is a test", event.getContent().getField("a_string").getValue()); @@ -138,7 +138,7 @@ public class FunkyTraceTest { */ CtfTmfEvent event = getEvent(100001); - assertEquals("Complex Test Event", event.getEventName()); + assertEquals("Complex Test Event", event.getType().getName()); assertEquals(1334568, event.getTimestamp().getValue()); assertEquals(0xddf00d, ((Long) event.getContent().getField("uint_35").getValue()).intValue()); assertEquals(-12345, ((Long) event.getContent().getField("int_16").getValue()).intValue()); diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/headless/Benchmark.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/headless/Benchmark.java index 4d876ce9d5..9bb3dced6f 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/headless/Benchmark.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/headless/Benchmark.java @@ -64,7 +64,7 @@ public class Benchmark { if (USE_TEXT) { System.out.println("Event " + nbEvent + " Time " - + current.getTimestamp().toString() + " type " + current.getEventName() + + current.getTimestamp().toString() + " type " + current.getType().getName() + " on CPU " + current.getSource() + " " + current.getContent().toString()); } // advance the trace to the next event. diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfEvent.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfEvent.java index 57e26caeb2..b505fc5ba5 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfEvent.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfEvent.java @@ -128,15 +128,6 @@ public class CtfTmfEvent extends TmfEvent return this.typeId; } - /** - * Gets the name of a current event. - * - * @return The event name - */ - public String getEventName() { - return eventName; - } - @Override public CtfTmfTrace getTrace() { /* @@ -151,7 +142,7 @@ public class CtfTmfEvent extends TmfEvent CtfTmfEventType ctfTmfEventType = CtfTmfEventType.get(eventName); if (ctfTmfEventType == null) { /* Should only return null the first time */ - ctfTmfEventType = new CtfTmfEventType(this.getEventName(), this.getContent()); + ctfTmfEventType = new CtfTmfEventType(eventName, this.getContent()); } return ctfTmfEventType; } -- 2.34.1