cleaned up logger package structure

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

src/enginuity/logger/EcuLogger.java

@@ -1,39 +1,41 @@
 package enginuity.logger;
 
 import enginuity.Settings;
+import enginuity.logger.comms.controller.LoggerController;
+import enginuity.logger.comms.controller.LoggerControllerImpl;
+import enginuity.logger.comms.io.serial.port.SerialPortRefresher;
 import enginuity.logger.definition.EcuData;
 import enginuity.logger.definition.EcuDataLoader;
 import enginuity.logger.definition.EcuDataLoaderImpl;
 import enginuity.logger.definition.EcuParameter;
 import enginuity.logger.definition.EcuSwitch;
-import enginuity.logger.io.serial.SerialPortRefresher;
+import enginuity.logger.profile.UserProfile;
+import enginuity.logger.profile.UserProfileImpl;
+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;
 import enginuity.logger.ui.EcuLoggerMenuBar;
-import enginuity.logger.ui.LoggerDataTableModel;
 import enginuity.logger.ui.MessageListener;
-import enginuity.logger.ui.ParameterListTable;
-import enginuity.logger.ui.ParameterListTableModel;
-import enginuity.logger.ui.ParameterRow;
 import enginuity.logger.ui.SerialPortComboBox;
 import enginuity.logger.ui.StatusIndicator;
-import enginuity.logger.ui.UserProfile;
-import enginuity.logger.ui.UserProfileImpl;
-import enginuity.logger.ui.UserProfileItem;
-import enginuity.logger.ui.UserProfileItemImpl;
-import enginuity.logger.ui.UserProfileLoader;
-import enginuity.logger.ui.UserProfileLoaderImpl;
-import enginuity.logger.ui.handler.DashboardUpdateHandler;
 import enginuity.logger.ui.handler.DataUpdateHandler;
 import enginuity.logger.ui.handler.DataUpdateHandlerManager;
 import enginuity.logger.ui.handler.DataUpdateHandlerManagerImpl;
 import enginuity.logger.ui.handler.DataUpdateHandlerThreadWrapper;
-import enginuity.logger.ui.handler.FileUpdateHandler;
-import enginuity.logger.ui.handler.GraphUpdateHandler;
-import enginuity.logger.ui.handler.LiveDataUpdateHandler;
-import enginuity.logger.ui.handler.TableUpdateHandler;
+import enginuity.logger.ui.handler.dash.DashboardUpdateHandler;
+import enginuity.logger.ui.handler.file.FileUpdateHandler;
+import enginuity.logger.ui.handler.graph.GraphUpdateHandler;
+import enginuity.logger.ui.handler.livedata.LiveDataTableModel;
+import enginuity.logger.ui.handler.livedata.LiveDataUpdateHandler;
+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.ParamChecker.checkNotNull;
 
 import javax.swing.*;
@@ -95,7 +97,7 @@ public final class EcuLogger extends JFrame implements WindowListener, PropertyC
     private ParameterListTableModel dashboardTabParamListTableModel;
     private ParameterListTableModel dashboardTabSwitchListTableModel;
     private FileUpdateHandler fileUpdateHandler;
-    private LoggerDataTableModel dataTableModel;
+    private LiveDataTableModel dataTableModel;
     private LiveDataUpdateHandler liveDataUpdateHandler;
     private JPanel graphPanel;
     private GraphUpdateHandler graphUpdateHandler;
@@ -132,7 +134,7 @@ public final class EcuLogger extends JFrame implements WindowListener, PropertyC
         dashboardTabParamListTableModel = new ParameterListTableModel(dashboardTabBroker, HEADING_PARAMETERS);
         dashboardTabSwitchListTableModel = new ParameterListTableModel(dashboardTabBroker, HEADING_SWITCHES);
         fileUpdateHandler = new FileUpdateHandler(settings);
-        dataTableModel = new LoggerDataTableModel();
+        dataTableModel = new LiveDataTableModel();
         liveDataUpdateHandler = new LiveDataUpdateHandler(dataTableModel);
         graphPanel = new JPanel(new SpringLayout());
         graphUpdateHandler = new GraphUpdateHandler(graphPanel);

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

@@ -1,7 +1,7 @@
-package enginuity.logger;
+package enginuity.logger.comms.controller;
 
+import enginuity.logger.comms.query.LoggerCallback;
 import enginuity.logger.definition.EcuData;
-import enginuity.logger.query.LoggerCallback;
 import enginuity.logger.ui.ControllerListener;
 
 import java.util.Set;

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

