started adding autoconnect and ecu init to logger

git-svn-id: http://svn.3splooges.com/romraider-arch/trunk@393 d2e2e1cd-ba16-0410-be16-b7c4453c7c2d

src/enginuity/ECUEditor.java

@@ -38,13 +38,12 @@ import enginuity.xml.DOMRomUnmarshaller;
 import enginuity.xml.DOMSettingsBuilder;
 import enginuity.xml.DOMSettingsUnmarshaller;
 import enginuity.xml.RomNotFoundException;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.GridLayout;
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
+
+import javax.swing.*;
+import javax.swing.tree.TreePath;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.WindowEvent;
@@ -58,17 +57,6 @@ import java.io.FileInputStream;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.Vector;
-import javax.swing.ImageIcon;
-import javax.swing.JCheckBox;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JSplitPane;
-import javax.swing.JTextArea;
-import javax.swing.UIManager;
-import javax.swing.tree.TreePath;
 
 public class ECUEditor extends JFrame implements WindowListener, PropertyChangeListener {
 

src/enginuity/io/connection/EcuConnection.java

@@ -26,5 +26,5 @@ public interface EcuConnection {
     byte[] send(byte[] bytes);
 
     void close();
-    
+
 }

src/enginuity/io/connection/SerialConnectionImpl.java

@@ -128,7 +128,6 @@ public final class SerialConnectionImpl implements SerialConnection {
         }
     }
 
