From 5bae08671237c271be7672d1bbc514711a1452f7 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Thu, 14 Jan 2021 23:36:07 +0100 Subject: [PATCH] fix (Sonarlint) warnings --- .../database/sqlite/AbstractTxStream.java | 4 +--- .../database/text/AbstractTxStream.java | 1 - .../scviewer/database/text/TextDbLoader.java | 7 +------ .../ui/swt/internal/ArrowPainter.java | 19 ++++++++++--------- .../database/test/DatabaseServicesTest.java | 1 - 5 files changed, 12 insertions(+), 20 deletions(-) diff --git a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/AbstractTxStream.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/AbstractTxStream.java index f7cc35b..86a2ff6 100644 --- a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/AbstractTxStream.java +++ b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/AbstractTxStream.java @@ -11,8 +11,6 @@ package com.minres.scviewer.database.sqlite; import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -41,7 +39,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform { private List usedRelationsList; - public AbstractTxStream(IDatabase database, String name, long streamId) { + protected AbstractTxStream(IDatabase database, String name, long streamId) { super(name); this.database=database; this.streamId=streamId; diff --git a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/AbstractTxStream.java b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/AbstractTxStream.java index 1264e3e..7992a27 100644 --- a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/AbstractTxStream.java +++ b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/AbstractTxStream.java @@ -18,7 +18,6 @@ import java.util.Map.Entry; import java.util.NavigableMap; import java.util.TreeMap; -import com.minres.scviewer.database.EventKind; import com.minres.scviewer.database.HierNode; import com.minres.scviewer.database.IEvent; import com.minres.scviewer.database.IWaveform; diff --git a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.java b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.java index b5bda0f..2b0321e 100644 --- a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.java +++ b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.java @@ -29,8 +29,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import java.util.Set; -import java.util.TreeSet; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.zip.GZIPInputStream; @@ -147,11 +145,10 @@ public class TextDbLoader implements IWaveformDbLoader { if (txCache.containsKey(txId)) return txCache.get(txId); if(transactions.containsKey(txId)) { - Tx tx = new Tx(this, txId); + Tx tx = new Tx(this, transactions.get(txId)); txCache.put(txId, tx); return tx; } else { - Set keys = new TreeSet<>(transactions.keySet()); throw new IllegalArgumentException(); } } @@ -256,10 +253,8 @@ public class TextDbLoader implements IWaveformDbLoader { TextDbParser parser = new TextDbParser(this); try { -// parser.txSink = mapDb.treeMap("transactions", Serializer.LONG, Serializer.JAVA).createFromSink(); parser.txSink = mapDb.hashMap("transactions", Serializer.LONG, Serializer.JAVA).create(); parser.parseInput(gzipped ? new GZIPInputStream(new FileInputStream(file)) : new FileInputStream(file)); -// transactions = parser.txSink.create(); transactions = parser.txSink; } catch (IllegalArgumentException | ArrayIndexOutOfBoundsException e) { } catch (Exception e) { diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/ArrowPainter.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/ArrowPainter.java index b6bca54..c5044a4 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/ArrowPainter.java +++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/ArrowPainter.java @@ -23,7 +23,6 @@ import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Display; -import com.minres.scviewer.database.EventKind; import com.minres.scviewer.database.IEvent; import com.minres.scviewer.database.IHierNode; import com.minres.scviewer.database.IWaveform; @@ -143,14 +142,16 @@ public class ArrowPainter implements IPainter { } } } - int height = waveCanvas.styleProvider.getTrackHeight(); - return new Rectangle( - (int) (otherTx.getBeginTime() / scaleFactor), - waveCanvas.rulerHeight + painter.getVerticalOffset() + height * getConcurrencyIndex(otherTx), - (int) ((otherTx.getEndTime() - otherTx.getBeginTime()) / scaleFactor), - height); - } else - return null; + if(painter!=null) { + int height = waveCanvas.styleProvider.getTrackHeight(); + return new Rectangle( + (int) (otherTx.getBeginTime() / scaleFactor), + waveCanvas.rulerHeight + painter.getVerticalOffset() + height * getConcurrencyIndex(otherTx), + (int) ((otherTx.getEndTime() - otherTx.getBeginTime()) / scaleFactor), + height); + } + } + return null; } @Override diff --git a/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseServicesTest.java b/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseServicesTest.java index d7488ff..35b9c93 100644 --- a/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseServicesTest.java +++ b/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseServicesTest.java @@ -95,7 +95,6 @@ public class DatabaseServicesTest { assertNotNull(waveformDb); assertEquals(3, waveformDb.getAllWaves().size()); assertEquals(1, waveformDb.getChildNodes().size()); - while(!waveformDb.isLoaded()) Thread.sleep(10); } @Test