@@ -1,14 +1,14 @@
-package enginuity.logger;
+package enginuity.logger.comms.controller;
 
 import enginuity.Settings;
+import enginuity.logger.comms.io.serial.port.SerialPortDiscoverer;
+import enginuity.logger.comms.io.serial.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.io.serial.SerialPortDiscoverer;
-import enginuity.logger.io.serial.SerialPortDiscovererImpl;
-import enginuity.logger.manager.QueryManager;
-import enginuity.logger.manager.QueryManagerImpl;
-import enginuity.logger.manager.TransmissionManager;
-import enginuity.logger.manager.TransmissionManagerImpl;
-import enginuity.logger.query.LoggerCallback;
 import enginuity.logger.ui.ControllerListener;
 import enginuity.logger.ui.MessageListener;
 import static enginuity.util.ParamChecker.checkNotNull;

src/enginuity/logger/comms/io/file/FileLogger.java

@@ -1,4 +1,4 @@
-package enginuity.logger.io.file;
+package enginuity.logger.comms.io.file;
 
 public interface FileLogger {
     void start();

src/enginuity/logger/comms/io/file/FileLoggerImpl.java

@@ -1,4 +1,4 @@
-package enginuity.logger.io.file;
+package enginuity.logger.comms.io.file;
 
 import enginuity.Settings;
 import enginuity.logger.exception.FileLoggerException;

src/enginuity/logger/comms/io/serial/SerialConnection.java

@@ -1,6 +1,6 @@
-package enginuity.logger.io.serial;
+package enginuity.logger.comms.io.serial;
 
-import enginuity.logger.query.RegisteredQuery;
+import enginuity.logger.comms.query.RegisteredQuery;
 
 import java.util.Collection;
 

src/enginuity/logger/comms/io/serial/SerialConnectionImpl.java

@@ -1,12 +1,12 @@
-package enginuity.logger.io.serial;
+package enginuity.logger.comms.io.serial;
 
+import enginuity.logger.comms.io.serial.protocol.ConnectionProperties;
+import enginuity.logger.comms.io.serial.protocol.Protocol;
+import enginuity.logger.comms.query.RegisteredQuery;
 import enginuity.logger.exception.NotConnectedException;
 import enginuity.logger.exception.PortNotFoundException;
 import enginuity.logger.exception.SerialCommunicationException;
 import enginuity.logger.exception.UnsupportedPortTypeException;
-import enginuity.logger.io.serial.protocol.ConnectionProperties;
-import enginuity.logger.io.serial.protocol.Protocol;
-import enginuity.logger.query.RegisteredQuery;
 import static enginuity.util.HexUtil.asHex;
 import static enginuity.util.ParamChecker.checkGreaterThanZero;
 import static enginuity.util.ParamChecker.checkNotNull;

src/enginuity/logger/comms/io/serial/port/SerialPortDiscoverer.java

@@ -1,4 +1,4 @@
-package enginuity.logger.io.serial;
+package enginuity.logger.comms.io.serial.port;
 
 import gnu.io.CommPortIdentifier;
 

src/enginuity/logger/comms/io/serial/port/SerialPortDiscovererImpl.java

@@ -1,4 +1,4 @@
-package enginuity.logger.io.serial;
+package enginuity.logger.comms.io.serial.port;
 
 import gnu.io.CommPortIdentifier;
 import static gnu.io.CommPortIdentifier.PORT_SERIAL;

src/enginuity/logger/comms/io/serial/port/SerialPortRefreshListener.java

@@ -1,4 +1,4 @@
-package enginuity.logger.io.serial;
+package enginuity.logger.comms.io.serial.port;
 
 import java.util.Set;
 

src/enginuity/logger/comms/io/serial/port/SerialPortRefresher.java

@@ -1,6 +1,6 @@
-package enginuity.logger.io.serial;
+package enginuity.logger.comms.io.serial.port;
 
-import enginuity.logger.LoggerController;
+import enginuity.logger.comms.controller.LoggerController;
 import static enginuity.util.ParamChecker.checkNotNull;
 
 public final class SerialPortRefresher implements Runnable {

src/enginuity/logger/comms/io/serial/protocol/ConnectionProperties.java

@@ -1,4 +1,4 @@
-package enginuity.logger.io.serial.protocol;
+package enginuity.logger.comms.io.serial.protocol;
 
 public interface ConnectionProperties {
 

src/enginuity/logger/comms/io/serial/protocol/Protocol.java

@@ -1,6 +1,6 @@
-package enginuity.logger.io.serial.protocol;
+package enginuity.logger.comms.io.serial.protocol;
 
-import enginuity.logger.query.RegisteredQuery;
+import enginuity.logger.comms.query.RegisteredQuery;
 
 import java.util.Collection;
 

src/enginuity/logger/comms/io/serial/protocol/ProtocolFactory.java

@@ -1,4 +1,4 @@
-package enginuity.logger.io.serial.protocol;
+package enginuity.logger.comms.io.serial.protocol;
 
 import enginuity.logger.exception.UnsupportedProtocolException;
 

src/enginuity/logger/comms/io/serial/protocol/SSMProtocol.java

@@ -1,7 +1,7 @@
-package enginuity.logger.io.serial.protocol;
+package enginuity.logger.comms.io.serial.protocol;
 
+import enginuity.logger.comms.query.RegisteredQuery;
 import enginuity.logger.exception.InvalidResponseException;
-import enginuity.logger.query.RegisteredQuery;
 import static enginuity.util.ByteUtil.asByte;
 import static enginuity.util.ByteUtil.asInt;
 import static enginuity.util.HexUtil.asHex;

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

@@ -1,7 +1,7 @@
-package enginuity.logger.manager;
+package enginuity.logger.comms.manager;
 
+import enginuity.logger.comms.query.LoggerCallback;
 import enginuity.logger.definition.EcuData;
-import enginuity.logger.query.LoggerCallback;
 
 public interface QueryManager extends Runnable {
 

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

@@ -1,10 +1,10 @@
-package enginuity.logger.manager;
+package enginuity.logger.comms.manager;
 
-import enginuity.logger.LoggerController;
+import enginuity.logger.comms.controller.LoggerController;
+import enginuity.logger.comms.query.LoggerCallback;
+import enginuity.logger.comms.query.RegisteredQuery;
+import enginuity.logger.comms.query.RegisteredQueryImpl;
 import enginuity.logger.definition.EcuData;
-import enginuity.logger.query.LoggerCallback;
-import enginuity.logger.query.RegisteredQuery;
-import enginuity.logger.query.RegisteredQueryImpl;
 import enginuity.logger.ui.MessageListener;
 import static enginuity.util.ParamChecker.checkNotNull;
 

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

@@ -1,7 +1,7 @@
-package enginuity.logger.manager;
+package enginuity.logger.comms.manager;
 
-import enginuity.logger.query.LoggerCallback;
-import enginuity.logger.query.RegisteredQuery;
+import enginuity.logger.comms.query.LoggerCallback;
+import enginuity.logger.comms.query.RegisteredQuery;
 
 import java.util.Collection;
 

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

@@ -1,14 +1,14 @@
-package enginuity.logger.manager;
+package enginuity.logger.comms.manager;
 
 import enginuity.Settings;
+import enginuity.logger.comms.io.serial.SerialConnection;
+import enginuity.logger.comms.io.serial.SerialConnectionImpl;
+import enginuity.logger.comms.io.serial.protocol.Protocol;
+import enginuity.logger.comms.io.serial.protocol.ProtocolFactory;
+import enginuity.logger.comms.query.LoggerCallback;
+import enginuity.logger.comms.query.RegisteredQuery;
 import enginuity.logger.exception.NotConnectedException;
 import enginuity.logger.exception.SerialCommunicationException;
-import enginuity.logger.io.serial.SerialConnection;
-import enginuity.logger.io.serial.SerialConnectionImpl;
-import enginuity.logger.io.serial.protocol.Protocol;
-import enginuity.logger.io.serial.protocol.ProtocolFactory;
-import enginuity.logger.query.LoggerCallback;
-import enginuity.logger.query.RegisteredQuery;
 import enginuity.util.HexUtil;
 import static enginuity.util.ParamChecker.checkNotNull;
 

src/enginuity/logger/comms/query/LoggerCallback.java

@@ -1,4 +1,4 @@
-package enginuity.logger.query;
+package enginuity.logger.comms.query;
 
 public interface LoggerCallback {
 

src/enginuity/logger/comms/query/RegisteredQuery.java

@@ -1,4 +1,4 @@
-package enginuity.logger.query;
+package enginuity.logger.comms.query;
 
 import enginuity.logger.definition.EcuData;
 

src/enginuity/logger/comms/query/RegisteredQueryImpl.java

@@ -1,4 +1,4 @@
-package enginuity.logger.query;
+package enginuity.logger.comms.query;
 
 import enginuity.logger.definition.EcuData;
 import static enginuity.util.HexUtil.asBytes;

src/enginuity/logger/definition/EcuDataLoaderImpl.java

@@ -1,8 +1,9 @@
 package enginuity.logger.definition;
 
+import enginuity.logger.definition.xml.LoggerDefinitionHandler;
 import enginuity.logger.exception.ConfigurationException;
-import static enginuity.logger.xml.SaxParserFactory.getSaxParser;
 import static enginuity.util.ParamChecker.checkNotNullOrEmpty;
+import static enginuity.util.SaxParserFactory.getSaxParser;
 
 import java.io.BufferedInputStream;
 import java.io.File;

src/enginuity/logger/definition/xml/LoggerDefinitionHandler.java

@@ -1,5 +1,16 @@
-package enginuity.logger.definition;
+package enginuity.logger.definition.xml;
 
+import enginuity.logger.definition.EcuData;
+import enginuity.logger.definition.EcuDataConvertor;
+import enginuity.logger.definition.EcuDerivedParameterConvertor;
+import enginuity.logger.definition.EcuDerivedParameterConvertorImpl;
+import enginuity.logger.definition.EcuDerivedParameterImpl;
+import enginuity.logger.definition.EcuParameter;
+import enginuity.logger.definition.EcuParameterConvertorImpl;
+import enginuity.logger.definition.EcuParameterImpl;
+import enginuity.logger.definition.EcuSwitch;
+import enginuity.logger.definition.EcuSwitchConvertorImpl;
+import enginuity.logger.definition.EcuSwitchImpl;
 import static enginuity.util.ParamChecker.checkNotNullOrEmpty;
 import org.xml.sax.Attributes;
 import org.xml.sax.helpers.DefaultHandler;

src/enginuity/logger/profile/UserProfile.java

@@ -1,4 +1,4 @@
-package enginuity.logger.ui;
+package enginuity.logger.profile;
 
 import enginuity.logger.definition.EcuData;
 import enginuity.logger.definition.EcuDataConvertor;

src/enginuity/logger/profile/UserProfileFileFilter.java

@@ -1,13 +1,13 @@
-package enginuity.logger.ui;
+package enginuity.logger.profile;
 
 import enginuity.swing.GenericFileFilter;
 
 import javax.swing.filechooser.FileFilter;
 import java.io.File;
 
-public final class LoggerProfileFileFilter extends FileFilter {
+public final class UserProfileFileFilter extends FileFilter {
 
-    private final FileFilter filter = new GenericFileFilter("Logger Profiles", "xml");
+    private final FileFilter filter = new GenericFileFilter("ECU Logger User Profiles", "xml");
 
     public boolean accept(File file) {
         return filter.accept(file);

src/enginuity/logger/profile/UserProfileHandler.java

@@ -1,4 +1,4 @@
-package enginuity.logger.ui;
+package enginuity.logger.profile;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.helpers.DefaultHandler;

src/enginuity/logger/profile/UserProfileImpl.java

@@ -1,4 +1,4 @@
-package enginuity.logger.ui;
+package enginuity.logger.profile;
 
 import enginuity.logger.definition.EcuData;
 import enginuity.logger.definition.EcuDataConvertor;

src/enginuity/logger/profile/UserProfileItem.java

@@ -1,4 +1,4 @@
-package enginuity.logger.ui;
+package enginuity.logger.profile;
 
 public interface UserProfileItem {
 

src/enginuity/logger/profile/UserProfileItemImpl.java

@@ -1,4 +1,4 @@
-package enginuity.logger.ui;
+package enginuity.logger.profile;
 
 public final class UserProfileItemImpl implements UserProfileItem {
     private final String units;

src/enginuity/logger/profile/UserProfileLoader.java

@@ -1,4 +1,4 @@
-package enginuity.logger.ui;
+package enginuity.logger.profile;
 
 public interface UserProfileLoader {
     UserProfile loadProfile(String filePath);

src/enginuity/logger/profile/UserProfileLoaderImpl.java

@@ -1,7 +1,7 @@
-package enginuity.logger.ui;
+package enginuity.logger.profile;
 
-import static enginuity.logger.xml.SaxParserFactory.getSaxParser;
 import static enginuity.util.ParamChecker.checkNotNullOrEmpty;
+import static enginuity.util.SaxParserFactory.getSaxParser;
 
 import java.io.BufferedInputStream;
 import java.io.File;

src/enginuity/logger/ui/ChartScrollBar.java

@@ -1,216 +0,0 @@
-package enginuity.logger.ui;
-
-import org.jfree.chart.JFreeChart;
-import org.jfree.chart.axis.DateAxis;
-import org.jfree.chart.axis.Timeline;
-import org.jfree.chart.axis.ValueAxis;
-import org.jfree.chart.event.AxisChangeEvent;
-import org.jfree.chart.event.AxisChangeListener;
-import org.jfree.chart.plot.XYPlot;
-import org.jfree.data.Range;
-import org.jfree.data.general.Dataset;
-import org.jfree.data.general.DatasetChangeEvent;
-import org.jfree.data.general.DatasetChangeListener;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.AdjustmentEvent;
-import java.awt.event.AdjustmentListener;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-
-public class ChartScrollBar extends JScrollBar implements AdjustmentListener, AxisChangeListener, MouseListener, DatasetChangeListener {
-    private JFreeChart chart;
-    private XYPlot plot;
-    private double ratio;
-    private boolean updating = false;
-
-    public ChartScrollBar(int orientation, JFreeChart chart) {
-        this(orientation, chart, null);
-    }
-
-    public ChartScrollBar(int orientation, JFreeChart chart, XYPlot plot) {
-        super(orientation);
-        this.chart = chart;
-        if (plot == null) {
-            this.plot = chart.getXYPlot();
-        } else {
-            this.plot = plot;
-        }
-        if (getXYPlot() != null && getValueAxis() != null) {
-            getValueAxis().addChangeListener(this);
-            addAdjustmentListener(this);
-            if (getXYPlot().getDataset() != null) {
-                getXYPlot().getDataset().addChangeListener(this);
-            }
-            axisUpdate();
-            addMouseListener(this);
-        }
-    }
-
-    public XYPlot getXYPlot() {
-        return plot;
-    }
-
-    public ValueAxis getValueAxis() {
-        if (orientation == VERTICAL) {
-            return getXYPlot().getRangeAxis();
-        }
-        return getXYPlot().getDomainAxis();
-    }
-
-    public Dataset getDataset() {
-        return getXYPlot().getDataset();
-    }
-
-    public Range getDataRange() {
-        return getXYPlot().getDataRange(getValueAxis());
-    }
-
-    public double getDataMinimum() {
-        return getDataRange().getLowerBound();
-    }
-
-    public double getDataMaximum() {
-        return getDataRange().getUpperBound();
-    }
-
-    public double getViewMinimum() {
-        return getValueAxis().getLowerBound();
-    }
-
-    public double getViewMaximum() {
-        return getValueAxis().getUpperBound();
-    }
-
-    public double getViewLength() {
-        return getValueAxis().getRange().getLength();
-    }
-
-    public double getDisplayMaximum() {
-        return getDataMaximum();//Math.max(getDataMaximum(), getViewMaximum());
-    }
-
-    public double getDisplayMinimum() {
-        return getDataMinimum();//Math.min(getDataMinimum(), getViewMinimum());
-    }
-
-    private double displayMin;
-    private double displayMax;
-    private double viewLength;
-    private static int STEPS = 100000; // 1000000 could be Integer.MAX_VALUE if you like, but this makes debugging a little easier
-    Color oldColor;
-
-    public void axisUpdate() {
-        ValueAxis va = getValueAxis();
-        if (va.isAutoRange()) {
-            if (oldColor == null) {
-                oldColor = getBackground();
-            }
-            setBackground(oldColor.brighter());
-        } else if (oldColor != null) {
-            setBackground(oldColor);
-            oldColor = null;
-        }
-        if (updating) {
-            return;
-        }
-        updating = true;
-        displayMin = 0;
-        displayMax = 0;
-        viewLength = 0;
-        double viewMin = 0;
-        double viewMax = 0;
-        ratio = 1;
-        Range dataRange = getDataRange();
-        if (dataRange != null) {
-            displayMin = getDisplayMinimum();
-            displayMax = getDisplayMaximum();
-            viewMin = getViewMinimum();
-            viewMax = getViewMaximum();
-            //ValueAxis va = getValueAxis();
-            if (va instanceof DateAxis) {
-                Timeline tl = ((DateAxis) va).getTimeline();
-                displayMin = tl.toTimelineValue((long) displayMin);
-                displayMax = tl.toTimelineValue((long) displayMax);
-                viewMin = tl.toTimelineValue((long) viewMin);
-                viewMax = tl.toTimelineValue((long) viewMax);
-            }
-            viewLength = viewMax - viewMin;
-            ratio = STEPS / (displayMax - displayMin);
-        }
-
-        int newMin = 0;
-        int newMax = STEPS;
-        int newExtent = (int) (viewLength * ratio);
-        int newValue;
-        if (orientation == VERTICAL) {
-            newValue = (int) ((displayMax - viewMax) * ratio);
-        } else {
-            newValue = (int) ((viewMin - displayMin) * ratio);
-        }
-        //System.out.println("ChartScrollBar.axisUpdate(): newValue: " + newValue + " newExtent: " + newExtent + " newMin: " + newMin + " newMax: " + newMax);
-        setValues(newValue, newExtent, newMin, newMax);
-        updating = false;
-    }
-
-    public void axisChanged(AxisChangeEvent event) {
-        //System.out.println("ChartScrollBar.axisChanged()");
-        axisUpdate();
-    }
-
-    public void datasetChanged(DatasetChangeEvent event) {
-        //System.out.println("ChartScrollBar.datasetChanged()");
-        axisUpdate();
-    }
-
-    public void adjustmentValueChanged(AdjustmentEvent e) {
-        if (updating) {
-            return;
-        }
-        updating = true;
-        double start, end;
-        if (orientation == VERTICAL) {
-            end = displayMax - (getValue() / ratio);
-            start = end - viewLength;
-        } else {
-            start = getValue() / ratio + displayMin;
-            end = start + viewLength;
-        }
-
-        if (end > start) {
-            ValueAxis va = getValueAxis();
-            if (va instanceof DateAxis) {
-                Timeline tl = ((DateAxis) va).getTimeline();
-                start = tl.toMillisecond((long) start);
-                end = tl.toMillisecond((long) end);
-                //System.out.println("********** converting start=" + new java.util.Date((long)start) + " end=" + new java.util.Date((long)end) + " **********");
-            }
-            getValueAxis().setRange(start, end);
-        }
-        updating = false;
-    }
-
-    public void zoomFull() {
-        getValueAxis().setAutoRange(true);
-        //getValueAxis().autoAdjustRange();
-    }
-
-    public void mouseClicked(MouseEvent e) {
-        if (e.getButton() == MouseEvent.BUTTON3) {
-            zoomFull();
-        }
-    }
-
-    public void mouseEntered(MouseEvent e) {
-    }
-
-    public void mouseExited(MouseEvent e) {
-    }
-
-    public void mousePressed(MouseEvent e) {
-    }
-
-    public void mouseReleased(MouseEvent e) {
-    }
-}

src/enginuity/logger/ui/DataRegistrationBrokerImpl.java

@@ -1,8 +1,8 @@
 package enginuity.logger.ui;
 
-import enginuity.logger.LoggerController;
+import enginuity.logger.comms.controller.LoggerController;
+import enginuity.logger.comms.query.LoggerCallback;
 import enginuity.logger.definition.EcuData;
-import enginuity.logger.query.LoggerCallback;
 import enginuity.logger.ui.handler.DataUpdateHandlerManager;
 import static enginuity.util.ParamChecker.checkNotNull;
 

src/enginuity/logger/ui/EcuLoggerMenuBar.java

@@ -1,6 +1,7 @@
 package enginuity.logger.ui;
 
 import enginuity.logger.EcuLogger;
+import enginuity.logger.profile.UserProfileFileFilter;
 
 import javax.swing.*;
 import static javax.swing.JFileChooser.APPROVE_OPTION;
@@ -190,7 +191,7 @@ public class EcuLoggerMenuBar extends JMenuBar implements ActionListener {
         } else {
             fc = new JFileChooser();
         }
-        fc.setFileFilter(new LoggerProfileFileFilter());
+        fc.setFileFilter(new UserProfileFileFilter());
         return fc;
     }
 

src/enginuity/logger/ui/SerialPortComboBox.java

@@ -1,7 +1,7 @@
 package enginuity.logger.ui;
 
 import enginuity.Settings;
-import enginuity.logger.io.serial.SerialPortRefreshListener;
+import enginuity.logger.comms.io.serial.port.SerialPortRefreshListener;
 import static enginuity.util.ParamChecker.checkNotNull;
 
 import javax.swing.*;

src/enginuity/logger/ui/StatusIndicator.java

@@ -1,5 +1,7 @@
 package enginuity.logger.ui;
 
+import enginuity.logger.ui.handler.file.FileLoggerListener;
+
 import javax.swing.*;
 import java.awt.*;
 import static java.awt.BorderLayout.WEST;

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

@@ -1,7 +1,8 @@
-package enginuity.logger.ui.handler;
+package enginuity.logger.ui.handler.dash;
 
 import enginuity.logger.definition.ConvertorUpdateListener;
 import enginuity.logger.definition.EcuData;
+import enginuity.logger.ui.handler.DataUpdateHandler;
 
 import javax.swing.*;
 import java.awt.*;

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

@@ -1,4 +1,4 @@
-package enginuity.logger.ui.handler;
+package enginuity.logger.ui.handler.dash;
 
 import javax.swing.*;
 

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

@@ -1,4 +1,4 @@
-package enginuity.logger.ui.handler;
+package enginuity.logger.ui.handler.dash;
 
 import enginuity.logger.definition.EcuData;
 import static enginuity.util.ParamChecker.checkNotNull;

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

@@ -1,4 +1,4 @@
-package enginuity.logger.ui;
+package enginuity.logger.ui.handler.file;
 
 public interface FileLoggerListener {
 

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

@@ -1,13 +1,13 @@
-package enginuity.logger.ui.handler;
+package enginuity.logger.ui.handler.file;
 
 import enginuity.Settings;
+import enginuity.logger.comms.io.file.FileLogger;
+import enginuity.logger.comms.io.file.FileLoggerImpl;
 import enginuity.logger.definition.ConvertorUpdateListener;
 import enginuity.logger.definition.EcuData;
 import enginuity.logger.definition.EcuDataConvertor;
 import enginuity.logger.definition.EcuSwitch;
-import enginuity.logger.io.file.FileLogger;
-import enginuity.logger.io.file.FileLoggerImpl;
-import enginuity.logger.ui.FileLoggerListener;
+import enginuity.logger.ui.handler.DataUpdateHandler;
 import static enginuity.util.ParamChecker.checkNotNull;
 
 import java.util.ArrayList;

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

@@ -1,8 +1,9 @@
-package enginuity.logger.ui.handler;
+package enginuity.logger.ui.handler.graph;
 
 import enginuity.logger.definition.ConvertorUpdateListener;
 import enginuity.logger.definition.EcuData;
-import static enginuity.logger.ui.SpringUtilities.makeCompactGrid;
+import enginuity.logger.ui.handler.DataUpdateHandler;
+import static enginuity.logger.ui.handler.graph.SpringUtilities.makeCompactGrid;
 import org.jfree.chart.ChartFactory;
 import org.jfree.chart.ChartPanel;
 import org.jfree.chart.JFreeChart;

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

@@ -1,4 +1,4 @@
-package enginuity.logger.ui;
+package enginuity.logger.ui.handler.graph;
 
 import javax.swing.*;
 import java.awt.*;

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

@@ -1,16 +1,16 @@
-package enginuity.logger.ui;
+package enginuity.logger.ui.handler.livedata;
 
 import enginuity.logger.definition.EcuData;
 import static enginuity.util.ParamChecker.checkNotNull;
 
-public final class LoggerDataRow {
+public final class LiveDataRow {
     private final EcuData ecuData;
     private double minValue;
     private double maxValue;
     private double currentValue;
     private boolean updated = false;
 
-    public LoggerDataRow(EcuData ecuData) {
+    public LiveDataRow(EcuData ecuData) {
         checkNotNull(ecuData, "ecuData");
         this.ecuData = ecuData;
     }

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

@@ -1,4 +1,4 @@
-package enginuity.logger.ui;
+package enginuity.logger.ui.handler.livedata;
 
 import enginuity.logger.definition.EcuData;
 
@@ -10,10 +10,10 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-public final class LoggerDataTableModel extends AbstractTableModel {
+public final class LiveDataTableModel extends AbstractTableModel {
     private final String[] columnNames = {"ECU Data", "Min Value", "Current Value", "Max Value", "Units"};
     private final List<EcuData> registeredEcuData = synchronizedList(new LinkedList<EcuData>());
-    private final Map<EcuData, LoggerDataRow> dataRowMap = synchronizedMap(new LinkedHashMap<EcuData, LoggerDataRow>());
+    private final Map<EcuData, LiveDataRow> dataRowMap = synchronizedMap(new LinkedHashMap<EcuData, LiveDataRow>());
 
     public synchronized int getRowCount() {
         return dataRowMap.size();
@@ -32,7 +32,7 @@ public final class LoggerDataTableModel extends AbstractTableModel {
     }
 
     public synchronized Object getValueAt(int row, int col) {
-        LoggerDataRow dataRow = dataRowMap.get(registeredEcuData.get(row));
+        LiveDataRow dataRow = dataRowMap.get(registeredEcuData.get(row));
         switch (col) {
             case 0:
                 return dataRow.getName();
@@ -51,7 +51,7 @@ public final class LoggerDataTableModel extends AbstractTableModel {
 
     public synchronized void addParam(EcuData ecuData) {
         if (!registeredEcuData.contains(ecuData)) {
-            dataRowMap.put(ecuData, new LoggerDataRow(ecuData));
+            dataRowMap.put(ecuData, new LiveDataRow(ecuData));
             registeredEcuData.add(ecuData);
             fireTableDataChanged();
         }
@@ -64,7 +64,7 @@ public final class LoggerDataTableModel extends AbstractTableModel {
     }
 
     public synchronized void updateParam(EcuData ecuData, byte[] bytes) {
-        LoggerDataRow dataRow = dataRowMap.get(ecuData);
+        LiveDataRow dataRow = dataRowMap.get(ecuData);
         if (dataRow != null) {
             dataRow.updateValue(bytes);
             int index = registeredEcuData.indexOf(ecuData);

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

@@ -1,13 +1,13 @@
-package enginuity.logger.ui.handler;
+package enginuity.logger.ui.handler.livedata;
 
 import enginuity.logger.definition.ConvertorUpdateListener;
 import enginuity.logger.definition.EcuData;
-import enginuity.logger.ui.LoggerDataTableModel;
+import enginuity.logger.ui.handler.DataUpdateHandler;
 
 public final class LiveDataUpdateHandler implements DataUpdateHandler, ConvertorUpdateListener {
-    private final LoggerDataTableModel dataTableModel;
+    private final LiveDataTableModel dataTableModel;
 
-    public LiveDataUpdateHandler(LoggerDataTableModel dataTableModel) {
+    public LiveDataUpdateHandler(LiveDataTableModel dataTableModel) {
         this.dataTableModel = dataTableModel;
     }
 

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

@@ -1,6 +1,7 @@
-package enginuity.logger.ui.handler;
+package enginuity.logger.ui.handler.table;
 
 import enginuity.logger.definition.EcuData;
+import enginuity.logger.ui.handler.DataUpdateHandler;
 import enginuity.maps.Table;
 
 import java.util.ArrayList;

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

@@ -1,4 +1,4 @@
-package enginuity.logger.ui;
+package enginuity.logger.ui.paramlist;
 
 import enginuity.logger.definition.EcuData;
 

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

@@ -1,6 +1,7 @@
-package enginuity.logger.ui;
+package enginuity.logger.ui.paramlist;
 
 import enginuity.logger.definition.EcuData;
+import enginuity.logger.ui.DataRegistrationBroker;
 
 import javax.swing.table.AbstractTableModel;
 import java.util.ArrayList;

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

@@ -1,4 +1,4 @@
-package enginuity.logger.ui;
+package enginuity.logger.ui.paramlist;
 
 import enginuity.logger.definition.EcuData;
 import static enginuity.util.ParamChecker.checkNotNull;

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

@@ -1,4 +1,4 @@
-package enginuity.logger.ui;
+package enginuity.logger.ui.paramlist;
 
 import enginuity.logger.definition.EcuData;
 import enginuity.logger.definition.EcuDataConvertor;

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

@@ -1,4 +1,4 @@
-package enginuity.logger.ui;
+package enginuity.logger.ui.paramlist;
 
 import enginuity.logger.definition.EcuData;
 import enginuity.logger.definition.EcuDataConvertor;

src/enginuity/maps/Table.java

@@ -1,7 +1,7 @@
 package enginuity.maps;
 
 import enginuity.Settings;
-import enginuity.logger.ui.handler.TableUpdateHandler;
+import enginuity.logger.ui.handler.table.TableUpdateHandler;
 import enginuity.swing.TableFrame;
 import static enginuity.util.ColorScaler.getScaledColor;
 import enginuity.util.JEPUtil;

src/enginuity/newmaps/xml/SaxParserFactory.java

@@ -6,6 +6,8 @@ import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
+
+// Jared, this is the same as the SaxParserFactory that I used for the logger which I've moved to the enginuity.util package. You should probably use the same one..
 public final class SaxParserFactory {
 
     private SaxParserFactory() {

src/enginuity/util/SaxParserFactory.java

@@ -1,4 +1,4 @@
-package enginuity.logger.xml;
+package enginuity.util;
 
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;