-
     private SerialPort connect(ConnectionProperties connectionProperties, String portName) {
         CommPortIdentifier portIdentifier = resolvePortIdentifier(portName);
         SerialPort serialPort = openPort(portIdentifier, connectionProperties.getConnectTimeout());

src/enginuity/io/port/SerialPortRefresher.java

@@ -21,28 +21,40 @@
 
 package enginuity.io.port;
 
-import enginuity.logger.comms.controller.LoggerController;
 import static enginuity.util.ParamChecker.checkNotNull;
+import enginuity.util.ThreadUtil;
+import gnu.io.CommPortIdentifier;
+
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
 
 public final class SerialPortRefresher implements Runnable {
+    private static final long PORT_REFRESH_INTERVAL = 15000L;
+    private final SerialPortDiscoverer serialPortDiscoverer = new SerialPortDiscovererImpl();
     private SerialPortRefreshListener listener;
-    private LoggerController controller;
 
-    public SerialPortRefresher(SerialPortRefreshListener listener, LoggerController controller) {
-        checkNotNull(listener, controller);
+    public SerialPortRefresher(SerialPortRefreshListener listener) {
+        checkNotNull(listener);
         this.listener = listener;
-        this.controller = controller;
     }
 
     public void run() {
         while (true) {
-            listener.refreshPortList(controller.listSerialPorts());
-            try {
-                Thread.sleep(15000);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-                break;
-            }
+            listener.refreshPortList(listSerialPorts());
+            ThreadUtil.sleep(PORT_REFRESH_INTERVAL);
         }
     }
+
+    private Set<String> listSerialPorts() {
+        List<CommPortIdentifier> portIdentifiers = serialPortDiscoverer.listPorts();
+        Set<String> portNames = new TreeSet<String>();
+        for (CommPortIdentifier portIdentifier : portIdentifiers) {
+            String portName = portIdentifier.getName();
+            if (!portNames.contains(portName)) {
+                portNames.add(portName);
+            }
+        }
+        return portNames;
+    }
 }

src/enginuity/io/protocol/Protocol.java

@@ -33,6 +33,8 @@ public interface Protocol {
 
     byte calculateChecksum(byte[] bytes);
 
+    boolean isValidEcuInitResponse(byte[] bytes);
+
     ConnectionProperties getConnectionProperties();
 
 }

src/enginuity/io/protocol/ProtocolFactory.java

@@ -0,0 +1,44 @@
+/*
+ *
+ * Enginuity Open-Source Tuning, Logging and Reflashing
+ * Copyright (C) 2006 Enginuity.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+package enginuity.io.protocol;
+
+import enginuity.logger.exception.UnsupportedProtocolException;
+
+public final class ProtocolFactory {
+    private static final ProtocolFactory INSTANCE = new ProtocolFactory();
+
+    public static ProtocolFactory getInstance() {
+        return INSTANCE;
+    }
+
+    private ProtocolFactory() {
+    }
+
+    public Protocol getProtocol(String protocolName) {
+        try {
+            Class<?> cls = Class.forName(this.getClass().getPackage().getName() + "." + protocolName + "Protocol");
+            return (Protocol) cls.newInstance();
+        } catch (Exception e) {
+            throw new UnsupportedProtocolException("'" + protocolName + "' is not a supported protocol", e);
+        }
+    }
+}

src/enginuity/io/protocol/SSMProtocol.java

@@ -70,6 +70,11 @@ public final class SSMProtocol implements Protocol {
         return asByte(total - ((total >>> 16) << 16));
     }
 
+    public boolean isValidEcuInitResponse(byte[] bytes) {
+        //TODO: Implement this!!
+        return bytes != null && bytes.length > 0;
+    }
+
     public ConnectionProperties getConnectionProperties() {
         return new ConnectionProperties() {
 

src/enginuity/logger/EcuLogger.java

@@ -25,6 +25,7 @@ import enginuity.Settings;
 import enginuity.io.port.SerialPortRefresher;
 import enginuity.logger.comms.controller.LoggerController;
 import enginuity.logger.comms.controller.LoggerControllerImpl;
+import enginuity.logger.comms.query.LoggerCallback;
 import enginuity.logger.definition.EcuData;
 import enginuity.logger.definition.EcuDataLoader;
 import enginuity.logger.definition.EcuDataLoaderImpl;
@@ -36,7 +37,6 @@ import enginuity.logger.profile.UserProfileItem;
 import enginuity.logger.profile.UserProfileItemImpl;
 import enginuity.logger.profile.UserProfileLoader;
 import enginuity.logger.profile.UserProfileLoaderImpl;
-import enginuity.logger.ui.ControllerButton;
 import enginuity.logger.ui.DataRegistrationBroker;
 import enginuity.logger.ui.DataRegistrationBrokerImpl;
 import enginuity.logger.ui.EcuDataComparator;
@@ -57,11 +57,11 @@ import enginuity.logger.ui.handler.table.TableUpdateHandler;
 import enginuity.logger.ui.paramlist.ParameterListTable;
 import enginuity.logger.ui.paramlist.ParameterListTableModel;
 import enginuity.logger.ui.paramlist.ParameterRow;
+import static enginuity.util.HexUtil.asHex;
 import static enginuity.util.ParamChecker.checkNotNull;
+import enginuity.util.ThreadUtil;
 
 import javax.swing.*;
-import static javax.swing.JOptionPane.ERROR_MESSAGE;
-import static javax.swing.JOptionPane.showMessageDialog;
 import static javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED;
 import static javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER;
 import static javax.swing.JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED;
@@ -90,11 +90,13 @@ import java.util.Map;
 
 /*
 TODO: add better debug logging, preferably to a file and switchable (on/off)
-TODO: finish dashboard tab
-TODO: add configuration screen (log file destination, etc)
 TODO: add user definable addresses
 TODO: Clean up this class!
 So much to do, so little time....
+
+Autoconnect Stuff:
+TODO: Add reconnect/refresh connection button/menu item.
+TODO: Finish ecu init callback - parse it, etc
 */
 
 public final class EcuLogger extends JFrame implements WindowListener, PropertyChangeListener, MessageListener {
@@ -134,12 +136,21 @@ public final class EcuLogger extends JFrame implements WindowListener, PropertyC
         initUserInterface();
         initDataUpdateHandlers();
         reloadUserProfile(settings.getLoggerProfileFilePath());
+        restartLogging();
     }
 
     private void bootstrap(Settings settings) {
         checkNotNull(settings);
         this.settings = settings;
-        controller = new LoggerControllerImpl(settings, this);
+
+        // TODO: Do something useful with this!!
+        LoggerCallback ecuInitCallback = new LoggerCallback() {
+            public void callback(byte[] value) {
+                System.out.println("Ecu Init response = " + asHex(value));
+            }
+        };
+
+        controller = new LoggerControllerImpl(settings, ecuInitCallback, this);
         statusBarLabel = new JLabel(ENGINUITY_ECU_LOGGER_TITLE);
         tabbedPane = new JTabbedPane(BOTTOM);
         portsComboBox = new SerialPortComboBox(settings);
@@ -171,7 +182,7 @@ public final class EcuLogger extends JFrame implements WindowListener, PropertyC
     }
 
     private void startPortRefresherThread() {
-        Thread portRefresherThread = new Thread(new SerialPortRefresher(portsComboBox, controller));
+        Thread portRefresherThread = new Thread(new SerialPortRefresher(portsComboBox));
         portRefresherThread.setDaemon(true);
         portRefresherThread.start();
     }
@@ -236,14 +247,12 @@ public final class EcuLogger extends JFrame implements WindowListener, PropertyC
     }
 
     private void clearParamTableModels() {
-        stopLogging();
         dataTabParamListTableModel.clear();
         graphTabParamListTableModel.clear();
         dashboardTabParamListTableModel.clear();
     }
 
     private void clearSwitchTableModels() {
-        stopLogging();
         dataTabSwitchListTableModel.clear();
         graphTabSwitchListTableModel.clear();
         dashboardTabSwitchListTableModel.clear();
@@ -395,7 +404,7 @@ public final class EcuLogger extends JFrame implements WindowListener, PropertyC
     private JPanel buildControlToolbar() {
         JPanel controlPanel = new JPanel(new FlowLayout(FlowLayout.CENTER, 50, 0));
         controlPanel.add(buildPortsComboBox());
-        controlPanel.add(buildStartStopButtons());
+        controlPanel.add(buildReconnectButton());
         controlPanel.add(buildStatusIndicator());
         return controlPanel;
     }
@@ -404,7 +413,6 @@ public final class EcuLogger extends JFrame implements WindowListener, PropertyC
         portsComboBox.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent actionEvent) {
                 settings.setLoggerPort((String) portsComboBox.getSelectedItem());
-                stopLogging();
             }
         });
         JPanel comboBoxPanel = new JPanel(new FlowLayout());
@@ -413,33 +421,19 @@ public final class EcuLogger extends JFrame implements WindowListener, PropertyC
         return comboBoxPanel;
     }
 
-    private JPanel buildStartStopButtons() {
-        JPanel buttonPanel = new JPanel(new FlowLayout());
-        buttonPanel.add(buildStartButton());
-        buttonPanel.add(buildStopButton());
-        return buttonPanel;
-    }
-
-    private ControllerButton buildStartButton() {
-        ControllerButton startButton = new ControllerButton("Start", true);
-        startButton.addActionListener(new ActionListener() {
+    private JButton buildReconnectButton() {
+        JButton reconnectButton = new JButton("Reconnect");
+        reconnectButton.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent actionEvent) {
-                startLogging();
+                restartLogging();
             }
         });
-        controller.addListener(startButton);
-        return startButton;
+        return reconnectButton;
     }
 
