From b02a276011f6e36f7106caad9a0d1e9ca828f2d4 Mon Sep 17 00:00:00 2001 From: lizzardo Date: Tue, 30 Dec 2008 20:39:34 +0000 Subject: [PATCH] Type checking some HashTables, Enumerations, Vectors Last (this time for sure!) of the setSerialVersionUID additions for serializable classes git-svn-id: https://svn2.assembla.com/svn/romraider/trunk@207 38686702-15cf-42e4-a595-3071df8bf5ea --- src/com/romraider/ECUEditor.java | 4 +++- .../io/serial/connection/SerialConnectionImpl.java | 1 - .../io/serial/connection/TestSerialConnection.java | 1 - .../logger/ecu/comms/io/protocol/SSMLoggerProtocol.java | 2 -- src/com/romraider/logger/ecu/ui/tab/XYTrendline.java | 2 +- src/com/romraider/logger/ecu/ui/tab/maf/MafTabImpl.java | 3 ++- src/com/romraider/swing/TableToolBar.java | 2 +- src/com/romraider/swing/XMLFilter.java | 6 +++--- 8 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/com/romraider/ECUEditor.java b/src/com/romraider/ECUEditor.java index 77353701..1c775c01 100644 --- a/src/com/romraider/ECUEditor.java +++ b/src/com/romraider/ECUEditor.java @@ -70,7 +70,9 @@ import java.io.IOException; import java.util.Vector; public class ECUEditor extends JFrame implements WindowListener, PropertyChangeListener { - private String titleText = PRODUCT_NAME + " v" + VERSION + " | ECU Editor"; + private static final long serialVersionUID = -7826850987392016292L; + + private String titleText = PRODUCT_NAME + " v" + VERSION + " | ECU Editor"; private static final String NEW_LINE = System.getProperty("line.separator"); private final SettingsManager settingsManager = new SettingsManagerImpl(); diff --git a/src/com/romraider/io/serial/connection/SerialConnectionImpl.java b/src/com/romraider/io/serial/connection/SerialConnectionImpl.java index 270b9efd..2ab4023e 100644 --- a/src/com/romraider/io/serial/connection/SerialConnectionImpl.java +++ b/src/com/romraider/io/serial/connection/SerialConnectionImpl.java @@ -41,7 +41,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -@SuppressWarnings({"ResultOfMethodCallIgnored"}) public final class SerialConnectionImpl implements SerialConnection { private static final Logger LOGGER = getLogger(SerialConnectionImpl.class); private final SerialPort serialPort; diff --git a/src/com/romraider/io/serial/connection/TestSerialConnection.java b/src/com/romraider/io/serial/connection/TestSerialConnection.java index ec40c413..3833a90a 100644 --- a/src/com/romraider/io/serial/connection/TestSerialConnection.java +++ b/src/com/romraider/io/serial/connection/TestSerialConnection.java @@ -47,7 +47,6 @@ import static org.apache.log4j.Logger.getLogger; import static java.lang.System.currentTimeMillis; import java.util.Random; -@SuppressWarnings({"PointlessArithmeticExpression"}) final class TestSerialConnection implements SerialConnection { private static final Logger LOGGER = getLogger(TestSerialConnection.class); private static final Random RANDOM = new Random(currentTimeMillis()); diff --git a/src/com/romraider/logger/ecu/comms/io/protocol/SSMLoggerProtocol.java b/src/com/romraider/logger/ecu/comms/io/protocol/SSMLoggerProtocol.java index 9c962af4..5d97e71a 100644 --- a/src/com/romraider/logger/ecu/comms/io/protocol/SSMLoggerProtocol.java +++ b/src/com/romraider/logger/ecu/comms/io/protocol/SSMLoggerProtocol.java @@ -53,7 +53,6 @@ public final class SSMLoggerProtocol implements LoggerProtocol { return protocol.constructReadAddressRequest(convertToByteAddresses(filteredQueries)); } - @SuppressWarnings({"PointlessArithmeticExpression"}) public byte[] constructReadAddressResponse(Collection queries) { checkNotNullOrEmpty(queries, "queries"); // 0x80 0xF0 0x10 data_length 0xE8 value1 value2 ... valueN checksum @@ -83,7 +82,6 @@ public final class SSMLoggerProtocol implements LoggerProtocol { } // processes the response bytes and sets individual responses on corresponding query objects - @SuppressWarnings({"PointlessArithmeticExpression"}) public void processReadAddressResponses(Collection queries, byte[] response) { checkNotNullOrEmpty(queries, "queries"); checkNotNullOrEmpty(response, "response"); diff --git a/src/com/romraider/logger/ecu/ui/tab/XYTrendline.java b/src/com/romraider/logger/ecu/ui/tab/XYTrendline.java index 7b41dcd3..293c0eea 100644 --- a/src/com/romraider/logger/ecu/ui/tab/XYTrendline.java +++ b/src/com/romraider/logger/ecu/ui/tab/XYTrendline.java @@ -47,7 +47,7 @@ public final class XYTrendline extends AbstractXYDataset { return 1; } - public Comparable getSeriesKey(int seriesIndex) { + public Comparable getSeriesKey(int seriesIndex) { return "foo"; } diff --git a/src/com/romraider/logger/ecu/ui/tab/maf/MafTabImpl.java b/src/com/romraider/logger/ecu/ui/tab/maf/MafTabImpl.java index 6375904e..6295401e 100644 --- a/src/com/romraider/logger/ecu/ui/tab/maf/MafTabImpl.java +++ b/src/com/romraider/logger/ecu/ui/tab/maf/MafTabImpl.java @@ -35,7 +35,8 @@ import static java.awt.BorderLayout.WEST; import java.util.List; public final class MafTabImpl extends JPanel implements MafTab { - private final LoggerChartPanel chartPanel = new LoggerChartPanel("MAF (v)", "Total Correction (%)"); + private static final long serialVersionUID = -6978027421649432740L; + private final LoggerChartPanel chartPanel = new LoggerChartPanel("MAF (v)", "Total Correction (%)"); private final MafControlPanel controlPanel; public MafTabImpl(DataRegistrationBroker broker, ECUEditor ecuEditor) { diff --git a/src/com/romraider/swing/TableToolBar.java b/src/com/romraider/swing/TableToolBar.java index e857e69f..2ab89af1 100644 --- a/src/com/romraider/swing/TableToolBar.java +++ b/src/com/romraider/swing/TableToolBar.java @@ -286,7 +286,7 @@ public class TableToolBar extends JToolBar implements MouseListener, ItemListene int valueCount = 0; //Pull data into format 3d graph understands - Vector graphValues = new Vector(); + Vector graphValues = new Vector(); if (table.getType() == Table.TABLE_3D) { Table3D table3d = (Table3D) table; DataCell[][] tableData = table3d.get3dData(); diff --git a/src/com/romraider/swing/XMLFilter.java b/src/com/romraider/swing/XMLFilter.java index 05ac1fb7..df5b8c3c 100644 --- a/src/com/romraider/swing/XMLFilter.java +++ b/src/com/romraider/swing/XMLFilter.java @@ -74,12 +74,12 @@ public class XMLFilter extends FileFilter { fullDescription = description == null ? "(" : description + " ("; // build the description from the extension list - Enumeration extensions = filters.keys(); + Enumeration extensions = filters.keys(); if (extensions != null) { - fullDescription += "." + (String) extensions.nextElement(); + fullDescription += "." + extensions.nextElement(); while (extensions.hasMoreElements()) { fullDescription += ", ." - + (String) extensions.nextElement(); + + extensions.nextElement(); } } fullDescription += ")";