Change-Id: I6c71c90c2d61fe4c4c3d30c8b1fb1cb0c9eac2f2
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/61197
Reviewed-by: Hudson CI
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
@Override
public void createPartControl(@Nullable Composite parent) {
// Initialize
@Override
public void createPartControl(@Nullable Composite parent) {
// Initialize
- fTableMap = new HashMap<>();
+ final Map<TmfPcapProtocol, Table> tables = new HashMap<>();
+ fTableMap = tables;
fCurrentTrace = TmfTraceManager.getInstance().getActiveTrace();
fCurrentStream = null;
fCurrentTrace = TmfTraceManager.getInstance().getActiveTrace();
fCurrentStream = null;
@Override
public void widgetSelected(@Nullable SelectionEvent e) {
@Override
public void widgetSelected(@Nullable SelectionEvent e) {
- Map<TmfPcapProtocol, Table> tables = fTableMap;
- if (tables == null || e == null) {
return;
}
TmfPcapProtocol protocol = (TmfPcapProtocol) e.item.getData(KEY_PROTOCOL);
return;
}
TmfPcapProtocol protocol = (TmfPcapProtocol) e.item.getData(KEY_PROTOCOL);
- Map<TmfPcapProtocol, Table> tables = fTableMap;
- if (tables == null) {
- return;
- }
-
tables.put(protocol, table);
// Add right click menu
tables.put(protocol, table);
// Add right click menu
@Test
public void testGetElementInFile() {
File testXmlFile = TmfXmlTestFiles.VALID_FILE.getFile();
@Test
public void testGetElementInFile() {
File testXmlFile = TmfXmlTestFiles.VALID_FILE.getFile();
- if ((testXmlFile == null) || !testXmlFile.exists()) {
- fail("XML test file does not exist");
- }
- /*
- * This sounds useless, but I get a potential null pointer warning
- * otherwise
- */
- if (testXmlFile == null) {
- return;
- }
-
+ assertNotNull("XML test file does not exist", testXmlFile);
+ assertTrue("XML test file does not exist", testXmlFile.exists());
Element analysis = XmlUtils.getElementInFile(testXmlFile.getAbsolutePath(), TmfXmlStrings.STATE_PROVIDER, ANALYSIS_ID);
assertNotNull(analysis);
}
Element analysis = XmlUtils.getElementInFile(testXmlFile.getAbsolutePath(), TmfXmlStrings.STATE_PROVIDER, ANALYSIS_ID);
assertNotNull(analysis);
}
import java.util.List;
import org.eclipse.jdt.annotation.NonNull;
import java.util.List;
import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.tracecompass.common.core.NonNullUtils;
import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
import org.eclipse.tracecompass.tmf.core.event.aspect.ITmfEventAspect;
import org.eclipse.tracecompass.tmf.core.parsers.custom.CustomEvent;
import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
import org.eclipse.tracecompass.tmf.core.event.aspect.ITmfEventAspect;
import org.eclipse.tracecompass.tmf.core.parsers.custom.CustomEvent;
@Override
public String resolve(ITmfEvent event) {
if (event instanceof CustomEvent) {
@Override
public String resolve(ITmfEvent event) {
if (event instanceof CustomEvent) {
- String ret = ((CustomEvent) event).getEventString(fIndex);
- return (ret == null ? EMPTY_STRING : ret);
+ return NonNullUtils.nullToEmptyString(((CustomEvent) event).getEventString(fIndex));