-    private ControllerButton buildStopButton() {
-        ControllerButton stopButton = new ControllerButton("Stop", false);
-        stopButton.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent actionEvent) {
-                stopLogging();
-            }
-        });
-        controller.addListener(stopButton);
-        return stopButton;
+    public void restartLogging() {
+        stopLogging();
+        startLogging();
     }
 
     private StatusIndicator buildStatusIndicator() {
@@ -486,10 +480,6 @@ public final class EcuLogger extends JFrame implements WindowListener, PropertyC
     public void propertyChange(PropertyChangeEvent propertyChangeEvent) {
     }
 
-    public void loadProfile(File profileFile) {
-        //TODO: Finish profile loading from file!!
-    }
-
     public void startLogging() {
         settings.setLoggerPort((String) portsComboBox.getSelectedItem());
         controller.start();
@@ -497,17 +487,13 @@ public final class EcuLogger extends JFrame implements WindowListener, PropertyC
 
     public void stopLogging() {
         controller.stop();
+        ThreadUtil.sleep(1000L);
     }
 
     public void handleExit() {
         try {
             try {
                 stopLogging();
-                try {
-                    Thread.sleep(250);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
             } finally {
                 cleanUpUpdateHandlers();
             }
@@ -542,7 +528,7 @@ public final class EcuLogger extends JFrame implements WindowListener, PropertyC
 
     public void reportError(String error) {
         if (error != null) {
-            showMessageDialog(null, error, "Alert", ERROR_MESSAGE);
+            statusBarLabel.setText("Error: " + error);
         }
     }
 

src/enginuity/logger/comms/controller/LoggerController.java

@@ -25,12 +25,8 @@ import enginuity.logger.comms.query.LoggerCallback;
 import enginuity.logger.definition.EcuData;
 import enginuity.logger.ui.ControllerListener;
 
-import java.util.Set;
-
 public interface LoggerController {
 
-    Set<String> listSerialPorts();
-
     void addLogger(String callerId, EcuData ecuData, LoggerCallback callback);
 
     void removeLogger(String callerId, EcuData ecuData);
@@ -40,4 +36,5 @@ public interface LoggerController {
     void stop();
 
     void addListener(ControllerListener listener);
+
 }

src/enginuity/logger/comms/controller/LoggerControllerImpl.java

@@ -22,46 +22,26 @@
 package enginuity.logger.comms.controller;
 
 import enginuity.Settings;
-import enginuity.io.port.SerialPortDiscoverer;
-import enginuity.io.port.SerialPortDiscovererImpl;
 import enginuity.logger.comms.manager.QueryManager;
 import enginuity.logger.comms.manager.QueryManagerImpl;
-import enginuity.logger.comms.manager.TransmissionManager;
-import enginuity.logger.comms.manager.TransmissionManagerImpl;
 import enginuity.logger.comms.query.LoggerCallback;
 import enginuity.logger.definition.EcuData;
 import enginuity.logger.ui.ControllerListener;
 import enginuity.logger.ui.MessageListener;
 import static enginuity.util.ParamChecker.checkNotNull;
-import gnu.io.CommPortIdentifier;
 
 import java.util.ArrayList;
-import java.util.Collections;
+import static java.util.Collections.synchronizedList;
 import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
 
 public final class LoggerControllerImpl implements LoggerController {
     private final QueryManager queryManager;
-    private final List<ControllerListener> listeners = Collections.synchronizedList(new ArrayList<ControllerListener>());
+    private final List<ControllerListener> listeners = synchronizedList(new ArrayList<ControllerListener>());
     private boolean started = false;
 
-    public LoggerControllerImpl(Settings settings, MessageListener messageListener) {
-        TransmissionManager txManager = new TransmissionManagerImpl(settings);
-        queryManager = new QueryManagerImpl(this, txManager, messageListener);
-    }
-
-    public Set<String> listSerialPorts() {
-        SerialPortDiscoverer serialPortDiscoverer = new SerialPortDiscovererImpl();
-        List<CommPortIdentifier> portIdentifiers = serialPortDiscoverer.listPorts();
-        Set<String> portNames = new TreeSet<String>();
-        for (CommPortIdentifier portIdentifier : portIdentifiers) {
-            String portName = portIdentifier.getName();
-            if (!portNames.contains(portName)) {
-                portNames.add(portName);
-            }
-        }
-        return portNames;
+    public LoggerControllerImpl(Settings settings, LoggerCallback ecuInitCallback, MessageListener messageListener) {
+        checkNotNull(settings, ecuInitCallback, messageListener);
+        queryManager = new QueryManagerImpl(this, settings, ecuInitCallback, messageListener);
     }
 
     public synchronized void addListener(ControllerListener listener) {
@@ -86,15 +66,17 @@ public final class LoggerControllerImpl implements LoggerController {
             Thread queryManagerThread = new Thread(queryManager);
             queryManagerThread.setDaemon(true);
             queryManagerThread.start();
-            startListeners();
             started = true;
+            startListeners();
         }
     }
 
     public synchronized void stop() {
-        stopListeners();
-        queryManager.stop();
-        started = false;
+        if (started) {
+            queryManager.stop();
+            started = false;
+            stopListeners();
+        }
     }
 
     private void startListeners() {

src/enginuity/logger/comms/manager/QueryManagerImpl.java

@@ -21,6 +21,11 @@
 
 package enginuity.logger.comms.manager;
 
+import enginuity.Settings;
+import enginuity.io.connection.EcuConnection;
+import enginuity.io.connection.EcuConnectionImpl;
+import enginuity.io.protocol.Protocol;
+import enginuity.io.protocol.ProtocolFactory;
 import enginuity.logger.comms.controller.LoggerController;
 import enginuity.logger.comms.query.LoggerCallback;
 import enginuity.logger.comms.query.RegisteredQuery;
@@ -28,6 +33,7 @@ import enginuity.logger.comms.query.RegisteredQueryImpl;
 import enginuity.logger.definition.EcuData;
 import enginuity.logger.ui.MessageListener;
 import static enginuity.util.ParamChecker.checkNotNull;
+import enginuity.util.ThreadUtil;
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;
@@ -36,47 +42,89 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-@SuppressWarnings({"FieldCanBeLocal"})
 public final class QueryManagerImpl implements QueryManager {
     private final DecimalFormat format = new DecimalFormat("0.00");
     private final Map<String, RegisteredQuery> queryMap = Collections.synchronizedMap(new HashMap<String, RegisteredQuery>());
     private final Map<String, RegisteredQuery> addList = new HashMap<String, RegisteredQuery>();
     private final List<String> removeList = new ArrayList<String>();
-    private final TransmissionManager txManager;
-    private final MessageListener messageListener;
     private final LoggerController controller;
+    private final Settings settings;
+    private final LoggerCallback ecuInitCallback;
+    private final MessageListener messageListener;
     private boolean stop = false;
+    private Thread queryManagerThread = null;
 
-    public QueryManagerImpl(LoggerController controller, TransmissionManager txManager, MessageListener messageListener) {
-        checkNotNull(controller, txManager, messageListener);
+    public QueryManagerImpl(LoggerController controller, Settings settings, LoggerCallback ecuInitCallback, MessageListener messageListener) {
+        checkNotNull(controller, settings, ecuInitCallback, messageListener);
         this.controller = controller;
-        this.txManager = txManager;
+        this.settings = settings;
+        this.ecuInitCallback = ecuInitCallback;
         this.messageListener = messageListener;
     }
 
     public synchronized void addQuery(String callerId, EcuData ecuData, LoggerCallback callback) {
-        checkNotNull(ecuData, callback);
+        checkNotNull(callerId, ecuData, callback);
         addList.put(buildQueryId(callerId, ecuData), new RegisteredQueryImpl(ecuData, callback));
     }
 
     public synchronized void removeQuery(String callerId, EcuData ecuData) {
+        checkNotNull(callerId, ecuData);
         removeList.add(buildQueryId(callerId, ecuData));
     }
 
     public void run() {
+        queryManagerThread = Thread.currentThread();
         System.out.println("QueryManager started.");
+        stop = false;
+        while (!stop) {
+            if (doEcuInit()) {
+                runLogger();
+            } else {
+                ThreadUtil.sleep(5000L);
+            }
+        }
+        System.out.println("QueryManager stopped.");
+    }
 
+    private boolean doEcuInit() {
+        Protocol protocol = ProtocolFactory.getInstance().getProtocol(settings.getLoggerProtocol());
+        EcuConnection ecuConnection = new EcuConnectionImpl(protocol.getConnectionProperties(), settings.getLoggerPort());
+        try {
+            messageListener.reportMessage("Sending ECU Init...");
+            byte[] response = ecuConnection.send(protocol.constructEcuInitRequest());
+            if (protocol.isValidEcuInitResponse(response)) {
+                ecuInitCallback.callback(response);
+                messageListener.reportMessage("Sending ECU Init...done.");
+                return true;
+            } else {
+                messageListener.reportMessage("Waiting for ECU connection...");
+                return false;
+            }
+        } catch (Exception e) {
+            messageListener.reportMessage("Error sending ECU init - check correct serial port has been selected.");
+            e.printStackTrace();
+            return false;
+        } finally {
+            ecuConnection.close();
+        }
+    }
+
+    private void runLogger() {
+        TransmissionManager txManager = new TransmissionManagerImpl(settings);
         long start = System.currentTimeMillis();
         int count = 0;
-
         try {
             txManager.start();
-            stop = false;
             while (!stop) {
                 updateQueryList();
-                txManager.sendQueries(queryMap.values());
-                count++;
-                messageListener.reportMessage(buildStatsMessage(start, count));
+                if (queryMap.isEmpty()) {
+                    messageListener.reportMessage("Select parameters to be logged...");
+                    ThreadUtil.sleep(2000L);
+                } else {
+                    txManager.sendQueries(queryMap.values());
+                    count++;
+                    messageListener.reportMessage(buildStatsMessage(start, count));
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -84,13 +132,14 @@ public final class QueryManagerImpl implements QueryManager {
             messageListener.reportError(e);
         } finally {
             txManager.stop();
-            messageListener.reportMessage("Logging stopped.");
         }
-        System.out.println("QueryManager stopped.");
     }
 
     public void stop() {
         stop = true;
+        if (queryManagerThread != null) {
+            queryManagerThread.interrupt();
+        }
     }
 
     private String buildQueryId(String callerId, EcuData ecuData) {

src/enginuity/logger/ui/ControllerButton.java

@@ -1,22 +0,0 @@
-package enginuity.logger.ui;
-
-import javax.swing.*;
-
-public final class ControllerButton extends JButton implements ControllerListener {
-    private final boolean enabledOnInit;
-
-    public ControllerButton(String string, boolean enabledOnInit) {
-        super(string);
-        this.enabledOnInit = enabledOnInit;
-        setEnabled(enabledOnInit);
-    }
-
-    public void start() {
-        setEnabled(!enabledOnInit);
-    }
-
-    public void stop() {
-        setEnabled(enabledOnInit);
-    }
-
-}

src/enginuity/logger/ui/ControllerListener.java

@@ -1,3 +1,24 @@
+/*
+ *
+ * Enginuity Open-Source Tuning, Logging and Reflashing
+ * Copyright (C) 2006 Enginuity.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 package enginuity.logger.ui;
 
 public interface ControllerListener {

src/enginuity/logger/ui/DataRegistrationBroker.java

@@ -1,3 +1,24 @@
+/*
+ *
+ * Enginuity Open-Source Tuning, Logging and Reflashing
+ * Copyright (C) 2006 Enginuity.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 package enginuity.logger.ui;
 
 import enginuity.logger.definition.EcuData;

src/enginuity/logger/ui/DataRegistrationBrokerImpl.java

@@ -1,3 +1,24 @@
+/*
+ *
+ * Enginuity Open-Source Tuning, Logging and Reflashing
+ * Copyright (C) 2006 Enginuity.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 package enginuity.logger.ui;
 
 import enginuity.logger.comms.controller.LoggerController;

src/enginuity/logger/ui/EcuDataComparator.java

@@ -1,3 +1,24 @@
+/*
+ *
+ * Enginuity Open-Source Tuning, Logging and Reflashing
+ * Copyright (C) 2006 Enginuity.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 package enginuity.logger.ui;
 
 import enginuity.logger.definition.EcuData;

src/enginuity/logger/ui/EcuLoggerMenuBar.java

@@ -1,3 +1,24 @@
+/*
+ *
+ * Enginuity Open-Source Tuning, Logging and Reflashing
+ * Copyright (C) 2006 Enginuity.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 package enginuity.logger.ui;
 
 import enginuity.logger.EcuLogger;
@@ -26,6 +47,9 @@ public class EcuLoggerMenuBar extends JMenuBar implements ActionListener {
     private JMenuItem profileManager = new JMenuItem("Profile Manager");
     private JMenuItem logFileLocation = new JMenuItem("Log File Output Location...");
 
+    private JMenu connectionMenu = new JMenu("Connection");
+    private JMenuItem reconnect = new JMenuItem("Reconnect...");
+
     private JMenu helpMenu = new JMenu("Help");
     private JMenuItem about = new JMenuItem("About Enginuity ECU Logger");
 
@@ -62,6 +86,13 @@ public class EcuLoggerMenuBar extends JMenuBar implements ActionListener {
         profileManager.addActionListener(this);
         logFileLocation.addActionListener(this);
 
+        // connection menu items
+        add(connectionMenu);
+        connectionMenu.setMnemonic('C');
+        reconnect.setMnemonic('R');
+        connectionMenu.add(reconnect);
+        reconnect.addActionListener(this);
+
         // help menu stuff
         add(helpMenu);
         helpMenu.setMnemonic('H');
@@ -118,6 +149,13 @@ public class EcuLoggerMenuBar extends JMenuBar implements ActionListener {
                 parent.reportError(e);
             }
 
+        } else if (evt.getSource() == reconnect) {
+            try {
+                parent.restartLogging();
+            } catch (Exception e) {
+                parent.reportError(e);
+            }
+
         }
     }
 

src/enginuity/logger/ui/MessageListener.java

@@ -1,3 +1,24 @@
+/*
+ *
+ * Enginuity Open-Source Tuning, Logging and Reflashing
+ * Copyright (C) 2006 Enginuity.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 package enginuity.logger.ui;
 
 public interface MessageListener {

src/enginuity/logger/ui/SerialPortComboBox.java

@@ -1,3 +1,24 @@
+/*
+ *
+ * Enginuity Open-Source Tuning, Logging and Reflashing
+ * Copyright (C) 2006 Enginuity.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 package enginuity.logger.ui;
 
 import enginuity.Settings;

src/enginuity/logger/ui/StatusIndicator.java

@@ -1,3 +1,24 @@
+/*
+ *
+ * Enginuity Open-Source Tuning, Logging and Reflashing
+ * Copyright (C) 2006 Enginuity.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 package enginuity.logger.ui;
 
 import enginuity.logger.ui.handler.file.FileLoggerListener;

src/enginuity/logger/ui/handler/DataUpdateHandler.java

@@ -1,3 +1,24 @@
+/*
+ *
+ * Enginuity Open-Source Tuning, Logging and Reflashing
+ * Copyright (C) 2006 Enginuity.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 package enginuity.logger.ui.handler;
 
 import enginuity.logger.definition.EcuData;

src/enginuity/logger/ui/handler/DataUpdateHandlerManager.java

@@ -1,3 +1,24 @@
+/*
+ *
+ * Enginuity Open-Source Tuning, Logging and Reflashing
+ * Copyright (C) 2006 Enginuity.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 package enginuity.logger.ui.handler;
 
 public interface DataUpdateHandlerManager extends DataUpdateHandler {

src/enginuity/logger/ui/handler/DataUpdateHandlerManagerImpl.java

@@ -1,3 +1,24 @@
+/*
+ *
+ * Enginuity Open-Source Tuning, Logging and Reflashing
+ * Copyright (C) 2006 Enginuity.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 package enginuity.logger.ui.handler;
 
 import enginuity.logger.definition.EcuData;

src/enginuity/logger/ui/handler/DataUpdateHandlerThreadWrapper.java

@@ -1,3 +1,24 @@
+/*
+ *
+ * Enginuity Open-Source Tuning, Logging and Reflashing
+ * Copyright (C) 2006 Enginuity.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 package enginuity.logger.ui.handler;
 
 import enginuity.logger.definition.EcuData;

src/enginuity/logger/ui/handler/dash/DashboardUpdateHandler.java

@@ -1,3 +1,24 @@
+/*
+ *
+ * Enginuity Open-Source Tuning, Logging and Reflashing
+ * Copyright (C) 2006 Enginuity.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 package enginuity.logger.ui.handler.dash;
 
 import enginuity.logger.definition.ConvertorUpdateListener;

src/enginuity/logger/ui/handler/dash/Gauge.java

@@ -1,3 +1,24 @@
+/*
+ *
+ * Enginuity Open-Source Tuning, Logging and Reflashing
+ * Copyright (C) 2006 Enginuity.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 package enginuity.logger.ui.handler.dash;
 
 import javax.swing.*;

src/enginuity/logger/ui/handler/dash/PlainGauge.java

@@ -1,3 +1,24 @@
+/*
+ *
+ * Enginuity Open-Source Tuning, Logging and Reflashing
+ * Copyright (C) 2006 Enginuity.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 package enginuity.logger.ui.handler.dash;
 
 import enginuity.logger.definition.EcuData;

src/enginuity/logger/ui/handler/file/FileLogger.java

@@ -1,3 +1,24 @@
+/*
+ *
+ * Enginuity Open-Source Tuning, Logging and Reflashing
+ * Copyright (C) 2006 Enginuity.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 package enginuity.logger.ui.handler.file;
 
 public interface FileLogger {

src/enginuity/logger/ui/handler/file/FileLoggerImpl.java

@@ -1,3 +1,24 @@
+/*
+ *
+ * Enginuity Open-Source Tuning, Logging and Reflashing
+ * Copyright (C) 2006 Enginuity.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 package enginuity.logger.ui.handler.file;
 
 import enginuity.Settings;

src/enginuity/logger/ui/handler/file/FileLoggerListener.java

@@ -1,3 +1,24 @@
+/*
+ *
+ * Enginuity Open-Source Tuning, Logging and Reflashing
+ * Copyright (C) 2006 Enginuity.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 package enginuity.logger.ui.handler.file;
 
 public interface FileLoggerListener {

src/enginuity/logger/ui/handler/file/FileUpdateHandler.java

@@ -1,3 +1,24 @@
+/*
+ *
+ * Enginuity Open-Source Tuning, Logging and Reflashing
+ * Copyright (C) 2006 Enginuity.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 package enginuity.logger.ui.handler.file;
 
 import enginuity.Settings;

src/enginuity/logger/ui/handler/graph/GraphUpdateHandler.java

@@ -1,3 +1,24 @@
+/*
+ *
+ * Enginuity Open-Source Tuning, Logging and Reflashing
+ * Copyright (C) 2006 Enginuity.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 package enginuity.logger.ui.handler.graph;
 
 import enginuity.logger.definition.ConvertorUpdateListener;

src/enginuity/logger/ui/handler/livedata/LiveDataRow.java

@@ -1,3 +1,24 @@
+/*
+ *
+ * Enginuity Open-Source Tuning, Logging and Reflashing
+ * Copyright (C) 2006 Enginuity.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 package enginuity.logger.ui.handler.livedata;
 
 import enginuity.logger.definition.EcuData;

src/enginuity/logger/ui/handler/livedata/LiveDataTableModel.java

@@ -1,3 +1,24 @@
+/*
+ *
+ * Enginuity Open-Source Tuning, Logging and Reflashing
+ * Copyright (C) 2006 Enginuity.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 package enginuity.logger.ui.handler.livedata;
 
 import enginuity.logger.definition.EcuData;

src/enginuity/logger/ui/handler/livedata/LiveDataUpdateHandler.java

@@ -1,3 +1,24 @@
+/*
+ *
+ * Enginuity Open-Source Tuning, Logging and Reflashing
+ * Copyright (C) 2006 Enginuity.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 package enginuity.logger.ui.handler.livedata;
 
 import enginuity.logger.definition.ConvertorUpdateListener;

src/enginuity/logger/ui/handler/table/TableUpdateHandler.java

@@ -1,3 +1,24 @@
+/*
+ *
+ * Enginuity Open-Source Tuning, Logging and Reflashing
+ * Copyright (C) 2006 Enginuity.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 package enginuity.logger.ui.handler.table;
 
 import enginuity.logger.definition.EcuData;

src/enginuity/logger/ui/paramlist/ParameterListTable.java

@@ -1,3 +1,24 @@
+/*
+ *
+ * Enginuity Open-Source Tuning, Logging and Reflashing
+ * Copyright (C) 2006 Enginuity.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 package enginuity.logger.ui.paramlist;
 
 import enginuity.logger.definition.EcuData;

src/enginuity/logger/ui/paramlist/ParameterListTableModel.java

@@ -1,3 +1,24 @@
+/*
+ *
+ * Enginuity Open-Source Tuning, Logging and Reflashing
+ * Copyright (C) 2006 Enginuity.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 package enginuity.logger.ui.paramlist;
 
 import enginuity.logger.definition.EcuData;

src/enginuity/logger/ui/paramlist/ParameterRow.java

@@ -1,3 +1,24 @@
+/*
+ *
+ * Enginuity Open-Source Tuning, Logging and Reflashing
+ * Copyright (C) 2006 Enginuity.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 package enginuity.logger.ui.paramlist;
 
 import enginuity.logger.definition.EcuData;

src/enginuity/logger/ui/paramlist/UnitsComboBoxEditor.java

@@ -1,3 +1,24 @@
+/*
+ *
+ * Enginuity Open-Source Tuning, Logging and Reflashing
+ * Copyright (C) 2006 Enginuity.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 package enginuity.logger.ui.paramlist;
 
 import enginuity.logger.definition.EcuData;

src/enginuity/logger/ui/paramlist/UnitsComboBoxRenderer.java

@@ -1,3 +1,24 @@
+/*
+ *
+ * Enginuity Open-Source Tuning, Logging and Reflashing
+ * Copyright (C) 2006 Enginuity.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 package enginuity.logger.ui.paramlist;
 
 import enginuity.logger.definition.EcuData;

src/enginuity/newmaps/definition/AttributeParser.java

@@ -23,7 +23,7 @@ package enginuity.newmaps.definition;
 
 import enginuity.newmaps.ecudata.Scale;
 import enginuity.newmaps.ecudata.Unit;
-import java.util.Iterator;
+
 import java.util.StringTokenizer;
 import java.util.Vector;
 

src/enginuity/newmaps/definition/RomDefinitionHandler.java

@@ -21,23 +21,36 @@
 
 package enginuity.newmaps.definition;
 
-import static java.lang.Boolean.parseBoolean;
-import static java.lang.Float.parseFloat;
-import static enginuity.util.HexUtil.hexToInt;
-import static java.lang.Integer.parseInt;
-import static enginuity.newmaps.definition.AttributeParser.*;
-
+import static enginuity.newmaps.definition.AttributeParser.parseEndian;
+import static enginuity.newmaps.definition.AttributeParser.parseStorageType;
+import static enginuity.newmaps.definition.AttributeParser.parseUnitSystem;
 import enginuity.newmaps.definition.index.Index;
-import enginuity.newmaps.ecudata.*;
-import enginuity.util.NamedSet;
 import enginuity.newmaps.definition.index.IndexItem;
+import enginuity.newmaps.ecudata.Axis;
+import enginuity.newmaps.ecudata.Category;
+import enginuity.newmaps.ecudata.ECUData;
+import enginuity.newmaps.ecudata.Parameter;
+import enginuity.newmaps.ecudata.Rom;
+import enginuity.newmaps.ecudata.Scale;
+import enginuity.newmaps.ecudata.SourceDefAxis;
+import enginuity.newmaps.ecudata.Switch;
+import enginuity.newmaps.ecudata.SwitchGroup;
+import enginuity.newmaps.ecudata.Table2D;
+import enginuity.newmaps.ecudata.Table3D;
+import enginuity.newmaps.ecudata.Unit;
 import enginuity.newmaps.xml.SaxParserFactory;
+import static enginuity.util.HexUtil.hexToInt;
+import enginuity.util.NamedSet;
+import enginuity.util.exception.NameableNotFoundException;
 import org.xml.sax.Attributes;
 import org.xml.sax.helpers.DefaultHandler;
-import enginuity.util.exception.NameableNotFoundException;
+
 import java.io.BufferedInputStream;
 import java.io.FileInputStream;
 import java.io.InputStream;
+import static java.lang.Boolean.parseBoolean;
+import static java.lang.Float.parseFloat;
+import static java.lang.Integer.parseInt;
 import java.util.Stack;
 
 public class RomDefinitionHandler extends DefaultHandler {

src/enginuity/newmaps/definition/index/Index.java

@@ -21,13 +21,14 @@
 
 package enginuity.newmaps.definition.index;
 
-import enginuity.util.NamedSet;
-import java.io.Serializable;
-import java.util.Iterator;
 import static enginuity.util.MD5Checksum.getMD5Checksum;
 import enginuity.util.Nameable;
+import enginuity.util.NamedSet;
 import enginuity.util.exception.NameableNotFoundException;
+
 import java.io.File;
+import java.io.Serializable;
+import java.util.Iterator;
 
 public class Index extends NamedSet<IndexItem> implements Serializable {  
         

src/enginuity/newmaps/definition/index/IndexBuilder.java

@@ -22,14 +22,14 @@
 package enginuity.newmaps.definition.index;
 
 import enginuity.newmaps.xml.SaxParserFactory;
+import enginuity.util.exception.NameableNotFoundException;
+import org.xml.sax.SAXParseException;
+
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.ObjectOutputStream;
-import static enginuity.util.MD5Checksum.getMD5Checksum;
-import enginuity.util.exception.NameableNotFoundException;
-import org.xml.sax.SAXParseException;
 
 public class IndexBuilder {
         

src/enginuity/newmaps/definition/index/IndexItem.java

@@ -21,10 +21,11 @@
 
 package enginuity.newmaps.definition.index;
 
+import static enginuity.util.MD5Checksum.getMD5Checksum;
 import enginuity.util.Nameable;
+
 import java.io.File;
 import java.io.Serializable;
-import static enginuity.util.MD5Checksum.getMD5Checksum;
 
 public class IndexItem implements Nameable, Serializable {
     

src/enginuity/newmaps/definition/index/IndexUtil.java

@@ -23,15 +23,14 @@ package enginuity.newmaps.definition.index;
 
 import enginuity.newmaps.definition.RomDefinitionHandler;
 import enginuity.newmaps.xml.SaxParserFactory;
+import static enginuity.util.MD5Checksum.getMD5Checksum;
+
+import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.IOException;
+import java.io.InputStream;
 import java.io.ObjectInputStream;
 import java.util.Iterator;
-import static enginuity.util.MD5Checksum.getMD5Checksum;
-import java.io.BufferedInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
 
 public abstract class IndexUtil {
     

src/enginuity/newmaps/definition/translate/DefinitionBuilder.java

@@ -32,13 +32,14 @@ import enginuity.maps.Table3D;
 import enginuity.maps.TableSwitch;
 import enginuity.newmaps.xml.XmlHelper;
 import enginuity.util.HexUtil;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Text;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.util.Iterator;
 import java.util.Vector;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
 
 public class DefinitionBuilder {
         

src/enginuity/newmaps/definition/translate/FirstGenDefinitionHandler.java

@@ -33,14 +33,15 @@ import enginuity.maps.Table1D;
 import enginuity.maps.Table2D;
 import enginuity.maps.Table3D;
 import enginuity.maps.TableSwitch;
+import enginuity.util.ObjectCloner;
 import static enginuity.xml.DOMHelper.unmarshallAttribute;
 import static enginuity.xml.DOMHelper.unmarshallText;
-import enginuity.util.ObjectCloner;
 import enginuity.xml.RomAttributeParser;
 import enginuity.xml.TableIsOmittedException;
 import org.w3c.dom.Node;
 import static org.w3c.dom.Node.ELEMENT_NODE;
 import org.w3c.dom.NodeList;
+
 import javax.management.modelmbean.XMLParseException;
 import java.util.ArrayList;
 import java.util.Iterator;

src/enginuity/newmaps/definition/translate/FirstGenTranslator.java

@@ -23,11 +23,12 @@ package enginuity.newmaps.definition.translate;
 
 import com.sun.org.apache.xerces.internal.parsers.DOMParser;
 import enginuity.maps.Rom;
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.util.Vector;
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
 
 public class FirstGenTranslator {
         

src/enginuity/newmaps/ecudata/Category.java

@@ -23,6 +23,7 @@ package enginuity.newmaps.ecudata;
 
 import enginuity.util.Nameable;
 import enginuity.util.NamedSet;
+
 import java.io.Serializable;
 import java.util.Iterator;
 

src/enginuity/newmaps/ecudata/ECUData.java

@@ -22,6 +22,7 @@
 package enginuity.newmaps.ecudata;
 
 import enginuity.util.Nameable;
+
 import java.io.Serializable;
 
 public abstract class ECUData implements Nameable, Serializable {

src/enginuity/newmaps/ecudata/Rom.java

@@ -23,6 +23,7 @@ package enginuity.newmaps.ecudata;
 
 import enginuity.util.Nameable;
 import enginuity.util.NamedSet;
+
 import java.io.Serializable;
 
 public class Rom implements Nameable, Serializable {

src/enginuity/newmaps/ecudata/Scale.java

@@ -22,6 +22,7 @@
 package enginuity.newmaps.ecudata;
 
 import enginuity.util.Nameable;
+
 import java.io.Serializable;
 
 public class Scale implements Nameable, Serializable {

src/enginuity/newmaps/ecudata/SourceDefAxis.java

@@ -22,6 +22,7 @@
 package enginuity.newmaps.ecudata;
 
 import static enginuity.newmaps.definition.AttributeParser.stringToStringArray;
+
 import java.io.Serializable;
 
 public class SourceDefAxis extends Axis implements Serializable {

src/enginuity/newmaps/ecudata/Switch.java

@@ -21,9 +21,10 @@
 
 package enginuity.newmaps.ecudata;
 
-import java.io.Serializable;
 import static enginuity.newmaps.definition.AttributeParser.stringToByteArray;
 
+import java.io.Serializable;
+
 public class Switch extends ECUData implements Serializable {
     
     protected byte[] stateOn = new byte[1];

src/enginuity/newmaps/ecudata/SwitchGroup.java

@@ -23,6 +23,7 @@ package enginuity.newmaps.ecudata;
 
 import enginuity.util.NamedSet;
 import enginuity.util.exception.NameableNotFoundException;
+
 import java.util.Iterator;
 
 public class SwitchGroup extends ECUData {

src/enginuity/newmaps/ecudata/Unit.java

@@ -22,6 +22,7 @@
 package enginuity.newmaps.ecudata;
 
 import enginuity.util.Nameable;
+
 import java.io.Serializable;
 
 public class Unit implements Nameable, Serializable {

src/enginuity/newmaps/swing/Table.java

@@ -21,8 +21,7 @@
 
 package enginuity.newmaps.swing;
 
-import javax.swing.JTable;
-import javax.swing.ListSelectionModel;
+import javax.swing.*;
 import javax.swing.event.ListSelectionListener;
 
 public class Table extends JTable implements ListSelectionModel {

src/enginuity/newmaps/swing/TableFrame.java

@@ -21,11 +21,8 @@
 
 package enginuity.newmaps.swing;
 
-import java.awt.BorderLayout;
-import java.awt.Color;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
+import javax.swing.*;
+import java.awt.*;
 
 class TableFrame extends JFrame {
     // Instance attributes used in this example

src/enginuity/newmaps/xml/XmlHelper.java

@@ -22,13 +22,13 @@
 package enginuity.newmaps.xml;
 
 import enginuity.logger.exception.ConfigurationException;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Text;
+import org.xml.sax.SAXException;
+
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -39,12 +39,13 @@ import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-import org.xml.sax.SAXException;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 final public class XmlHelper extends Object {
  

src/enginuity/swing/SettingsForm.java

@@ -25,14 +25,13 @@ import ZoeloeSoft.projects.JFontChooser.JFontChooser;
 import enginuity.ECUEditor;
 import enginuity.Settings;
 import enginuity.util.FileAssociator;
-import java.awt.Color;
-import java.awt.Dimension;
+
+import javax.swing.*;
+import java.awt.*;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.io.File;
 import java.util.StringTokenizer;
-import javax.swing.JColorChooser;
-import javax.swing.JFrame;
 
 public class SettingsForm extends JFrame implements MouseListener {
 

src/enginuity/util/MD5Checksum.java

@@ -21,7 +21,8 @@
 
 package enginuity.util;
 
-import java.io.*;
+import java.io.FileInputStream;
+import java.io.InputStream;
 import java.security.MessageDigest;
 
 public class MD5Checksum {

src/enginuity/util/NamedSet.java

@@ -22,6 +22,7 @@
 package enginuity.util;
 
 import enginuity.util.exception.NameableNotFoundException;
+
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.Iterator;

src/enginuity/util/ObjectCloner.java

@@ -23,8 +23,6 @@ package enginuity.util;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.EOFException;
-import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 

src/enginuity/util/ThreadUtil.java

@@ -32,7 +32,7 @@ public final class ThreadUtil {
         try {
             TimeUnit.MILLISECONDS.sleep(millis);
         } catch (InterruptedException e) {
-            e.printStackTrace();
+            //e.printStackTrace();
         }
     }