From 306e20d14ff596d3d899b040f2eef3c700e620d3 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Fri, 13 Mar 2020 22:25:42 +0100 Subject: [PATCH] fix compiler warnings --- .../com/minres/scviewer/database/text/TextDbLoader.groovy | 1 - .../scviewer/database/swt/internal/RulerPainter.java | 4 ---- .../scviewer/database/swt/internal/SignalPainter.java | 7 ------- .../scviewer/database/swt/internal/WaveformViewer.java | 1 - .../src/com/minres/scviewer/database/vcd/VCDDbLoader.java | 1 - com.minres.scviewer.database/META-INF/MANIFEST.MF | 3 ++- com.minres.scviewer.e4.application/build.properties | 1 - .../minres/scviewer/e4/application/parts/AboutDialog.java | 1 + .../scviewer/e4/application/parts/LoadingWaveformDb.java | 1 - .../scviewer/e4/application/parts/WaveformViewer.java | 1 - 10 files changed, 3 insertions(+), 18 deletions(-) diff --git a/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy b/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy index a5adb3b..3979c91 100644 --- a/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy +++ b/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy @@ -28,7 +28,6 @@ import com.minres.scviewer.database.IWaveform import com.minres.scviewer.database.IWaveformDb import com.minres.scviewer.database.IWaveformDbLoader import com.minres.scviewer.database.RelationType -import com.minres.scviewer.database.DataType public class TextDbLoader implements IWaveformDbLoader{ diff --git a/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/RulerPainter.java b/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/RulerPainter.java index 96cee3b..92dfff2 100644 --- a/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/RulerPainter.java +++ b/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/RulerPainter.java @@ -46,7 +46,6 @@ public class RulerPainter implements IPainter { long startPos=area.x*scaleFactor; long startVal=startPos + waveCanvas.getXOffset()*scaleFactor; long endPos=startPos+area.width*scaleFactor; - long endVal=startVal+area.width*scaleFactor; long rulerTickMinor = rulerTickMinorC*scaleFactor; long rulerTickMajor = rulerTickMajorC*scaleFactor; @@ -68,12 +67,9 @@ public class RulerPainter implements IPainter { gc.setForeground(headerFgColor); gc.drawLine(area.x, area.y+bottom, area.x+area.width, area.y+bottom); - int x0_max = 0; - for (long pos = startMinorIncrPos, tick = startMinorIncrVal; pos < endPos; pos+= rulerTickMinor, tick += rulerTickMinor) { int x0_pos = (int) (pos/scaleFactor); long x0_val = tick/scaleFactor; - x0_max = x0_pos; if ((tick % rulerTickMajor) == 0) { gc.drawText(df.format(x0_val*unitMultiplier)+unit, x0_pos, area.y+textY); gc.drawLine(x0_pos, area.y+majorTickY, x0_pos,area.y+ bottom); diff --git a/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/SignalPainter.java b/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/SignalPainter.java index a011541..eb8221b 100644 --- a/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/SignalPainter.java +++ b/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/SignalPainter.java @@ -78,11 +78,6 @@ public class SignalPainter extends TrackPainter { this.waveCanvas = txDisplay; } - private int getXValEnd(long time) { - long ltmp = time / this.waveCanvas.getScaleFactor(); - return ltmp > maxValX ? maxValX : (int) ltmp; - } - private int getXPosEnd(long time) { long ltmp = time / this.waveCanvas.getScaleFactor() - waveCanvas.getXOffset(); return ltmp > maxPosX ? maxPosX : (int) ltmp; @@ -100,7 +95,6 @@ public class SignalPainter extends TrackPainter { long scaleFactor = this.waveCanvas.getScaleFactor(); long beginPos = area.x; long beginTime = (beginPos + waveCanvas.getXOffset())*scaleFactor; - long endPos = beginPos + area.width; long endTime = beginTime + area.width*scaleFactor; Entry first = signal.getEvents().floorEntry(beginTime); @@ -125,7 +119,6 @@ public class SignalPainter extends TrackPainter { yOffsetB = 4 * this.waveCanvas.getTrackHeight() / 5 + area.y; int xSigChangeBeginVal = Math.max(area.x + (int)waveCanvas.getXOffset(), (int) (left.time / this.waveCanvas.getScaleFactor())); int xSigChangeBeginPos = area.x; - int xSigChangeEndVal = Math.max(area.x + (int)waveCanvas.getXOffset(), getXValEnd(right.time)); int xSigChangeEndPos = Math.max(area.x, getXPosEnd(right.time)); boolean multiple = false; diff --git a/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/WaveformViewer.java b/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/WaveformViewer.java index 9b959d4..cc557c7 100644 --- a/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/WaveformViewer.java +++ b/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/WaveformViewer.java @@ -40,7 +40,6 @@ import org.eclipse.swt.dnd.DND; import org.eclipse.swt.dnd.DragSource; import org.eclipse.swt.dnd.DragSourceAdapter; import org.eclipse.swt.dnd.DragSourceEvent; -import org.eclipse.swt.dnd.DragSourceListener; import org.eclipse.swt.dnd.DropTarget; import org.eclipse.swt.dnd.DropTargetAdapter; import org.eclipse.swt.dnd.DropTargetEvent; diff --git a/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDDbLoader.java b/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDDbLoader.java index d0a93bd..bde1c9b 100644 --- a/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDDbLoader.java +++ b/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDDbLoader.java @@ -12,7 +12,6 @@ package com.minres.scviewer.database.vcd; import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.util.Collection; diff --git a/com.minres.scviewer.database/META-INF/MANIFEST.MF b/com.minres.scviewer.database/META-INF/MANIFEST.MF index 9550f8c..09d9fe4 100644 --- a/com.minres.scviewer.database/META-INF/MANIFEST.MF +++ b/com.minres.scviewer.database/META-INF/MANIFEST.MF @@ -5,7 +5,8 @@ Bundle-SymbolicName: com.minres.scviewer.database Bundle-Version: 1.0.0.qualifier Bundle-Vendor: MINRES Technologies GmbH Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: com.minres.scviewer.database +Export-Package: com.minres.scviewer.database, + com.minres.scviewer.database.internal;x-internal:=true Bundle-ActivationPolicy: lazy Service-Component: OSGI-INF/component.xml,OSGI-INF/component2.xml Automatic-Module-Name: com.minres.scviewer.database diff --git a/com.minres.scviewer.e4.application/build.properties b/com.minres.scviewer.e4.application/build.properties index 659bac7..ae6a82b 100644 --- a/com.minres.scviewer.e4.application/build.properties +++ b/com.minres.scviewer.e4.application/build.properties @@ -1,4 +1,3 @@ -output.. = bin/ bin.includes = META-INF/,\ .,\ plugin.xml,\ diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/AboutDialog.java b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/AboutDialog.java index 6180e95..7ed8815 100644 --- a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/AboutDialog.java +++ b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/AboutDialog.java @@ -139,6 +139,7 @@ public class AboutDialog extends Dialog { // links are activated on mouse down when the control key is held down // if ((event.stateMask & SWT.MOD1) != 0) { try { + @SuppressWarnings("deprecation") int offset = ((StyledText)event.widget).getOffsetAtLocation(new Point (event.x, event.y)); StyleRange style = ((StyledText)event.widget).getStyleRangeAtOffset(offset); if (style != null && style.underline && style.underlineStyle == SWT.UNDERLINE_LINK) { diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/LoadingWaveformDb.java b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/LoadingWaveformDb.java index 696d955..56c69f6 100644 --- a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/LoadingWaveformDb.java +++ b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/LoadingWaveformDb.java @@ -8,7 +8,6 @@ import java.util.List; import com.minres.scviewer.database.IHierNode; import com.minres.scviewer.database.IWaveform; import com.minres.scviewer.database.IWaveformDb; -import com.minres.scviewer.database.IWaveformEvent; import com.minres.scviewer.database.RelationType; import com.minres.scviewer.e4.application.Messages; diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java index ad8df33..2080850 100644 --- a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java +++ b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java @@ -301,7 +301,6 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis }); */ waveformPane.getWaveformControl().addListener(SWT.KeyDown, new Listener() { - @SuppressWarnings("null") @Override public void handleEvent(Event e) { /*