diff options
| author | Alexandre Montplaisir | 2014-07-23 17:17:36 +0000 |
|---|---|---|
| committer | Alexandre Montplaisir | 2014-07-23 18:49:20 +0000 |
| commit | 6ee7e15a335c3d8b8f4e05e9cbf5eb48e9b1396c (patch) | |
| tree | 8ce2b7761f0f3b7d7a8b42a1e73c62822902462e | |
| parent | a785b9de0de864548bfe16f55dd13e9535bd1277 (diff) | |
| download | org.eclipse.linuxtools-6ee7e15a335c3d8b8f4e05e9cbf5eb48e9b1396c.tar.gz org.eclipse.linuxtools-6ee7e15a335c3d8b8f4e05e9cbf5eb48e9b1396c.tar.xz org.eclipse.linuxtools-6ee7e15a335c3d8b8f4e05e9cbf5eb48e9b1396c.zip | |
lttng: Add pcap.core to the Maven build
And added a redundant annotation to to fix the lack-of-inheritance
problem with Maven's compiler.
Change-Id: Ib78f9dbbe1842da49a2509eb3e79913b1a94783d
Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Reviewed-on: https://git.eclipse.org/r/30372
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
| -rw-r--r-- | lttng/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/util/ConversionHelper.java | 4 | ||||
| -rw-r--r-- | lttng/pom.xml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lttng/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/util/ConversionHelper.java b/lttng/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/util/ConversionHelper.java index 0d1057d72a..1cade736a8 100644 --- a/lttng/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/util/ConversionHelper.java +++ b/lttng/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/util/ConversionHelper.java @@ -16,6 +16,7 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; +import org.eclipse.jdt.annotation.NonNull; import org.eclipse.linuxtools.pcap.core.protocol.ethernet2.EthernetIIValues; import org.eclipse.linuxtools.pcap.core.protocol.ipv4.IPv4Values; @@ -26,9 +27,8 @@ import org.eclipse.linuxtools.pcap.core.protocol.ipv4.IPv4Values; */ public final class ConversionHelper { - @SuppressWarnings("null") - private static final char[] HEX_ARRAY = "0123456789abcdef".toCharArray(); //$NON-NLS-1$ + private static final @NonNull char[] HEX_ARRAY = "0123456789abcdef".toCharArray(); //$NON-NLS-1$ private static final String EMPTY_STRING = ""; //$NON-NLS-1$ private static final String DEFAULT_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss.SSS"; //$NON-NLS-1$ private static final DateFormat DATE_FORMATTER = new SimpleDateFormat(DEFAULT_TIME_PATTERN); diff --git a/lttng/pom.xml b/lttng/pom.xml index cd091a75f6..e85a03cfea 100644 --- a/lttng/pom.xml +++ b/lttng/pom.xml @@ -100,6 +100,8 @@ <module>org.eclipse.linuxtools.ctf.parser</module> <module>org.eclipse.linuxtools.ctf.parser.tests</module> + <module>org.eclipse.linuxtools.pcap.core</module> + <module>org.eclipse.linuxtools.statesystem.core</module> <module>org.eclipse.linuxtools.statesystem.core.tests</module> |