From fa5993ff78a03304f56a41a47275388cd52e5d19 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Genevi=C3=A8ve=20Bastien?= Date: Tue, 27 Aug 2013 14:14:45 -0400 Subject: [PATCH] TMF: Change abstract class TmfNetworkMatchDefinition to interface MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I72d8da6167491ea80ad67f9ff00c324f05e4b27d Signed-off-by: Geneviève Bastien Reviewed-on: https://git.eclipse.org/r/15907 Tested-by: Hudson CI Reviewed-by: Alexandre Montplaisir IP-Clean: Alexandre Montplaisir --- .../kernel/core/event/matching/TcpEventMatching.java | 4 ++-- .../core/event/matching/TcpLttngEventMatching.java | 4 ++-- ...chDefinition.java => ITmfNetworkMatchDefinition.java} | 6 +++--- .../tmf/core/event/matching/TmfNetworkEventMatching.java | 9 ++------- 4 files changed, 9 insertions(+), 14 deletions(-) rename org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/matching/{TmfNetworkMatchDefinition.java => ITmfNetworkMatchDefinition.java} (82%) diff --git a/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/event/matching/TcpEventMatching.java b/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/event/matching/TcpEventMatching.java index 7f9952a52f..bbc9455ba1 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/event/matching/TcpEventMatching.java +++ b/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/event/matching/TcpEventMatching.java @@ -20,7 +20,7 @@ import org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfTmfTrace; import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.matching.TmfEventMatching.MatchingType; import org.eclipse.linuxtools.tmf.core.event.matching.TmfNetworkEventMatching.Direction; -import org.eclipse.linuxtools.tmf.core.event.matching.TmfNetworkMatchDefinition; +import org.eclipse.linuxtools.tmf.core.event.matching.ITmfNetworkMatchDefinition; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; /** @@ -35,7 +35,7 @@ import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; * @author Geneviève Bastien * @since 3.0 */ -public class TcpEventMatching extends TmfNetworkMatchDefinition { +public class TcpEventMatching implements ITmfNetworkMatchDefinition { @Override public Direction getDirection(ITmfEvent event) { diff --git a/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/event/matching/TcpLttngEventMatching.java b/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/event/matching/TcpLttngEventMatching.java index ca9d95bb99..215d3d68e8 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/event/matching/TcpLttngEventMatching.java +++ b/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/event/matching/TcpLttngEventMatching.java @@ -22,7 +22,7 @@ import org.eclipse.linuxtools.tmf.core.event.ITmfEventField; import org.eclipse.linuxtools.tmf.core.event.TmfEventField; import org.eclipse.linuxtools.tmf.core.event.matching.TmfEventMatching.MatchingType; import org.eclipse.linuxtools.tmf.core.event.matching.TmfNetworkEventMatching.Direction; -import org.eclipse.linuxtools.tmf.core.event.matching.TmfNetworkMatchDefinition; +import org.eclipse.linuxtools.tmf.core.event.matching.ITmfNetworkMatchDefinition; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; /** @@ -36,7 +36,7 @@ import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; * @author Geneviève Bastien * @since 3.0 */ -public class TcpLttngEventMatching extends TmfNetworkMatchDefinition { +public class TcpLttngEventMatching implements ITmfNetworkMatchDefinition { private static final String[] key_seq = { TcpEventStrings.TRANSPORT_FIELDS, TcpEventStrings.TYPE_TCP, TcpEventStrings.SEQ }; private static final String[] key_ackseq = { TcpEventStrings.TRANSPORT_FIELDS, TcpEventStrings.TYPE_TCP, TcpEventStrings.ACKSEQ }; diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/matching/TmfNetworkMatchDefinition.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/matching/ITmfNetworkMatchDefinition.java similarity index 82% rename from org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/matching/TmfNetworkMatchDefinition.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/matching/ITmfNetworkMatchDefinition.java index 1a0d2e1a11..b6cf2b8119 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/matching/TmfNetworkMatchDefinition.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/matching/ITmfNetworkMatchDefinition.java @@ -16,13 +16,13 @@ import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.matching.TmfNetworkEventMatching.Direction; /** - * Base class for all network match definitions, ie traces with send and receive + * Interface for all network match definitions, ie traces with send and receive * events * * @author Geneviève Bastien * @since 3.0 */ -public abstract class TmfNetworkMatchDefinition implements ITmfMatchEventDefinition { +public interface ITmfNetworkMatchDefinition extends ITmfMatchEventDefinition { /** * Returns the direction of this event, whether 'send', 'receive' or null if @@ -32,6 +32,6 @@ public abstract class TmfNetworkMatchDefinition implements ITmfMatchEventDefinit * The event to check * @return The direction of this event, null if uninteresting event */ - public abstract Direction getDirection(ITmfEvent event); + Direction getDirection(ITmfEvent event); } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/matching/TmfNetworkEventMatching.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/matching/TmfNetworkEventMatching.java index 06536f4d80..f26ac73f8f 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/matching/TmfNetworkEventMatching.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/matching/TmfNetworkEventMatching.java @@ -119,15 +119,10 @@ public class TmfNetworkEventMatching extends TmfEventMatching { */ @Override public void matchEvent(ITmfEvent event, int traceno) { - /* - * TODO: Should find a way to assert the type is right here. For now we - * just hope developers register NetworkMatchDefinition for Network - * match types... - */ - TmfNetworkMatchDefinition def = (TmfNetworkMatchDefinition) getEventDefinition(event.getTrace()); - if (def == null) { + if (!(getEventDefinition(event.getTrace()) instanceof ITmfNetworkMatchDefinition)) { return; } + ITmfNetworkMatchDefinition def = (ITmfNetworkMatchDefinition) getEventDefinition(event.getTrace()); Direction evType = def.getDirection(event); if (evType == null) { -- 2.34.1