From a588dfff3a4736e2204624b805496597bd745d03 Mon Sep 17 00:00:00 2001 From: Bernd Hufmann Date: Thu, 22 Oct 2015 13:40:50 -0400 Subject: [PATCH 1/1] pcap: fix sonar warnings for null references Change-Id: I8f1834d47609e3a4aeb2792f0fafe609ae7326fb Signed-off-by: Bernd Hufmann Reviewed-on: https://git.eclipse.org/r/58757 Reviewed-by: Hudson CI Reviewed-by: Matthew Khouzam Tested-by: Matthew Khouzam --- .../tracecompass/internal/tmf/pcap/core/trace/PcapTrace.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pcap/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/trace/PcapTrace.java b/pcap/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/trace/PcapTrace.java index 25387d8bd6..bc43a39492 100644 --- a/pcap/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/trace/PcapTrace.java +++ b/pcap/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/trace/PcapTrace.java @@ -28,6 +28,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; +import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.tracecompass.internal.pcap.core.packet.BadPacketException; import org.eclipse.tracecompass.internal.pcap.core.protocol.pcap.PcapPacket; @@ -68,7 +69,7 @@ public class PcapTrace extends TmfTrace implements ITmfTraceProperties { /** pcap trace type id as defined in plugin.xml */ public static final String TRACE_TYPE_ID = "org.eclipse.linuxtools.tmf.pcap.core.pcaptrace"; //$NON-NLS-1$ - private static final Collection PCAP_ASPECTS = + private @NonNull static final Collection PCAP_ASPECTS = checkNotNull(ImmutableList.of( ITmfEventAspect.BaseAspects.TIMESTAMP, PcapSourceAspect.INSTANCE, @@ -78,7 +79,7 @@ public class PcapTrace extends TmfTrace implements ITmfTraceProperties { ITmfEventAspect.BaseAspects.CONTENTS )); - private static final String EMPTY_STRING = ""; //$NON-NLS-1$ + private @NonNull static final String EMPTY_STRING = ""; //$NON-NLS-1$ private static final int CONFIDENCE = 50; private @Nullable PcapFile fPcapFile; private @Nullable Map fTraceProperties = null; -- 2.34.1