From 77a3bd564108cfe57b3de0db66296e6a26057ce0 Mon Sep 17 00:00:00 2001 From: kascade Date: Mon, 28 Apr 2008 11:50:30 +0000 Subject: [PATCH] package enginuity -> com.romraider git-svn-id: https://svn2.assembla.com/svn/romraider/trunk@61 38686702-15cf-42e4-a595-3071df8bf5ea --- .project | 2 +- 3rdparty/IzPack/installinfo/Summary.htm | 21 - build.xml | 4 +- graphics/enginuity-splash.bmp | Bin 97608 -> 0 bytes .../{enginuity-ico.gif => romraider-ico.gif} | Bin .../{enginuity-ico.ico => romraider-ico.ico} | Bin license.txt | 564 +++++++------- log4j.properties | 2 +- manifest | 46 +- plugins/aem.plugin | 2 +- plugins/lc1.plugin | 2 +- plugins/lm1.plugin | 2 +- plugins/utec.plugin | 2 +- release_notes.txt | 706 +++++++++--------- .../romraider}/ECUEditor.java | 39 +- .../romraider}/ECUEditorManager.java | 3 +- src/{enginuity => com/romraider}/ECUExec.java | 7 +- .../romraider}/NewGUI/NewGUI.java | 48 +- .../romraider}/NewGUI/TestNewGUI.java | 4 +- .../NewGUI/data/ApplicationStateManager.java | 18 +- .../romraider}/NewGUI/data/TableMetaData.java | 4 +- .../NewGUI/desktop/EDesktopPane.java | 6 +- .../NewGUI/etable/EInternalFrame.java | 12 +- .../romraider}/NewGUI/etable/ETable.java | 6 +- .../NewGUI/etable/ETableCellRenderer.java | 2 +- .../NewGUI/etable/ETableMenuBar.java | 4 +- .../romraider}/NewGUI/etable/ETableModel.java | 4 +- .../NewGUI/etable/ETableRowLabel.java | 2 +- .../NewGUI/etable/ETableSaveState.java | 2 +- .../etable/ETableSelectionListener.java | 2 +- .../NewGUI/etable/ETableToolBar.java | 4 +- .../etable/dataJPanel/DataJPanel1DString.java | 4 +- .../etable/dataJPanel/DataJPanel3DDouble.java | 18 +- .../dataJPanel/DataJPanelInterface.java | 2 +- .../NewGUI/etable/text/RotatedLabel.java | 2 +- .../NewGUI/interfaces/TuningEntity.java | 2 +- .../interfaces/TuningEntityListener.java | 4 +- .../NewGUI/tools/ClipBoardCopy.java | 4 +- .../romraider}/NewGUI/tools/FitData.java | 2 +- .../NewGUI/tools/RomRaiderDataTools.java | 5 + .../romraider}/NewGUI/tree/ETree.java | 10 +- .../NewGUI/tree/ETreeCellRenderer.java | 6 +- .../romraider}/NewGUI/tree/ETreeNode.java | 6 +- .../romraider}/Settings.java | 8 +- .../romraider}/Version.java.template | 2 +- .../io/connection/ConnectionProperties.java | 2 +- .../connection/ConnectionPropertiesImpl.java | 2 +- .../io/connection/EcuConnection.java | 2 +- .../io/connection/EcuConnectionImpl.java | 10 +- .../io/connection/SerialConnection.java | 2 +- .../io/connection/SerialConnectionImpl.java | 16 +- .../io/connection/TestSSMConnectionImpl.java | 46 +- .../io/port/SerialPortDiscoverer.java | 2 +- .../io/port/SerialPortDiscovererImpl.java | 2 +- .../io/port/SerialPortRefreshListener.java | 2 +- .../io/port/SerialPortRefresher.java | 6 +- .../romraider}/io/protocol/Protocol.java | 6 +- .../io/protocol/ProtocolFactory.java | 4 +- .../io/protocol/SSMChecksumCalculator.java | 6 +- .../romraider}/io/protocol/SSMProtocol.java | 28 +- .../io/protocol/SSMResponseProcessor.java | 32 +- .../logger/aem/io/AemConnection.java | 2 +- .../logger/aem/io/AemConnectionImpl.java | 18 +- .../aem/io/AemConnectionProperties.java | 4 +- .../romraider}/logger/aem/io/AemRunner.java | 2 +- .../logger/aem/io/AemRunnerImpl.java | 6 +- .../logger/aem/plugin/AemConvertor.java | 2 +- .../logger/aem/plugin/AemConvertorImpl.java | 4 +- .../logger/aem/plugin/AemDataItem.java | 4 +- .../logger/aem/plugin/AemDataSource.java | 14 +- .../logger/aem/plugin/AemSettings.java | 2 +- .../logger/aem/plugin/AemSettingsImpl.java | 2 +- .../logger/aem/plugin/DataListener.java | 2 +- .../romraider}/logger/ecu/EcuLogger.java | 138 ++-- .../romraider}/logger/ecu/EcuLoggerExec.java | 10 +- .../comms/controller/LoggerController.java | 8 +- .../controller/LoggerControllerImpl.java | 24 +- .../comms/io/connection/LoggerConnection.java | 4 +- .../connection/LoggerConnectionFactory.java | 6 +- .../io/connection/SSMLoggerConnection.java | 24 +- .../ecu/comms/io/protocol/LoggerProtocol.java | 4 +- .../comms/io/protocol/SSMLoggerProtocol.java | 22 +- .../ecu/comms/manager/QueryManager.java | 8 +- .../ecu/comms/manager/QueryManagerImpl.java | 52 +- .../comms/manager/TransmissionManager.java | 4 +- .../manager/TransmissionManagerImpl.java | 16 +- .../logger/ecu/comms/query/EcuInit.java | 2 +- .../ecu/comms/query/EcuInitCallback.java | 2 +- .../logger/ecu/comms/query/EcuQuery.java | 2 +- .../logger/ecu/comms/query/EcuQueryImpl.java | 10 +- .../logger/ecu/comms/query/ExternalQuery.java | 2 +- .../ecu/comms/query/ExternalQueryImpl.java | 8 +- .../logger/ecu/comms/query/Query.java | 11 + .../logger/ecu/comms/query/Response.java | 4 +- .../logger/ecu/comms/query/ResponseImpl.java | 4 +- .../logger/ecu/comms/query/SSMEcuInit.java | 6 +- .../logger/ecu/comms/reset/ResetManager.java | 2 +- .../ecu/comms/reset/ResetManagerImpl.java | 18 +- .../definition/ConvertorUpdateListener.java | 2 +- .../logger/ecu/definition/EcuAddress.java | 2 +- .../logger/ecu/definition/EcuAddressImpl.java | 12 +- .../logger/ecu/definition/EcuData.java | 2 +- .../ecu/definition/EcuDataConvertor.java | 2 +- .../logger/ecu/definition/EcuDataLoader.java | 6 +- .../ecu/definition/EcuDataLoaderImpl.java | 18 +- .../logger/ecu/definition/EcuDataType.java | 2 +- .../logger/ecu/definition/EcuDefinition.java | 2 +- .../ecu/definition/EcuDefinitionImpl.java | 4 +- .../EcuDerivedParameterConvertor.java | 2 +- .../EcuDerivedParameterConvertorImpl.java | 8 +- .../definition/EcuDerivedParameterImpl.java | 8 +- .../logger/ecu/definition/EcuParameter.java | 2 +- .../definition/EcuParameterConvertorImpl.java | 12 +- .../ecu/definition/EcuParameterImpl.java | 8 +- .../logger/ecu/definition/EcuSwitch.java | 2 +- .../definition/EcuSwitchConvertorImpl.java | 4 +- .../logger/ecu/definition/EcuSwitchImpl.java | 8 +- .../logger/ecu/definition/ExternalData.java | 2 +- .../ecu/definition/ExternalDataImpl.java | 10 +- .../logger/ecu/definition/LoggerData.java | 2 +- .../plugin/PluginFilenameFilter.java | 2 +- .../definition/xml/EcuDefinitionHandler.java | 8 +- .../xml/LoggerDefinitionHandler.java | 36 +- .../ecu/exception/ConfigurationException.java | 2 +- .../ecu/exception/FileLoggerException.java | 2 +- .../exception/InvalidResponseException.java | 2 +- .../ecu/exception/NotConnectedException.java | 2 +- .../ecu/exception/PortNotFoundException.java | 2 +- .../SerialCommunicationException.java | 2 +- .../UnsupportedPortTypeException.java | 2 +- .../UnsupportedProtocolException.java | 2 +- .../logger/ecu/external/ExternalDataItem.java | 2 +- .../ecu/external/ExternalDataSource.java | 4 +- .../external/ExternalDataSourceLoader.java | 2 +- .../ExternalDataSourceLoaderImpl.java | 8 +- .../external/GenericDataSourceManager.java | 6 +- .../logger/ecu/profile/UserProfile.java | 6 +- .../ecu/profile/UserProfileFileFilter.java | 4 +- .../logger/ecu/profile/UserProfileImpl.java | 18 +- .../logger/ecu/profile/UserProfileItem.java | 2 +- .../ecu/profile/UserProfileItemImpl.java | 2 +- .../logger/ecu/profile/UserProfileLoader.java | 2 +- .../ecu/profile/UserProfileLoaderImpl.java | 8 +- .../ecu/profile/xml/UserProfileHandler.java | 10 +- .../logger/ecu/ui/DataRegistrationBroker.java | 4 +- .../ecu/ui/DataRegistrationBrokerImpl.java | 10 +- .../logger/ecu/ui/EcuDataComparator.java | 4 +- .../logger/ecu/ui/MessageListener.java | 2 +- .../logger/ecu/ui/SerialPortComboBox.java | 8 +- .../logger/ecu/ui/StatusChangeListener.java | 2 +- .../logger/ecu/ui/StatusIndicator.java | 2 +- .../ecu/ui/handler/DataUpdateHandler.java | 6 +- .../ui/handler/DataUpdateHandlerManager.java | 4 +- .../handler/DataUpdateHandlerManagerImpl.java | 4 +- .../handler/dash/DashboardUpdateHandler.java | 12 +- .../logger/ecu/ui/handler/dash/Gauge.java | 2 +- .../ecu/ui/handler/dash/PlainGauge.java | 8 +- .../ecu/ui/handler/file/FileLogger.java | 2 +- .../FileLoggerControllerSwitchHandler.java | 2 +- .../FileLoggerControllerSwitchMonitor.java | 4 +- ...FileLoggerControllerSwitchMonitorImpl.java | 6 +- .../ecu/ui/handler/file/FileLoggerImpl.java | 10 +- .../ui/handler/file/FileUpdateHandler.java | 13 + .../handler/file/FileUpdateHandlerImpl.java | 16 +- .../ui/handler/graph/GraphUpdateHandler.java | 12 +- .../ecu/ui/handler/graph/SpringUtilities.java | 2 +- .../injector/InjectorUpdateHandler.java | 10 +- .../ecu/ui/handler/livedata/LiveDataRow.java | 6 +- .../handler/livedata/LiveDataTableModel.java | 4 +- .../livedata/LiveDataUpdateHandler.java | 10 +- .../ecu/ui/handler/maf/MafUpdateHandler.java | 10 +- .../ui/handler/table/TableUpdateHandler.java | 16 +- .../ecu/ui/paramlist/ParameterListTable.java | 6 +- .../ui/paramlist/ParameterListTableModel.java | 6 +- .../logger/ecu/ui/paramlist/ParameterRow.java | 6 +- .../ecu/ui/paramlist/UnitsComboBoxEditor.java | 6 +- .../ui/paramlist/UnitsComboBoxRenderer.java | 6 +- .../ecu/ui/playback/PlaybackManager.java | 2 +- .../ecu/ui/playback/PlaybackManagerImpl.java | 12 +- .../ecu/ui/swing/menubar/EcuLoggerMenu.java | 2 +- .../ui/swing/menubar/EcuLoggerMenuBar.java | 30 +- .../ui/swing/menubar/EcuLoggerMenuItem.java | 2 +- .../menubar/EcuLoggerRadioButtonMenuItem.java | 4 +- .../ui/swing/menubar/action/AboutAction.java | 4 +- .../swing/menubar/action/AbstractAction.java | 4 +- .../menubar/action/DisconnectAction.java | 4 +- .../ui/swing/menubar/action/ExitAction.java | 4 +- .../action/GenericPluginMenuAction.java | 10 +- .../menubar/action/LoadProfileAction.java | 8 +- .../LogFileAbsoluteTimestampAction.java | 4 +- .../action/LogFileControllerSwitchAction.java | 4 +- .../menubar/action/LogFileLocationAction.java | 8 +- .../menubar/action/ReloadProfileAction.java | 4 +- .../menubar/action/ResetConnectionAction.java | 4 +- .../swing/menubar/action/ResetEcuAction.java | 4 +- .../menubar/action/SaveProfileAction.java | 6 +- .../menubar/action/SaveProfileAsAction.java | 10 +- .../menubar/action/ToggleButtonAction.java | 4 +- .../ecu/ui/swing/menubar/util/FileHelper.java | 4 +- .../menubar/util/SelectionStateAdaptor.java | 4 +- .../menubar/util/UserProfileFileFilter.java | 4 +- .../logger/ecu/ui/tab/LoggerChartPanel.java | 6 +- .../romraider}/logger/ecu/ui/tab/Tab.java | 2 +- .../logger/ecu/ui/tab/TableFinder.java | 6 +- .../logger/ecu/ui/tab/XYTrendline.java | 2 +- .../ui/tab/injector/InjectorControlPanel.java | 28 +- .../ecu/ui/tab/injector/InjectorTab.java | 10 +- .../ecu/ui/tab/injector/InjectorTabImpl.java | 16 +- .../ecu/ui/tab/maf/MafControlPanel.java | 28 +- .../logger/ecu/ui/tab/maf/MafTab.java | 10 +- .../logger/ecu/ui/tab/maf/MafTabImpl.java | 16 +- .../generic/io/InnovateConnection.java | 2 +- .../generic/io/InnovateConnectionImpl.java | 26 +- .../io/InnovateConnectionProperties.java | 4 +- .../innovate/generic/io/InnovateRunner.java | 2 +- .../generic/io/InnovateRunnerImpl.java | 6 +- .../generic/plugin/DataConvertor.java | 2 +- .../innovate/generic/plugin/DataListener.java | 2 +- .../generic/plugin/InnovateSettings.java | 2 +- .../generic/plugin/InnovateSettingsImpl.java | 2 +- .../innovate/lc1/plugin/Lc1DataConvertor.java | 10 +- .../innovate/lc1/plugin/Lc1DataItem.java | 8 +- .../innovate/lc1/plugin/Lc1DataSource.java | 18 +- .../innovate/lm1/plugin/Lm1DataConvertor.java | 12 +- .../innovate/lm1/plugin/Lm1DataItem.java | 8 +- .../innovate/lm1/plugin/Lm1DataSource.java | 18 +- .../logger/utec/comm/PortRequestedDialog.java | 4 +- .../utec/comm/SerialConnectionException.java | 2 +- .../logger/utec/comm/SerialParameters.java | 2 +- .../comm/UtecSerialConnectionManager.java | 4 +- .../utec/commEvent/GeneralDataListener.java | 2 +- .../utec/commEvent/LoggerDataListener.java | 2 +- .../logger/utec/commEvent/LoggerEvent.java | 8 +- .../logger/utec/commEvent/TestUtecTimer.java | 2 +- .../utec/commEvent/UtecAFRListener.java | 2 +- .../logger/utec/commEvent/UtecTimerTask.java | 4 +- .../utec/commEvent/UtecTimerTaskExecute.java | 4 +- .../utec/commEvent/UtecTimerTaskListener.java | 2 +- .../utec/commEvent/UtecTimerTaskManager.java | 2 +- .../utec/commInterface/UtecInterface.java | 14 +- .../commInterface/UtecSerialListener.java | 6 +- .../romraider}/logger/utec/gui/JutecGUI.java | 18 +- .../logger/utec/gui/JutecToolBar.java | 12 +- .../logger/utec/gui/barGraph/BarGraph.java | 2 +- .../gui/bottomControl/BottomUtecControl.java | 8 +- .../logger/utec/gui/mapTabs/MapJPanel.java | 6 +- .../utec/gui/mapTabs/UtecDataManager.java | 20 +- .../logger/utec/gui/mapTabs/UtecJTable.java | 2 +- .../gui/mapTabs/UtecSelectionListener.java | 2 +- .../gui/mapTabs/UtecTableCellRenderer.java | 2 +- .../utec/gui/mapTabs/UtecTableModel.java | 2 +- .../mapTabs/UtecTableSelectionListener.java | 2 +- .../utec/gui/realtimeData/RealTimeData.java | 12 +- .../utec/impl/UtecTuningEntityImpl.java | 16 +- .../utec/mapData/GetMapFromUtecListener.java | 2 +- .../utec/mapData/SaveMapToUtecListener.java | 2 +- .../logger/utec/mapData/UtecMapData.java | 2 +- .../logger/utec/mapData/testMapChecksum.java | 2 +- .../utec/plugin/AfrExternalDataItem.java | 6 +- .../utec/plugin/KnockExternalDataItem.java | 6 +- .../utec/plugin/LoadExternalDataItem.java | 6 +- .../utec/plugin/PsiExternalDataItem.java | 6 +- .../logger/utec/plugin/UtecDataSource.java | 22 +- .../utec/properties/UtecProperties.java | 2 +- .../logger/utec/test/TestUtecMap.java | 4 +- .../logger/utec/tts/UtecSpeaker.java | 6 +- .../romraider}/maps/DataCell.java | 4 +- .../romraider}/maps/Rom.java | 10 +- .../romraider}/maps/RomID.java | 2 +- .../romraider}/maps/Scale.java | 2 +- .../romraider}/maps/Table.java | 12 +- .../romraider}/maps/Table1D.java | 4 +- .../romraider}/maps/Table2D.java | 12 +- .../romraider}/maps/Table3D.java | 18 +- .../romraider}/maps/TableSwitch.java | 6 +- .../romraider}/net/BrowserControl.java | 2 +- src/{enginuity => com/romraider}/net/URL.java | 2 +- .../newmaps/definition/AttributeParser.java | 6 +- .../definition/RomDefinitionHandler.java | 44 +- .../editor/DefinitionEditorFrame.form | 0 .../editor/DefinitionEditorFrame.java | 2 +- .../definition/editor/DefinitionPanel.form | 0 .../definition/editor/DefinitionPanel.java | 2 +- .../definition/editor/RomParameterPanel.form | 0 .../definition/editor/RomParameterPanel.java | 2 +- .../newmaps/definition/index/Index.java | 10 +- .../definition/index/IndexBuilder.java | 14 +- .../definition/index/IndexHandler.java | 4 +- .../newmaps/definition/index/IndexItem.java | 6 +- .../newmaps/definition/memmodel/MemModel.java | 4 +- .../newmaps/definition/memmodel/Segment.java | 2 +- .../definition/MemModelDefinitionHandler.java | 2 +- .../translate/DefinitionBuilder.java | 20 +- .../translate/FirstGenDefinitionHandler.java | 32 +- .../translate/FirstGenTranslator.java | 4 +- .../romraider}/newmaps/ecudata/AxisData.java | 6 +- .../romraider}/newmaps/ecudata/DataCell.java | 6 +- .../romraider}/newmaps/ecudata/ECUData.java | 2 +- .../newmaps/ecudata/ParameterData.java | 2 +- .../newmaps/ecudata/SwitchData.java | 2 +- .../newmaps/ecudata/SwitchGroupData.java | 2 +- .../newmaps/ecudata/Table2DData.java | 2 +- .../newmaps/ecudata/Table3DData.java | 8 +- .../romraider}/newmaps/ecudata/TableData.java | 4 +- .../newmaps/ecumetadata/AxisMetadata.java | 2 +- .../newmaps/ecumetadata/Category.java | 6 +- .../ecumetadata/ParameterMetadata.java | 2 +- .../newmaps/ecumetadata/RomMetadata.java | 6 +- .../romraider}/newmaps/ecumetadata/Scale.java | 4 +- .../ecumetadata/SourceDefAxisMetadata.java | 4 +- .../ecumetadata/SwitchGroupMetadata.java | 6 +- .../newmaps/ecumetadata/SwitchMetadata.java | 4 +- .../newmaps/ecumetadata/Table2DMetadata.java | 2 +- .../newmaps/ecumetadata/Table3DMetadata.java | 2 +- .../newmaps/ecumetadata/TableMetadata.java | 4 +- .../romraider}/newmaps/ecumetadata/Unit.java | 4 +- .../exception/DataPopulationException.java | 2 +- .../exception/RomNotFoundException.java | 2 +- .../exception/ScaleNotFoundException.java | 2 +- .../exception/TableNotFoundException.java | 2 +- .../exception/UnitNotFoundException.java | 2 +- .../romraider}/newmaps/swing/Frame3D.java | 28 +- .../newmaps/swing/RomRaiderFrame.java} | 4 +- .../newmaps/swing/RomRaiderJTable.java} | 28 +- .../newmaps/swing/TableSelectionModel.java | 2 +- .../romraider}/newmaps/swing/Test.java | 4 +- .../romraider}/newmaps/util/ECUDataUtil.java | 10 +- .../newmaps/xml/SaxParserFactory.java | 4 +- .../romraider}/newmaps/xml/XmlHelper.java | 4 +- .../ramtune/test/RamTuneTestApp.java | 42 +- .../command/executor/CommandExecutor.java | 2 +- .../command/executor/CommandExecutorImpl.java | 12 +- .../generator/AbstractCommandGenerator.java | 6 +- .../command/generator/CommandGenerator.java | 2 +- .../generator/EcuInitCommandGenerator.java | 4 +- .../generator/ReadCommandGenerator.java | 8 +- .../generator/WriteCommandGenerator.java | 6 +- .../RamTuneTestAppConnectionProperties.java | 4 +- .../romraider}/swing/CategoryTreeNode.java | 4 +- .../romraider}/swing/DebugPanel.java | 4 +- .../romraider}/swing/DefinitionManager.java | 4 +- .../romraider}/swing/ECUEditorMenuBar.java | 20 +- .../romraider}/swing/ECUEditorToolBar.java | 6 +- .../romraider}/swing/ECUImageFilter.java | 2 +- .../romraider}/swing/GenericFileFilter.java | 2 +- .../romraider}/swing/JProgressPane.java | 2 +- .../romraider}/swing/JTableChooser.java | 6 +- .../romraider}/swing/LookAndFeelManager.java | 2 +- .../romraider}/swing/MDIDesktopPane.java | 2 +- .../romraider}/swing/RomCellRenderer.java | 6 +- .../romraider}/swing/RomPropertyPanel.java | 4 +- .../romraider}/swing/RomTree.java | 4 +- .../romraider}/swing/RomTreeNode.java | 6 +- .../romraider}/swing/RomTreeRootNode.java | 2 +- .../romraider}/swing/SettingsForm.java | 8 +- .../swing/TableChooserTreeNode.java | 4 +- .../romraider}/swing/TableFrame.java | 4 +- .../romraider}/swing/TableMenuBar.java | 4 +- .../romraider}/swing/TablePropertyPanel.java | 4 +- .../romraider}/swing/TableToolBar.java | 12 +- .../romraider}/swing/TableTreeNode.java | 6 +- .../romraider}/swing/VTextIcon.java | 2 +- .../romraider}/swing/XMLFilter.java | 2 +- .../romraider}/tts/Speaker.java | 4 +- .../romraider}/util/AxisRange.java | 2 +- .../romraider}/util/ByteUtil.java | 4 +- .../romraider}/util/ColorScaler.java | 4 +- .../romraider}/util/FileAssociator.java | 4 +- .../romraider}/util/HexUtil.java | 2 +- .../romraider}/util/JEPUtil.java | 2 +- .../romraider}/util/LogManager.java | 2 +- .../romraider}/util/MD5Checksum.java | 2 +- .../romraider}/util/Nameable.java | 2 +- .../romraider}/util/NamedSet.java | 4 +- .../romraider}/util/ObjectCloner.java | 2 +- .../romraider}/util/ParamChecker.java | 2 +- .../romraider}/util/SaxParserFactory.java | 2 +- .../romraider}/util/SettingsManager.java | 6 +- .../romraider}/util/SettingsManagerImpl.java | 12 +- .../romraider}/util/TableAxisUtil.java | 6 +- .../util/ThreadCheckingRepaintManager.java | 2 +- .../romraider}/util/ThreadUtil.java | 2 +- .../exception/NameableNotFoundException.java | 2 +- .../romraider}/xml/DOMHelper.java | 2 +- .../romraider}/xml/DOMRomUnmarshaller.java | 36 +- .../romraider}/xml/DOMSettingsBuilder.java | 6 +- .../xml/DOMSettingsUnmarshaller.java | 6 +- .../romraider}/xml/RomAttributeParser.java | 22 +- .../romraider}/xml/RomNotFoundException.java | 2 +- .../xml/TableIsOmittedException.java | 2 +- .../xml/TableNotFoundException.java | 2 +- .../NewGUI/tools/EnginuityDataTools.java | 5 - .../logger/ecu/comms/query/Query.java | 11 - .../ui/handler/file/FileUpdateHandler.java | 13 - src/enginuity/swing/DefinitionManager.form | 147 ---- src/enginuity/swing/RomPropertyPanel.form | 308 -------- src/enginuity/swing/SettingsForm.form | 623 ---------------- src/enginuity/swing/TablePropertyPanel.form | 401 ---------- templates/install-linux.xml.template | 2 +- templates/install-windows.xml.template | 2 +- templates/l4j-installer.xml.template | 2 +- templates/l4j-package.xml.template | 2 +- templates/shortcutSpec-linux.xml.template | 2 +- templates/shortcutSpec-windows.xml.template | 2 +- version.properties | 2 +- 405 files changed, 2047 insertions(+), 3546 deletions(-) delete mode 100644 3rdparty/IzPack/installinfo/Summary.htm delete mode 100644 graphics/enginuity-splash.bmp rename graphics/{enginuity-ico.gif => romraider-ico.gif} (100%) rename graphics/{enginuity-ico.ico => romraider-ico.ico} (100%) rename src/{enginuity => com/romraider}/ECUEditor.java (94%) rename src/{enginuity => com/romraider}/ECUEditorManager.java (96%) rename src/{enginuity => com/romraider}/ECUExec.java (96%) rename src/{enginuity => com/romraider}/NewGUI/NewGUI.java (85%) rename src/{enginuity => com/romraider}/NewGUI/TestNewGUI.java (67%) rename src/{enginuity => com/romraider}/NewGUI/data/ApplicationStateManager.java (80%) rename src/{enginuity => com/romraider}/NewGUI/data/TableMetaData.java (94%) rename src/{enginuity => com/romraider}/NewGUI/desktop/EDesktopPane.java (95%) rename src/{enginuity => com/romraider}/NewGUI/etable/EInternalFrame.java (91%) rename src/{enginuity => com/romraider}/NewGUI/etable/ETable.java (98%) rename src/{enginuity => com/romraider}/NewGUI/etable/ETableCellRenderer.java (95%) rename src/{enginuity => com/romraider}/NewGUI/etable/ETableMenuBar.java (93%) rename src/{enginuity => com/romraider}/NewGUI/etable/ETableModel.java (97%) rename src/{enginuity => com/romraider}/NewGUI/etable/ETableRowLabel.java (90%) rename src/{enginuity => com/romraider}/NewGUI/etable/ETableSaveState.java (92%) rename src/{enginuity => com/romraider}/NewGUI/etable/ETableSelectionListener.java (84%) rename src/{enginuity => com/romraider}/NewGUI/etable/ETableToolBar.java (96%) rename src/{enginuity => com/romraider}/NewGUI/etable/dataJPanel/DataJPanel1DString.java (92%) rename src/{enginuity => com/romraider}/NewGUI/etable/dataJPanel/DataJPanel3DDouble.java (90%) rename src/{enginuity => com/romraider}/NewGUI/etable/dataJPanel/DataJPanelInterface.java (87%) rename src/{enginuity => com/romraider}/NewGUI/etable/text/RotatedLabel.java (94%) rename src/{enginuity => com/romraider}/NewGUI/interfaces/TuningEntity.java (92%) rename src/{enginuity => com/romraider}/NewGUI/interfaces/TuningEntityListener.java (90%) rename src/{enginuity => com/romraider}/NewGUI/tools/ClipBoardCopy.java (96%) rename src/{enginuity => com/romraider}/NewGUI/tools/FitData.java (95%) create mode 100644 src/com/romraider/NewGUI/tools/RomRaiderDataTools.java rename src/{enginuity => com/romraider}/NewGUI/tree/ETree.java (87%) rename src/{enginuity => com/romraider}/NewGUI/tree/ETreeCellRenderer.java (94%) rename src/{enginuity => com/romraider}/NewGUI/tree/ETreeNode.java (82%) rename src/{enginuity => com/romraider}/Settings.java (98%) rename src/{enginuity => com/romraider}/Version.java.template (98%) rename src/{enginuity => com/romraider}/io/connection/ConnectionProperties.java (93%) rename src/{enginuity => com/romraider}/io/connection/ConnectionPropertiesImpl.java (94%) rename src/{enginuity => com/romraider}/io/connection/EcuConnection.java (93%) rename src/{enginuity => com/romraider}/io/connection/EcuConnectionImpl.java (87%) rename src/{enginuity => com/romraider}/io/connection/SerialConnection.java (93%) rename src/{enginuity => com/romraider}/io/connection/SerialConnectionImpl.java (89%) rename src/{enginuity => com/romraider}/io/connection/TestSSMConnectionImpl.java (79%) rename src/{enginuity => com/romraider}/io/port/SerialPortDiscoverer.java (94%) rename src/{enginuity => com/romraider}/io/port/SerialPortDiscovererImpl.java (95%) rename src/{enginuity => com/romraider}/io/port/SerialPortRefreshListener.java (94%) rename src/{enginuity => com/romraider}/io/port/SerialPortRefresher.java (91%) rename src/{enginuity => com/romraider}/io/protocol/Protocol.java (88%) rename src/{enginuity => com/romraider}/io/protocol/ProtocolFactory.java (90%) rename src/{enginuity => com/romraider}/io/protocol/SSMChecksumCalculator.java (87%) rename src/{enginuity => com/romraider}/io/protocol/SSMProtocol.java (86%) rename src/{enginuity => com/romraider}/io/protocol/SSMResponseProcessor.java (77%) rename src/{enginuity => com/romraider}/logger/aem/io/AemConnection.java (62%) rename src/{enginuity => com/romraider}/logger/aem/io/AemConnectionImpl.java (82%) rename src/{enginuity => com/romraider}/logger/aem/io/AemConnectionProperties.java (79%) rename src/{enginuity => com/romraider}/logger/aem/io/AemRunner.java (61%) rename src/{enginuity => com/romraider}/logger/aem/io/AemRunnerImpl.java (79%) rename src/{enginuity => com/romraider}/logger/aem/plugin/AemConvertor.java (60%) rename src/{enginuity => com/romraider}/logger/aem/plugin/AemConvertorImpl.java (86%) rename src/{enginuity => com/romraider}/logger/aem/plugin/AemDataItem.java (82%) rename src/{enginuity => com/romraider}/logger/aem/plugin/AemDataSource.java (69%) rename src/{enginuity => com/romraider}/logger/aem/plugin/AemSettings.java (64%) rename src/{enginuity => com/romraider}/logger/aem/plugin/AemSettingsImpl.java (80%) rename src/{enginuity => com/romraider}/logger/aem/plugin/DataListener.java (59%) rename src/{enginuity => com/romraider}/logger/ecu/EcuLogger.java (88%) rename src/{enginuity => com/romraider}/logger/ecu/EcuLoggerExec.java (88%) rename src/{enginuity => com/romraider}/logger/ecu/comms/controller/LoggerController.java (80%) rename src/{enginuity => com/romraider}/logger/ecu/comms/controller/LoggerControllerImpl.java (78%) rename src/{enginuity => com/romraider}/logger/ecu/comms/io/connection/LoggerConnection.java (87%) rename src/{enginuity => com/romraider}/logger/ecu/comms/io/connection/LoggerConnectionFactory.java (88%) rename src/{enginuity => com/romraider}/logger/ecu/comms/io/connection/SSMLoggerConnection.java (78%) rename src/{enginuity => com/romraider}/logger/ecu/comms/io/protocol/LoggerProtocol.java (89%) rename src/{enginuity => com/romraider}/logger/ecu/comms/io/protocol/SSMLoggerProtocol.java (83%) rename src/{enginuity => com/romraider}/logger/ecu/comms/manager/QueryManager.java (80%) rename src/{enginuity => com/romraider}/logger/ecu/comms/manager/QueryManagerImpl.java (86%) rename src/{enginuity => com/romraider}/logger/ecu/comms/manager/TransmissionManager.java (87%) rename src/{enginuity => com/romraider}/logger/ecu/comms/manager/TransmissionManagerImpl.java (81%) rename src/{enginuity => com/romraider}/logger/ecu/comms/query/EcuInit.java (92%) rename src/{enginuity => com/romraider}/logger/ecu/comms/query/EcuInitCallback.java (92%) rename src/{enginuity => com/romraider}/logger/ecu/comms/query/EcuQuery.java (92%) rename src/{enginuity => com/romraider}/logger/ecu/comms/query/EcuQueryImpl.java (85%) rename src/{enginuity => com/romraider}/logger/ecu/comms/query/ExternalQuery.java (63%) rename src/{enginuity => com/romraider}/logger/ecu/comms/query/ExternalQueryImpl.java (67%) create mode 100644 src/com/romraider/logger/ecu/comms/query/Query.java rename src/{enginuity => com/romraider}/logger/ecu/comms/query/Response.java (67%) rename src/{enginuity => com/romraider}/logger/ecu/comms/query/ResponseImpl.java (88%) rename src/{enginuity => com/romraider}/logger/ecu/comms/query/SSMEcuInit.java (86%) rename src/{enginuity => com/romraider}/logger/ecu/comms/reset/ResetManager.java (53%) rename src/{enginuity => com/romraider}/logger/ecu/comms/reset/ResetManagerImpl.java (80%) rename src/{enginuity => com/romraider}/logger/ecu/definition/ConvertorUpdateListener.java (92%) rename src/{enginuity => com/romraider}/logger/ecu/definition/EcuAddress.java (69%) rename src/{enginuity => com/romraider}/logger/ecu/definition/EcuAddressImpl.java (85%) rename src/{enginuity => com/romraider}/logger/ecu/definition/EcuData.java (92%) rename src/{enginuity => com/romraider}/logger/ecu/definition/EcuDataConvertor.java (92%) rename src/{enginuity => com/romraider}/logger/ecu/definition/EcuDataLoader.java (87%) rename src/{enginuity => com/romraider}/logger/ecu/definition/EcuDataLoaderImpl.java (84%) rename src/{enginuity => com/romraider}/logger/ecu/definition/EcuDataType.java (92%) rename src/{enginuity => com/romraider}/logger/ecu/definition/EcuDefinition.java (65%) rename src/{enginuity => com/romraider}/logger/ecu/definition/EcuDefinitionImpl.java (80%) rename src/{enginuity => com/romraider}/logger/ecu/definition/EcuDerivedParameterConvertor.java (92%) rename src/{enginuity => com/romraider}/logger/ecu/definition/EcuDerivedParameterConvertorImpl.java (93%) rename src/{enginuity => com/romraider}/logger/ecu/definition/EcuDerivedParameterImpl.java (91%) rename src/{enginuity => com/romraider}/logger/ecu/definition/EcuParameter.java (92%) rename src/{enginuity => com/romraider}/logger/ecu/definition/EcuParameterConvertorImpl.java (86%) rename src/{enginuity => com/romraider}/logger/ecu/definition/EcuParameterImpl.java (90%) rename src/{enginuity => com/romraider}/logger/ecu/definition/EcuSwitch.java (92%) rename src/{enginuity => com/romraider}/logger/ecu/definition/EcuSwitchConvertorImpl.java (90%) rename src/{enginuity => com/romraider}/logger/ecu/definition/EcuSwitchImpl.java (89%) rename src/{enginuity => com/romraider}/logger/ecu/definition/ExternalData.java (52%) rename src/{enginuity => com/romraider}/logger/ecu/definition/ExternalDataImpl.java (84%) rename src/{enginuity => com/romraider}/logger/ecu/definition/LoggerData.java (83%) rename src/{enginuity => com/romraider}/logger/ecu/definition/plugin/PluginFilenameFilter.java (78%) rename src/{enginuity => com/romraider}/logger/ecu/definition/xml/EcuDefinitionHandler.java (88%) rename src/{enginuity => com/romraider}/logger/ecu/definition/xml/LoggerDefinitionHandler.java (90%) rename src/{enginuity => com/romraider}/logger/ecu/exception/ConfigurationException.java (93%) rename src/{enginuity => com/romraider}/logger/ecu/exception/FileLoggerException.java (93%) rename src/{enginuity => com/romraider}/logger/ecu/exception/InvalidResponseException.java (93%) rename src/{enginuity => com/romraider}/logger/ecu/exception/NotConnectedException.java (93%) rename src/{enginuity => com/romraider}/logger/ecu/exception/PortNotFoundException.java (93%) rename src/{enginuity => com/romraider}/logger/ecu/exception/SerialCommunicationException.java (93%) rename src/{enginuity => com/romraider}/logger/ecu/exception/UnsupportedPortTypeException.java (93%) rename src/{enginuity => com/romraider}/logger/ecu/exception/UnsupportedProtocolException.java (93%) rename src/{enginuity => com/romraider}/logger/ecu/external/ExternalDataItem.java (71%) rename src/{enginuity => com/romraider}/logger/ecu/external/ExternalDataSource.java (76%) rename src/{enginuity => com/romraider}/logger/ecu/external/ExternalDataSourceLoader.java (75%) rename src/{enginuity => com/romraider}/logger/ecu/external/ExternalDataSourceLoaderImpl.java (89%) rename src/{enginuity => com/romraider}/logger/ecu/external/GenericDataSourceManager.java (90%) rename src/{enginuity => com/romraider}/logger/ecu/profile/UserProfile.java (85%) rename src/{enginuity => com/romraider}/logger/ecu/profile/UserProfileFileFilter.java (90%) rename src/{enginuity => com/romraider}/logger/ecu/profile/UserProfileImpl.java (90%) rename src/{enginuity => com/romraider}/logger/ecu/profile/UserProfileItem.java (92%) rename src/{enginuity => com/romraider}/logger/ecu/profile/UserProfileItemImpl.java (94%) rename src/{enginuity => com/romraider}/logger/ecu/profile/UserProfileLoader.java (93%) rename src/{enginuity => com/romraider}/logger/ecu/profile/UserProfileLoaderImpl.java (86%) rename src/{enginuity => com/romraider}/logger/ecu/profile/xml/UserProfileHandler.java (89%) rename src/{enginuity => com/romraider}/logger/ecu/ui/DataRegistrationBroker.java (89%) rename src/{enginuity => com/romraider}/logger/ecu/ui/DataRegistrationBrokerImpl.java (88%) rename src/{enginuity => com/romraider}/logger/ecu/ui/EcuDataComparator.java (89%) rename src/{enginuity => com/romraider}/logger/ecu/ui/MessageListener.java (93%) rename src/{enginuity => com/romraider}/logger/ecu/ui/SerialPortComboBox.java (92%) rename src/{enginuity => com/romraider}/logger/ecu/ui/StatusChangeListener.java (93%) rename src/{enginuity => com/romraider}/logger/ecu/ui/StatusIndicator.java (96%) rename src/{enginuity => com/romraider}/logger/ecu/ui/handler/DataUpdateHandler.java (84%) rename src/{enginuity => com/romraider}/logger/ecu/ui/handler/DataUpdateHandlerManager.java (88%) rename src/{enginuity => com/romraider}/logger/ecu/ui/handler/DataUpdateHandlerManagerImpl.java (91%) rename src/{enginuity => com/romraider}/logger/ecu/ui/handler/dash/DashboardUpdateHandler.java (87%) rename src/{enginuity => com/romraider}/logger/ecu/ui/handler/dash/Gauge.java (92%) rename src/{enginuity => com/romraider}/logger/ecu/ui/handler/dash/PlainGauge.java (95%) rename src/{enginuity => com/romraider}/logger/ecu/ui/handler/file/FileLogger.java (92%) rename src/{enginuity => com/romraider}/logger/ecu/ui/handler/file/FileLoggerControllerSwitchHandler.java (64%) rename src/{enginuity => com/romraider}/logger/ecu/ui/handler/file/FileLoggerControllerSwitchMonitor.java (55%) rename src/{enginuity => com/romraider}/logger/ecu/ui/handler/file/FileLoggerControllerSwitchMonitorImpl.java (78%) rename src/{enginuity => com/romraider}/logger/ecu/ui/handler/file/FileLoggerImpl.java (91%) create mode 100644 src/com/romraider/logger/ecu/ui/handler/file/FileUpdateHandler.java rename src/{enginuity => com/romraider}/logger/ecu/ui/handler/file/FileUpdateHandlerImpl.java (90%) rename src/{enginuity => com/romraider}/logger/ecu/ui/handler/graph/GraphUpdateHandler.java (93%) rename src/{enginuity => com/romraider}/logger/ecu/ui/handler/graph/SpringUtilities.java (96%) rename src/{enginuity => com/romraider}/logger/ecu/ui/handler/injector/InjectorUpdateHandler.java (93%) rename src/{enginuity => com/romraider}/logger/ecu/ui/handler/livedata/LiveDataRow.java (89%) rename src/{enginuity => com/romraider}/logger/ecu/ui/handler/livedata/LiveDataTableModel.java (94%) rename src/{enginuity => com/romraider}/logger/ecu/ui/handler/livedata/LiveDataUpdateHandler.java (85%) rename src/{enginuity => com/romraider}/logger/ecu/ui/handler/maf/MafUpdateHandler.java (93%) rename src/{enginuity => com/romraider}/logger/ecu/ui/handler/table/TableUpdateHandler.java (87%) rename src/{enginuity => com/romraider}/logger/ecu/ui/paramlist/ParameterListTable.java (91%) rename src/{enginuity => com/romraider}/logger/ecu/ui/paramlist/ParameterListTableModel.java (93%) rename src/{enginuity => com/romraider}/logger/ecu/ui/paramlist/ParameterRow.java (86%) rename src/{enginuity => com/romraider}/logger/ecu/ui/paramlist/UnitsComboBoxEditor.java (91%) rename src/{enginuity => com/romraider}/logger/ecu/ui/paramlist/UnitsComboBoxRenderer.java (88%) rename src/{enginuity => com/romraider}/logger/ecu/ui/playback/PlaybackManager.java (77%) rename src/{enginuity => com/romraider}/logger/ecu/ui/playback/PlaybackManagerImpl.java (81%) rename src/{enginuity => com/romraider}/logger/ecu/ui/swing/menubar/EcuLoggerMenu.java (75%) rename src/{enginuity => com/romraider}/logger/ecu/ui/swing/menubar/EcuLoggerMenuBar.java (76%) rename src/{enginuity => com/romraider}/logger/ecu/ui/swing/menubar/EcuLoggerMenuItem.java (88%) rename src/{enginuity => com/romraider}/logger/ecu/ui/swing/menubar/EcuLoggerRadioButtonMenuItem.java (80%) rename src/{enginuity => com/romraider}/logger/ecu/ui/swing/menubar/action/AboutAction.java (79%) rename src/{enginuity => com/romraider}/logger/ecu/ui/swing/menubar/action/AbstractAction.java (87%) rename src/{enginuity => com/romraider}/logger/ecu/ui/swing/menubar/action/DisconnectAction.java (75%) rename src/{enginuity => com/romraider}/logger/ecu/ui/swing/menubar/action/ExitAction.java (73%) rename src/{enginuity => com/romraider}/logger/ecu/ui/swing/menubar/action/GenericPluginMenuAction.java (80%) rename src/{enginuity => com/romraider}/logger/ecu/ui/swing/menubar/action/LoadProfileAction.java (77%) rename src/{enginuity => com/romraider}/logger/ecu/ui/swing/menubar/action/LogFileAbsoluteTimestampAction.java (79%) rename src/{enginuity => com/romraider}/logger/ecu/ui/swing/menubar/action/LogFileControllerSwitchAction.java (79%) rename src/{enginuity => com/romraider}/logger/ecu/ui/swing/menubar/action/LogFileLocationAction.java (77%) rename src/{enginuity => com/romraider}/logger/ecu/ui/swing/menubar/action/ReloadProfileAction.java (78%) rename src/{enginuity => com/romraider}/logger/ecu/ui/swing/menubar/action/ResetConnectionAction.java (76%) rename src/{enginuity => com/romraider}/logger/ecu/ui/swing/menubar/action/ResetEcuAction.java (92%) rename src/{enginuity => com/romraider}/logger/ecu/ui/swing/menubar/action/SaveProfileAction.java (79%) rename src/{enginuity => com/romraider}/logger/ecu/ui/swing/menubar/action/SaveProfileAsAction.java (77%) rename src/{enginuity => com/romraider}/logger/ecu/ui/swing/menubar/action/ToggleButtonAction.java (86%) rename src/{enginuity => com/romraider}/logger/ecu/ui/swing/menubar/util/FileHelper.java (92%) rename src/{enginuity => com/romraider}/logger/ecu/ui/swing/menubar/util/SelectionStateAdaptor.java (84%) rename src/{enginuity => com/romraider}/logger/ecu/ui/swing/menubar/util/UserProfileFileFilter.java (76%) rename src/{enginuity => com/romraider}/logger/ecu/ui/tab/LoggerChartPanel.java (92%) rename src/{enginuity => com/romraider}/logger/ecu/ui/tab/Tab.java (71%) rename src/{enginuity => com/romraider}/logger/ecu/ui/tab/TableFinder.java (79%) rename src/{enginuity => com/romraider}/logger/ecu/ui/tab/XYTrendline.java (95%) rename src/{enginuity => com/romraider}/logger/ecu/ui/tab/injector/InjectorControlPanel.java (94%) rename src/{enginuity => com/romraider}/logger/ecu/ui/tab/injector/InjectorTab.java (69%) rename src/{enginuity => com/romraider}/logger/ecu/ui/tab/injector/InjectorTabImpl.java (85%) rename src/{enginuity => com/romraider}/logger/ecu/ui/tab/maf/MafControlPanel.java (93%) rename src/{enginuity => com/romraider}/logger/ecu/ui/tab/maf/MafTab.java (67%) rename src/{enginuity => com/romraider}/logger/ecu/ui/tab/maf/MafTabImpl.java (84%) rename src/{enginuity => com/romraider}/logger/innovate/generic/io/InnovateConnection.java (58%) rename src/{enginuity => com/romraider}/logger/innovate/generic/io/InnovateConnectionImpl.java (83%) rename src/{enginuity => com/romraider}/logger/innovate/generic/io/InnovateConnectionProperties.java (78%) rename src/{enginuity => com/romraider}/logger/innovate/generic/io/InnovateRunner.java (56%) rename src/{enginuity => com/romraider}/logger/innovate/generic/io/InnovateRunnerImpl.java (78%) rename src/{enginuity => com/romraider}/logger/innovate/generic/plugin/DataConvertor.java (54%) rename src/{enginuity => com/romraider}/logger/innovate/generic/plugin/DataListener.java (53%) rename src/{enginuity => com/romraider}/logger/innovate/generic/plugin/InnovateSettings.java (60%) rename src/{enginuity => com/romraider}/logger/innovate/generic/plugin/InnovateSettingsImpl.java (77%) rename src/{enginuity => com/romraider}/logger/innovate/lc1/plugin/Lc1DataConvertor.java (85%) rename src/{enginuity => com/romraider}/logger/innovate/lc1/plugin/Lc1DataItem.java (69%) rename src/{enginuity => com/romraider}/logger/innovate/lc1/plugin/Lc1DataSource.java (63%) rename src/{enginuity => com/romraider}/logger/innovate/lm1/plugin/Lm1DataConvertor.java (85%) rename src/{enginuity => com/romraider}/logger/innovate/lm1/plugin/Lm1DataItem.java (69%) rename src/{enginuity => com/romraider}/logger/innovate/lm1/plugin/Lm1DataSource.java (63%) rename src/{enginuity => com/romraider}/logger/utec/comm/PortRequestedDialog.java (96%) rename src/{enginuity => com/romraider}/logger/utec/comm/SerialConnectionException.java (93%) rename src/{enginuity => com/romraider}/logger/utec/comm/SerialParameters.java (99%) rename src/{enginuity => com/romraider}/logger/utec/comm/UtecSerialConnectionManager.java (98%) rename src/{enginuity => com/romraider}/logger/utec/commEvent/GeneralDataListener.java (65%) rename src/{enginuity => com/romraider}/logger/utec/commEvent/LoggerDataListener.java (90%) rename src/{enginuity => com/romraider}/logger/utec/commEvent/LoggerEvent.java (94%) rename src/{enginuity => com/romraider}/logger/utec/commEvent/TestUtecTimer.java (87%) rename src/{enginuity => com/romraider}/logger/utec/commEvent/UtecAFRListener.java (68%) rename src/{enginuity => com/romraider}/logger/utec/commEvent/UtecTimerTask.java (91%) rename src/{enginuity => com/romraider}/logger/utec/commEvent/UtecTimerTaskExecute.java (87%) rename src/{enginuity => com/romraider}/logger/utec/commEvent/UtecTimerTaskListener.java (65%) rename src/{enginuity => com/romraider}/logger/utec/commEvent/UtecTimerTaskManager.java (97%) rename src/{enginuity => com/romraider}/logger/utec/commInterface/UtecInterface.java (95%) rename src/{enginuity => com/romraider}/logger/utec/commInterface/UtecSerialListener.java (93%) rename src/{enginuity => com/romraider}/logger/utec/gui/JutecGUI.java (97%) rename src/{enginuity => com/romraider}/logger/utec/gui/JutecToolBar.java (92%) rename src/{enginuity => com/romraider}/logger/utec/gui/barGraph/BarGraph.java (96%) rename src/{enginuity => com/romraider}/logger/utec/gui/bottomControl/BottomUtecControl.java (96%) rename src/{enginuity => com/romraider}/logger/utec/gui/mapTabs/MapJPanel.java (95%) rename src/{enginuity => com/romraider}/logger/utec/gui/mapTabs/UtecDataManager.java (95%) rename src/{enginuity => com/romraider}/logger/utec/gui/mapTabs/UtecJTable.java (98%) rename src/{enginuity => com/romraider}/logger/utec/gui/mapTabs/UtecSelectionListener.java (92%) rename src/{enginuity => com/romraider}/logger/utec/gui/mapTabs/UtecTableCellRenderer.java (95%) rename src/{enginuity => com/romraider}/logger/utec/gui/mapTabs/UtecTableModel.java (97%) rename src/{enginuity => com/romraider}/logger/utec/gui/mapTabs/UtecTableSelectionListener.java (81%) rename src/{enginuity => com/romraider}/logger/utec/gui/realtimeData/RealTimeData.java (95%) rename src/{enginuity => com/romraider}/logger/utec/impl/UtecTuningEntityImpl.java (95%) rename src/{enginuity => com/romraider}/logger/utec/mapData/GetMapFromUtecListener.java (68%) rename src/{enginuity => com/romraider}/logger/utec/mapData/SaveMapToUtecListener.java (66%) rename src/{enginuity => com/romraider}/logger/utec/mapData/UtecMapData.java (99%) rename src/{enginuity => com/romraider}/logger/utec/mapData/testMapChecksum.java (82%) rename src/{enginuity => com/romraider}/logger/utec/plugin/AfrExternalDataItem.java (65%) rename src/{enginuity => com/romraider}/logger/utec/plugin/KnockExternalDataItem.java (65%) rename src/{enginuity => com/romraider}/logger/utec/plugin/LoadExternalDataItem.java (65%) rename src/{enginuity => com/romraider}/logger/utec/plugin/PsiExternalDataItem.java (65%) rename src/{enginuity => com/romraider}/logger/utec/plugin/UtecDataSource.java (60%) rename src/{enginuity => com/romraider}/logger/utec/properties/UtecProperties.java (95%) rename src/{enginuity => com/romraider}/logger/utec/test/TestUtecMap.java (69%) rename src/{enginuity => com/romraider}/logger/utec/tts/UtecSpeaker.java (80%) rename src/{enginuity => com/romraider}/maps/DataCell.java (96%) rename src/{enginuity => com/romraider}/maps/Rom.java (93%) rename src/{enginuity => com/romraider}/maps/RomID.java (95%) rename src/{enginuity => com/romraider}/maps/Scale.java (95%) rename src/{enginuity => com/romraider}/maps/Table.java (96%) rename src/{enginuity => com/romraider}/maps/Table1D.java (95%) rename src/{enginuity => com/romraider}/maps/Table2D.java (94%) rename src/{enginuity => com/romraider}/maps/Table3D.java (96%) rename src/{enginuity => com/romraider}/maps/TableSwitch.java (94%) rename src/{enginuity => com/romraider}/net/BrowserControl.java (96%) rename src/{enginuity => com/romraider}/net/URL.java (95%) rename src/{enginuity => com/romraider}/newmaps/definition/AttributeParser.java (92%) rename src/{enginuity => com/romraider}/newmaps/definition/RomDefinitionHandler.java (92%) rename src/{enginuity => com/romraider}/newmaps/definition/editor/DefinitionEditorFrame.form (100%) rename src/{enginuity => com/romraider}/newmaps/definition/editor/DefinitionEditorFrame.java (95%) rename src/{enginuity => com/romraider}/newmaps/definition/editor/DefinitionPanel.form (100%) rename src/{enginuity => com/romraider}/newmaps/definition/editor/DefinitionPanel.java (98%) rename src/{enginuity => com/romraider}/newmaps/definition/editor/RomParameterPanel.form (100%) rename src/{enginuity => com/romraider}/newmaps/definition/editor/RomParameterPanel.java (98%) rename src/{enginuity => com/romraider}/newmaps/definition/index/Index.java (90%) rename src/{enginuity => com/romraider}/newmaps/definition/index/IndexBuilder.java (91%) rename src/{enginuity => com/romraider}/newmaps/definition/index/IndexHandler.java (93%) rename src/{enginuity => com/romraider}/newmaps/definition/index/IndexItem.java (91%) rename src/{enginuity => com/romraider}/newmaps/definition/memmodel/MemModel.java (89%) rename src/{enginuity => com/romraider}/newmaps/definition/memmodel/Segment.java (93%) rename src/{enginuity => com/romraider}/newmaps/definition/memmodel/definition/MemModelDefinitionHandler.java (91%) rename src/{enginuity => com/romraider}/newmaps/definition/translate/DefinitionBuilder.java (95%) rename src/{enginuity => com/romraider}/newmaps/definition/translate/FirstGenDefinitionHandler.java (94%) rename src/{enginuity => com/romraider}/newmaps/definition/translate/FirstGenTranslator.java (94%) rename src/{enginuity => com/romraider}/newmaps/ecudata/AxisData.java (87%) rename src/{enginuity => com/romraider}/newmaps/ecudata/DataCell.java (91%) rename src/{enginuity => com/romraider}/newmaps/ecudata/ECUData.java (92%) rename src/{enginuity => com/romraider}/newmaps/ecudata/ParameterData.java (93%) rename src/{enginuity => com/romraider}/newmaps/ecudata/SwitchData.java (93%) rename src/{enginuity => com/romraider}/newmaps/ecudata/SwitchGroupData.java (93%) rename src/{enginuity => com/romraider}/newmaps/ecudata/Table2DData.java (93%) rename src/{enginuity => com/romraider}/newmaps/ecudata/Table3DData.java (87%) rename src/{enginuity => com/romraider}/newmaps/ecudata/TableData.java (89%) rename src/{enginuity => com/romraider}/newmaps/ecumetadata/AxisMetadata.java (93%) rename src/{enginuity => com/romraider}/newmaps/ecumetadata/Category.java (92%) rename src/{enginuity => com/romraider}/newmaps/ecumetadata/ParameterMetadata.java (93%) rename src/{enginuity => com/romraider}/newmaps/ecumetadata/RomMetadata.java (93%) rename src/{enginuity => com/romraider}/newmaps/ecumetadata/Scale.java (94%) rename src/{enginuity => com/romraider}/newmaps/ecumetadata/SourceDefAxisMetadata.java (87%) rename src/{enginuity => com/romraider}/newmaps/ecumetadata/SwitchGroupMetadata.java (91%) rename src/{enginuity => com/romraider}/newmaps/ecumetadata/SwitchMetadata.java (92%) rename src/{enginuity => com/romraider}/newmaps/ecumetadata/Table2DMetadata.java (94%) rename src/{enginuity => com/romraider}/newmaps/ecumetadata/Table3DMetadata.java (93%) rename src/{enginuity => com/romraider}/newmaps/ecumetadata/TableMetadata.java (93%) rename src/{enginuity => com/romraider}/newmaps/ecumetadata/Unit.java (93%) rename src/{enginuity => com/romraider}/newmaps/exception/DataPopulationException.java (93%) rename src/{enginuity => com/romraider}/newmaps/exception/RomNotFoundException.java (93%) rename src/{enginuity => com/romraider}/newmaps/exception/ScaleNotFoundException.java (93%) rename src/{enginuity => com/romraider}/newmaps/exception/TableNotFoundException.java (93%) rename src/{enginuity => com/romraider}/newmaps/exception/UnitNotFoundException.java (92%) rename src/{enginuity => com/romraider}/newmaps/swing/Frame3D.java (85%) rename src/{enginuity/newmaps/swing/EnginuityFrame.java => com/romraider/newmaps/swing/RomRaiderFrame.java} (87%) rename src/{enginuity/newmaps/swing/EnginuityJTable.java => com/romraider/newmaps/swing/RomRaiderJTable.java} (91%) rename src/{enginuity => com/romraider}/newmaps/swing/TableSelectionModel.java (94%) rename src/{enginuity => com/romraider}/newmaps/swing/Test.java (81%) rename src/{enginuity => com/romraider}/newmaps/util/ECUDataUtil.java (89%) rename src/{enginuity => com/romraider}/newmaps/xml/SaxParserFactory.java (89%) rename src/{enginuity => com/romraider}/newmaps/xml/XmlHelper.java (95%) rename src/{enginuity => com/romraider}/ramtune/test/RamTuneTestApp.java (93%) rename src/{enginuity => com/romraider}/ramtune/test/command/executor/CommandExecutor.java (60%) rename src/{enginuity => com/romraider}/ramtune/test/command/executor/CommandExecutorImpl.java (67%) rename src/{enginuity => com/romraider}/ramtune/test/command/generator/AbstractCommandGenerator.java (65%) rename src/{enginuity => com/romraider}/ramtune/test/command/generator/CommandGenerator.java (72%) rename src/{enginuity => com/romraider}/ramtune/test/command/generator/EcuInitCommandGenerator.java (81%) rename src/{enginuity => com/romraider}/ramtune/test/command/generator/ReadCommandGenerator.java (89%) rename src/{enginuity => com/romraider}/ramtune/test/command/generator/WriteCommandGenerator.java (76%) rename src/{enginuity => com/romraider}/ramtune/test/io/RamTuneTestAppConnectionProperties.java (88%) rename src/{enginuity => com/romraider}/swing/CategoryTreeNode.java (92%) rename src/{enginuity => com/romraider}/swing/DebugPanel.java (94%) rename src/{enginuity => com/romraider}/swing/DefinitionManager.java (97%) rename src/{enginuity => com/romraider}/swing/ECUEditorMenuBar.java (95%) rename src/{enginuity => com/romraider}/swing/ECUEditorToolBar.java (95%) rename src/{enginuity => com/romraider}/swing/ECUImageFilter.java (94%) rename src/{enginuity => com/romraider}/swing/GenericFileFilter.java (96%) rename src/{enginuity => com/romraider}/swing/JProgressPane.java (95%) rename src/{enginuity => com/romraider}/swing/JTableChooser.java (94%) rename src/{enginuity => com/romraider}/swing/LookAndFeelManager.java (98%) rename src/{enginuity => com/romraider}/swing/MDIDesktopPane.java (96%) rename src/{enginuity => com/romraider}/swing/RomCellRenderer.java (95%) rename src/{enginuity => com/romraider}/swing/RomPropertyPanel.java (97%) rename src/{enginuity => com/romraider}/swing/RomTree.java (95%) rename src/{enginuity => com/romraider}/swing/RomTreeNode.java (94%) rename src/{enginuity => com/romraider}/swing/RomTreeRootNode.java (94%) rename src/{enginuity => com/romraider}/swing/SettingsForm.java (97%) rename src/{enginuity => com/romraider}/swing/TableChooserTreeNode.java (91%) rename src/{enginuity => com/romraider}/swing/TableFrame.java (94%) rename src/{enginuity => com/romraider}/swing/TableMenuBar.java (96%) rename src/{enginuity => com/romraider}/swing/TablePropertyPanel.java (97%) rename src/{enginuity => com/romraider}/swing/TableToolBar.java (96%) rename src/{enginuity => com/romraider}/swing/TableTreeNode.java (91%) rename src/{enginuity => com/romraider}/swing/VTextIcon.java (97%) rename src/{enginuity => com/romraider}/swing/XMLFilter.java (96%) rename src/{enginuity => com/romraider}/tts/Speaker.java (90%) rename src/{enginuity => com/romraider}/util/AxisRange.java (94%) rename src/{enginuity => com/romraider}/util/ByteUtil.java (95%) rename src/{enginuity => com/romraider}/util/ColorScaler.java (93%) rename src/{enginuity => com/romraider}/util/FileAssociator.java (95%) rename src/{enginuity => com/romraider}/util/HexUtil.java (96%) rename src/{enginuity => com/romraider}/util/JEPUtil.java (95%) rename src/{enginuity => com/romraider}/util/LogManager.java (86%) rename src/{enginuity => com/romraider}/util/MD5Checksum.java (95%) rename src/{enginuity => com/romraider}/util/Nameable.java (94%) rename src/{enginuity => com/romraider}/util/NamedSet.java (94%) rename src/{enginuity => com/romraider}/util/ObjectCloner.java (96%) rename src/{enginuity => com/romraider}/util/ParamChecker.java (96%) rename src/{enginuity => com/romraider}/util/SaxParserFactory.java (96%) rename src/{enginuity => com/romraider}/util/SettingsManager.java (61%) rename src/{enginuity => com/romraider}/util/SettingsManagerImpl.java (83%) rename src/{enginuity => com/romraider}/util/TableAxisUtil.java (92%) rename src/{enginuity => com/romraider}/util/ThreadCheckingRepaintManager.java (95%) rename src/{enginuity => com/romraider}/util/ThreadUtil.java (95%) rename src/{enginuity => com/romraider}/util/exception/NameableNotFoundException.java (93%) rename src/{enginuity => com/romraider}/xml/DOMHelper.java (95%) rename src/{enginuity => com/romraider}/xml/DOMRomUnmarshaller.java (94%) rename src/{enginuity => com/romraider}/xml/DOMSettingsBuilder.java (97%) rename src/{enginuity => com/romraider}/xml/DOMSettingsUnmarshaller.java (96%) rename src/{enginuity => com/romraider}/xml/RomAttributeParser.java (87%) rename src/{enginuity => com/romraider}/xml/RomNotFoundException.java (75%) rename src/{enginuity => com/romraider}/xml/TableIsOmittedException.java (82%) rename src/{enginuity => com/romraider}/xml/TableNotFoundException.java (80%) delete mode 100644 src/enginuity/NewGUI/tools/EnginuityDataTools.java delete mode 100644 src/enginuity/logger/ecu/comms/query/Query.java delete mode 100644 src/enginuity/logger/ecu/ui/handler/file/FileUpdateHandler.java delete mode 100644 src/enginuity/swing/DefinitionManager.form delete mode 100644 src/enginuity/swing/RomPropertyPanel.form delete mode 100644 src/enginuity/swing/SettingsForm.form delete mode 100644 src/enginuity/swing/TablePropertyPanel.form diff --git a/.project b/.project index e3be4bfe..cd436ea9 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - enginuity + romraider diff --git a/3rdparty/IzPack/installinfo/Summary.htm b/3rdparty/IzPack/installinfo/Summary.htm deleted file mode 100644 index b0938308..00000000 --- a/3rdparty/IzPack/installinfo/Summary.htm +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - -

Installation Path

-
D:\work\eclipse_workspace\enginuity\3rdparty\IzPack

Chosen Installation Packs

-
Core
Utilities
- diff --git a/build.xml b/build.xml index 4d8edec2..367b14ed 100644 --- a/build.xml +++ b/build.xml @@ -212,7 +212,7 @@ - + @@ -253,7 +253,7 @@ - + ${javadoc.footer} diff --git a/graphics/enginuity-splash.bmp b/graphics/enginuity-splash.bmp deleted file mode 100644 index d3cac0fc6264b6080c6bd4afd0df0e6c7f1b0350..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 97608 zcmeIb3w#vUmFHib5#v@YJT3l>|1Bc%>6X=wT7xhxBi1cIAJl+snjqT}mV*Qc)G~4` z1u`IG$I*iX;YVy{GP8y_pIscBwP5@}+3dtPaV8Gq1c_{H$V_$&6DJ-|9tI~9Lw0v! z?96)i{O+mKw_Yu^Kz1BQeLqsy5TTEg*igCxt!jQG5&r-krTZ z*}~`4#a|&RqF|R;R$iJtcXy@ig>WsLPksO4wZMTOC^*^t?(F$l6^$H1Q2IpE{^+Mo2u_+9@7*Bv_Rc`~4-* zAoEp8%=t@XZBL4IbXT@^vLt)&?n=GY*cznH?#h!bycOGH)v#|%Rg(R)_N2U>?Ag98 zcKLl<5c|Uh!?5nn;YKXc_Va#-BqDaKH;mR!Uc+;SA)HTrUwjL&{}bO~pJVOzW%fCi zI27k2!(P-r*Vkoot)j`IHlC9s*%f0AXNs{Tp5(c>;`&T6&#}+sEd~R;Jxg*7%+q6O z5Q|s`?*T`*Rt+bcdA(uih+3?bh~6sS*Tr_qR)!%K?`gm?nd80SNQ7nCR>P18TQsob z)c=cb0lp%lUBRS%jcLqxa81^{9`arVF>-`dHvo^08-#T|#Rbt21g zme?Rs$y6L7e)8hK`Pksd!6V^%o%G}Q90-c;@g>;LK?kB4&S(h>qJ_V;N3<{R>&ou0 zxqkM~*or;&MEo^-&%uDy$!A73f6dn%$TF#e0k&E%7d1>C@M`BlBmp*HqH44XC)_QJD-EY*_ zz{#27>*cuwM+AIzlsUd;jxWJpts=_DZn%1c@^CUI(Sukk837^MJh~JSWRD`C&oFcb z*(zy`BCN}i*}zsD<2a)Nlk0Kg5Y~veLQlz_AQOTbthqVfJLFQFH44{yYu;9JL_9a; zul0FPd0PA%XO9KxTiF}1bb#&ec@SIhn}2~{TFAYxbnVY|68-}Z4 zy`1-YPcX$COJC64Z`Ao|@%SP;)o&DE@J@WQN3!~5$!D>bZc2?W!C5@ce#;mL>zwmW z9kYO?l5w-<`8ZQ3Id1m7631drwvkM?JHGbPaAE$M>6iPOY`49?;Fag&*5n!ugL8(^ z!5)7q&u8}x@5~%~B=#Yazq8H_SC22jK9}QYxw=~CMuK+RTRY{-z}H^!U>w0(*U4B4 ziIrJC>1W=u`D-r?x%q3>%e7$4Af~kS>|ve#1!*>vrMHucNSIkC`(94X{XVyV{TzKa_eA`?{n|D;bG=)7yVg=JzO}O^ zJ!T<^*3Pxy+tMSN92=&zOsoa0{lzLhX|NTw49j0^KG}S}<$Oy~TTOalx>b4b$+TxmSMDufjYD$Z$|`Bq(AtT}Nyi>m zxp#JYa=8Z4Yn6XiL=(?Fsiss_eLPuM8>l_E*jfU#Bv4ye8&6gx8|#}=J*hnnFB0FN zo7kSB`*#wTbyr4=2#s#NaO$jFLrYWYcgeMibV1Vv7sSsC(=}~Ht*4rwCf~f8_9qoR zUA!xhF2D$hWS%ORQe~+>UC>c56g(Y@MY>|c@e`CQs7f}~?`b&Pc&fRmmFP~dyL-`HBP&Dav}wY6@Gg}H?k*4Fy+5k>#yQ-kv(#c)od78%5l7-u!-+R*k7YZpVWC>Xb#ndQ|6LNE$4*H>qq2fE zVcMqCwx!Jr+vW6}-ojkQ`kl2{mzvYAy;dz|ISy;B?PZ&`*-Z6%XtykLNINX%wr5Xi z7;iOSKxurd@t+#M*6{h%{Mylwd4lB8{j1>VaDJ>JmWr7)$GT$=2-C#%ZYoUlaD2G> zc=ho({!UN<-=~ZHky!MBN{oWrOVP-iEsE?cq%bufYIT-{I2&>;tt8FGzJ*(>eZ6%~ zZ%``or0Uvm}-b02l2s`f|KezS1>?6!%PecSd?e!8{u{Q3tf z)9M{75r0QuB$OYipnFSPx`}9FS_*q>P)%GD(*!%w4_M90ZbQ#nCQgX%aj-BZ6Ob-3YV<4MYBpHvyY8XA+U#}tgUSGq;VlDd#} zta+kaN(-YUFHD2fc(R2@KMV%&%=ozkkBF1CV|~kbKpur**WoCPBt1 zj|BB-XL&l6`w^^5YQobjsJ$m8o>ku4k+Es9VTd)>`XP^P`5VWmhwe}r27I!7vqu^U zLgr)(jvs4+Zf*^>3EQwm?Ac}99%R6`T~97`vGqJ+kdK0{U+j=^dD3#&<{a%Uw@^_U z?Oc?W)`g97ywIX-Gq*cy;636!kUIEV$e{xZ`N?cxCOkq*5{s_2{>zu(%=Alju9KM+^#2=x_I9qc`gC(FD-^W z(X3hPux^2A>>t?0u_#KT)z2m5cnPN%Da&nkF2OdkywoAzBJXZ9@QkIx^*(T|`g}y} z_=W83C5npLV${;uOMgjMR7h4CJY+j!hbm9RsozIDHzvXJ3-PYXSoGE6qeRKhKzpFQ zAX8}m(V#!_WIUdHsXGd0Kc|_&(1_P;RcWgKNXLxF}PY5qfKAPf=KdE`L zas~1HXfPc}^1XC*2fa@Hm;32yx|i;cbXNvy4>ulH-dK(s&KtA=w+J6WJ`4G}EA1oS zvK_AA98=(U;5hJ+Xa6nUT*o0eX5#5s2kMd!ds(-?#&NJm8@grf+MpBbgloQ%Fz`AJXZ;`jRnat_dhZQ+X^Tc}R@(*frC+~Nlt9w5&k9KpYE8(_HR5{GbK2Jflk zH#l-Ei8nHG+{}9IM~<(XljE;p6~1yC2q>dopxK7xR@z>*0UDU?$$55avN_h@dkcpNaB64+sng=S+6ho&y*3jPBJ%u>rbn(jA zi9{2PY1Q#H*kuku7p`2K55c~&Z$SHSFMTi|UX>$Q>mK4Ni0yfqw5gSAobh_- zOst-ttSKkglcjf}dhD&ETS8B1jpAE`Q@zGH1+ML}o>L;*yxf<`wjRrg>K0I4niq@U z4ol`9IF0C_h+6d#k5|Vc6Z6yJx!Z~BqttWkiXE@6sz2O#D9-0I@_5uw#nWNxNdbXA^6RMkJ&aG36)cl1b}qi#xi^zN-$!S?y&z+bQlp;g#1z&~cD?U!eblP1cD1*% zIhXZnOkcf{{v8XiP_K73HUoSC>b226B(5-Gn0&L5v-Xc2yp# zKDU^j46ARf$J1ly7N1QVPXub8Y9Oi`pQ8Jdds4e87rr~*LwDRkb~d};`Q>Q&R`SLR z6~9Go^yJ%mDmWk2Go3uf1<$q3O4pcl_hmf}@4UUgKQ*Y9RjoRU?o*nD+SgXpli=(# zyjoSp^Lg)eZx>=mL?C!4s1VImQ~W_xKUs-r_F||e&I_3Ak&r)oxJWLZ zA56WN>Y>pkjmfU)Qo3`9@!98F=!_kwoxJw!;+Em<5vt{z_cZo2G^Oa;k}OP`&n43s zTWdMDxR9 zA-eO9<>|m+@cv2~Bb6eqYYS_J0(fGK@+S>NYV4o;e0}GR1pAZoEr%Nmle^W@&LU@;vBdgA_M^Sf_xE^YDN=>x!9BR^1;#M_;A z(|97UvYWCO$0-tSr02X(dgKwZbKTp8QK+C=d+Otfvs6I!ak~Ems-6D#qUJ$x!A>HB z3+8ZlN0oxX;PL9G8hU69RbkC;^$V9PW5}QIdl{sEHa_8A{SW7n&n^S17p9T583`r* zOEblLzXuD@AExJqFcK_&B2k#!M$fi|EaPyc=Ik|!1b^oumy3*58`@3^Z>#IfRhM0^ zZwrdn;ys17w3dBan(F1bD?ID!EV%D_0R1p}o~k06qH)o?sZFcMyKxr5T1z&rd%KQP z?l6)UqX^_U_1&n@w|b6+sD7dPbn!(;)mhI8jEbV{iV*EDr7_~jbH5t8F}WuNu1~~~ zn;$H|y&R5SL#kJSt9-Wn16ojyp8MO{zV5ZM1X6n%Dx%I7H|Oci8z}h5f12kfE+TXs zDu>C#G^JiNeKw9mE>?k&T;zBk#8&q=*6U->8u1=3)#p_`0Qd;qhHeeAglpQDqg}er zvA5vtpAb3LchZls7qMuH`~`Aoh(>VSbxpFhUV^FKt_RKE6+0wU6WO?$(tB)b55-@- zh^(HsXB&H|BAcR-6;X_NJsTgc>>{=dV`c2z;>LQsQ3v@z=}B-5Yu!uXhkJU+Sy&5> zD<4f9H+`I~GB|G_bHb9DmA3O4&LV5{H{BPdpFF3^2y2o z-Pi1nrJ`)%1C_@q-Y2`%TcfrS;W&5sNXs!~s&SmCk4+izJq-_93bw$}lw*0mMdddv z5)YyePG`;emX(=b_%>WDJK5%WXp8M# z?~j_Xr+cX1TUB33@8eQ!nCao-?Q@dnakduh537>q)bPaW0AOJq^3f zU#v9p#wfZu)znZBz5-(bG0NHMu|-gb#&@s!4Tp3Aq8BM==^bQv>)4@c^3@ZhGP``P z@j19gEYe#coO@byN^Q?#dr)H^#)IaMyhss)k1=}B!%HCgjK<~!)9 zwP2T-g~(=?)qc5pn&&W`Nj;Q7;y2q#egpC;W@Gic0Q>J4=b z6plqg<`DtmS{unD&yu0~MB?n?0OhidQ(T?t$xRyF*}0cB%r%pJ31u42ghqqln#QXX z)AR4the*X%(pw$O-WkQPPc>pc`3%PO&+KE@V?-psy+r;aTY+ca;f3BHe@@4mdd298 z>w>=biE7F9a}*shmRe}Gk}cDvX1pCC()ojo=>wH#6MWso6+-p=J*?v1ev{cR##Ng# z1Rip^T90^*b7G%Tu@>|-)}LEET>St&y_BNsAKK9D-_jKj#DREcYr(EUvyYIg{WuDI z1TglJ-Z!xL1nG6QFh46B_HPJY8QTzamB5k$JMBWQzXYT<)xSvh>F8bB%8%*aZ`53K z43ZxO%eo*Bdp1!XQB-q}&eF3J{&N4$)l)+wa*5WSn(UFVg6s+2?+_!xkz1pCmeiNf z`5(Uioowz&1t^N5dp*>fmcqU2vx&y~rzjf1b-9Yp-UljI#zX?&xLb7Ed_xMTE+wLG z$)PMat}xjavWJ3Q6gf50Q9!JOYlxRsT;uWTxa#X8g7%in-TGmoQLYj=n+j`VQQVuz zv>`>Sx&?9lLx!!3+98!`E40K)x;h?L*L{w(z3sBw58kk^;xi~a3cc!Fl2%T|POIO& z4*Pe6uB>!XZRI>5e6#I?0ggnF8Pk!7?3r-g+l3Kz9f1>c-LX;~NSDY+xBEom!y?gwMGyw=LHq+fKD64O@@(VKEE z%N=CXcm#^DkE>s=6aDV*r2ljX*VjXFemdGMfhD2r&DWSLVZ-4meP zyZ1VggZvsyuwQS5j7T+ zV!Lcy_jO^^GmUnoQ5sS>vi_6Wt{BGa{Vs}J{~b-?F^ju3)H|an7G&ef8{>qVhpb+d zyMCXFJls^@llR@goRVKx!)Kgq-WKy5C20;}2s&(~d^{*TT7xc>i7|Ks}S>wa3cqu8r3 z+0?_N&mi>#1GRXIk{&UH<@mr~BM$Ww2cyM^r2|wH+jV$%^^@c`Y)rpP-a4Y5DrOt; zA6W*bME)asm8(1?(gn!e!)H?*=aH3z%!PhRm8b4BoaJ8PxYPJ}WOedsddKnkmQ^Ko ziA~C8ImNh#G`B{DFom)rpm}_em$tmNUKOO$+ z`af&Ds^QO?zq+oxa5d6nJVh_K?(Hh1XCF%a-=}-N%r)31 z#;G6mYVqXVF}Ix`V_pF)N5RFja4p|L4SJJ!P61IDKey&Q6J!f~>#eLyozv1v%ZT24 zJ<2BK$00QmTwT96wL0mPTBgWmJse4nWtI4L$d4sA5$n4s*Dvj9C0fX)Z@#WuXt%5r z{&^SZe-<4!xkGV!f;wZQii^$lPR$v$nTZvZuh;!m^ItXZFY_)NLeRnDu?TvOC+Y3G z_!TCwENa+WBbHlPN%o_lie{+)4O^e zsN^=i!Xag+RyJXuYF{UFqW8N6^J~vH-=1=m`d=0-6E((};NQnr*Rp;3|Gmmi*27%q zW|cwFynP?VCjORc$G5&KCWHx7O9DH>V1^0drKB%!NkAmr-%_7pED3A~y4TARmOB*Z zeT7z8ZzpvvATaJhwX`C7& zYmfZJg+w9~*rqNMfyj~EWYVl@k*Ry>=!+D$OOl=~#+W3`Ei)d^YbX&}{mr~cJKkp$ z6zX+)3VMa>t81Tbm|uH!jkA0%svnB!@K?_K`%1mNOhHdXRmRbEHmmMadm>g%p7qkx zAQ}q71v`q5lpmR+%l|J!}L@*<>YDXFpuoV zotUBEq{JXR=EF+1b=nn=h-Jt>TtV4~&l-=9S->`mT*L8x6VA;oH=fA5zQnyXvT!18 zknZV)ZkflGPT^W?8tZ#$-oF-nBI4GhZQ~3_HmkTsT|+jxiCWL^CP#jFNr2dzb7Y>Q z%vnM?;w3~jtuJ@1Q?gjA?INz{-BUNV+)_ndI1gKH2zk`$(0j6(-fK*`ZvK5d*ztvRCH4GT&W}%maT!VDQKs_u5zHJGc({s_$7o zzMNrD&MrvT0M9zHz1Dlag{Y*0r#1}(*A#C{xz_zc1|3 zO8pug$X-o%h61$@RF3iFfXl~v(Cj6nxz?;ZO6iq)%GP^TzA`>u3I;^7E-# z^jitR1+V+{T4n-wvhl&l7<_LsUda1IiI$QnI~h+JR~5<{>o<60eM3R^KhR07MZO;E zxafO|5wi9AnN|%vy^JLJ>cGFelg+9pl}4@u|Fg+W)OzR&=aDBSR*ZzRlqNdrezEFv z>o4#6w@t6D^10SSUQ+~J8$!Os!R1apZaG8~I8WS?OBdh0{1>aXwBUS#M#Fe>J$!B7 z7TilV3|v*bwi8X}8KENViYV@-pHi7VE7urxG8(4QJ^Y*vjYnys==${p#-om1JR~FoAfIk!7A%|Asg+2>;(RAGJci! zXC+oCp6<+$2B{Z_Yq!h`iZbSUWlZi_Scw+0@eMg2U0E)h?$)F^6t2Ck;u>KQe9cOfNPZC9>E^yfS}j-Kv)Vv1w-4c)sEuG;)5&3m)j6}WqxU$ zTMl&^iH_x$Hovy&$UM$7zS#nAZ9c)DM;;z$pu<+{JS^fYj=w}kC#+S!OKmoufivX$ zbu`wK#teb&2Wf0dVQp7su21A%Al>Y*Enb`S&>UN}oU&@5`navUK-mxw34eTb?L(=r zHN2i@mAFsk+#*T^$CR6l*Yp0W#45wnog@i8{5fvSD|E{oSK7p1v!ov9^jT%y6H10h zg}@_s(s}3Bq-ztdy{+OJO{3^*vaE;39mPf>y*ym!E|eDugW5X(+{Ul8f2G|m5w3G_ zU3YL*4su~*@!$%#oRQdHwj;d3a+fGw0IK_Fggb0qQb4|Xv3on~62-NOut&`MPP5wV zT+>~f;9iVjR%I{s9jlTj@brL%xs0E+``3xixi#A3Y?{M<`KYIOpYgnL)=|K1DFo=# zQ82UWj^vFqtuo97^U9h!jkCnHRfeZ;wQ+scxUtYJbJoH&*U41hOXOOmkCUxTHr793 zTj#8exz1)4*T{9@e>S-bv3^H5TsOEXyxdvnicWnnuJdPQA8g*d-YJ232iM`c<)b%d zmE&AEsoY;4UOwbe=l*i!6S+?QUzOzOntP4#^IqDm%M{nj?!f@vcT%Ioa4)^DOY7~9 zE@^D+4UERZHhvY zClarY8(Zh>!A*`iTFJyL4xSb5w2ZmlM0CWb75bb7>~NHU@V}yWy)o^rfb2fqc=HgWGVL7 zXNobB$9(F6e687wp~#x95iVP;OZJx|YYBTIdB|YzZG3aR-CyTN57QG8Trf&DPO&w; zwc5kyW~lU7=Ou4jCM5H=GUxc_jMRO^M^(O?4?AbS%6o98lWQhJVikk@a#apo7y7o1 z%QfZjD57>#JHyvB{lTLDQ1w>h!nPkae6`4Jwe>7wuCrO?o?r!DnzWr1WO7&ebcLJToTyE!S$z!|EzKuu8l+%eVID*BUY}9TEQvZJ%X=Z<*7eo zf4ENDl*wS@Jz$wQq^e%MrAWQ2h{nm%2=+6Gtv%Saa&4XVl65U}5G)?r{>|60C&}kE z<S5JGY#3?g_{59@v$Y+MHr_e1k!)L9ple}@E%c2>+ ztEUBg0pC+aU#S0W^M`JJtHH}|U7K+2Z57w3BcFQ>Z#k_GdytFuhVjb$Pp`S8eaB7C z0y@NBFDck@)6dsAB`~iULXG>&N!R+Uav83}i@%h;P8DC;ecZU(*E9WUpR-swGbkolo&TGNmy9O%J|g3AiBslk-)D*IWxV_J|7zc!LbuG- zHm*Nw1c+g`R3YiY{cpqg)5tURKWz9-)GecHW3IDV#WiZKv&m_F*o9oI2iK2)u{F+u z(asjG*Zh2=Qv&mlLS6hhQtqwGl+#?-eQDi?v(;&GZHWW1$dhisD>BBusv2qVRH}!^kLiokzZ4HIVnEJge7qiNPTUfO) zJg)3mTxXcZ07B-v(6@Tpp2GP)XR&krq_KM1$r7i`CYvX|k7QnS$;|gXZsU4BaqZND zd24+ykY8Lq%`Nq$rM|z3esaMlYuqxrHsRXaDz4GWwYQwshhvzF_27E{x@nvCuX7gA z!Tm4f*GQ(_DS>$h*K;0O_hAoRrkv(_`Ewh+}c6HCZnYbze1`mfyd51anK zZ7XimOSvwNpiUR_s90qBG}lkjlb9%Y!mlxPJVEbA9gEp9*O}bo94M$`npIX>4SEfj zOR(HVb7n5cT+i@r&p$l#CZDrdIWs8Uy=mGTB~F=63ugx93vVL!oiaE1p0IIU?b}=E zmbuBsbs=%SeY#r;=aIxc)2F`?`Q!q(jINEj&Sn+YsJYH2r}csBT&$<4b@~2{#PvpJ zad7P^vwx$L>%ZIh;oF>=Ft6k?TrXMi+%4C7$YtXidqZazMb!n;5pOGqqO=DHL|H)eL+XwW#T5C~TsP(DFs`~pYCzj!}dvMHg^dW@T1tOtH zu~|ZOnr$IFm{g@MSQm_#Tvz$_PCq%b+2<^Ht}r5IQ!j4&wDToSnNE^fnvr?jQ>K}? zzQq!U+~j+@(5VOW*7~aGT=SBGjBx#U-qVGN3b!U*8*`n_Dy~s;olQ>b!;a=+J<+n_ zUv8Vxu@*90`@;_ms51Ry3CeOM^szhU=?+pPzne z=60X6;0Y@$*LM)tPMJ=Uv2yJtv)%V3NiCBGFq(;Lryk5(>&wNaCydYM7nQm->Dq*A zZ>zXQE7#s~S|4^H7wf4vw(0}7UAy^}k2wpTw9;|ND<6w`$h`6~NM)MKcxB$d5U);6 zm{)QcuE(m=%{4#aL}S8lJaUUw_mMdmul3)Te|GErTdm8L6ucDO!X#PJhA6m8`lvU<$*|q{BM~t-zbj+u!IV69tn^Kr|;4LI3}9SQX2Aw zjB-QWL7MOT8gYGx&so5k_(p@qbo{59#jQU|*-PTedo5fOY17^;aq79l_q>hkJA7X& zbj#eKxR&~IvFSdlt!TDeldg@q&Sn+YsJYH2r}crgT&yRqZ~VaK&aJO}+*xc~2VVL3 zau1nTKJMh&=c&t-(_D{HXNGHxoo;O<9{C9;BeCNq;@V>8j_{7+4WWA$cW(Wx%{K7P zS#|mqu{gi0&&oC4nnLf+y7{SwcoI=aHm>EZd|vBI)w#gln%CEX>T+X|aSf5nR14dn z8%%?0j!=kgqd0QS$gL4|{;eji-<)};&spqTeJv2kk?uDz||8m(M=%Q?9o-+FLey0vq=vDI1ZTpL@LyCkrM zgX{S|PhF;*h3oO^w8kNW%BO8uwPVeZk6Eo`3zt_f-+Hgj{v|7Djf##Ud6dC6$EvQ) z#34QPhZ{~do}@c60eZ6p#RysawQxPw`Z_u*z%@}FGUgdej5$WoN;UT!$zv-|O>v1T z6swe{Zz%udU-#81u5a>vow$C;=PY)vGw_Zv@r3b(X|rZK^*rQz!RD_Y^8HhxTjn7f z*SXmAxbcv0)-1OsU7K+2Z57vO<=R_L>%*?+V!dJPxT$peJ=+aeVQRPu>Hgi;0S4XzfIpR?u7tU}!ew~_Yezql?w|~u%jjw!M>yD_p!~U|wvhBpRrBF1Vu?oL! zE15pAv#R#?di=@--U>4kvU+3dG{2)JJJaN`DQ;FCo4$$LCFxsz%P8UyUtLg2QT5V5 zI+zZnL+#|DiRNM-6{9S&Xyn#=`$qciF}c3o_rvLL&HRGTSti0Y-;sUZ_&Raz)bj-g z*I)3xRp^%af{p83Y|BSp z-{K(?_Tbt}7t2|>9+%O%w`*};o4{nHb0e4 znLgoqM$PJEPkj?Tdp@B%GU)wrfq(Xwf?IG+`MtUVqik3Af!;_ty{pNLK9U7XgJ62F zm`l32l(?o+zVwC_RTq(>=m9$-9U}SE1-t zjZ%ds8jW-paqUqc1qt($sPohnz6)}i>oMz8QHSQ5-#z)t{39Fb%(GZRho6;liE5TFgV&tzARkcm@4&HN#6piAu`)KW-?aNiPVRFqRM`#Xzh%_jE zzGheN($!(rUj*xvp;msHe06b0@nCqcY*$%2Y?S#H4Rzep_j989-oD#t0IqQTR#vXT z_IPEP>>A~`f0zT;&-i|u1J~JYlD=i`TzgyP=Gt4%&UG%|iD+IGrdQ>O1} zjG#)3o%Ak!`n}x3+7t8+KJOUX&a}z8jcRyqiaE?>k)Ur`=>{WAzM7X3)$J5}fNCn? zbhx7|UB2|1j@2K&{bzkY?Hf{5Yp(bDemi~P*=zE>U zfZievKwkDkGu$#iRJ94S*=&LhBJ;RGwas#C(zS`d_O^;^wEAmrIjs-7kc;);y1kzm za}~{o;<}%>_9&3bG#9w`)U~7^a#pU#s8e&@fc#uUMdgUD!&|KuP}W18cN+uHRcEtJ z+l~zO)hZLdFvB(8B2Dkmq&H}urZ?a)wa#ztw;fYvm;SQerei=X1HZunsyIK3A5R3vdVmqxE{MU<~o~IT%+bXo7}{$ zXReR+Z*Z0U;r&*BOB*wDI*}2YIr{pk>qt{CxjWTSE0lDn*$ zm3>M!-G8iq&{iwfai-6j!4^C5=3^AR=MX$opRYI)HZyRUJe-+l=KLK0r(CpG2?r=@ zzQ!mQZyixogY0B+GMp?goxkjcvX4*e{|uddKP68Ms=@Wjz6z7;r-`#gvwl16LW-U1 zU*-Kae{HE-&t=4{mFq>9yJdcB<2sv7cCM+m*=|j`Hs(5;Ra~RyI-8uoM!pT$8`Xuj|qnmU;hjOWj>|8&NZl z0$IBKm}3u&>isJA##=a%!QQJpKQ!U9JFb3}pt`$qkm6zTuw}+F-!kJm-*pBR-$$t2 z;JYEB%SR$ou8Y{qvIv*!Ncy_SHB=TQuj}|o$48c4SGuHhNpe{!4GMa+qpZJlAUv?6 z|2v9mcxt9P-{ksh`HN<(o&E3m7g8R}v-;~_u# zlWVt}s?)}Gw|a|?uiCe%{VuEgXDl@@-F&S7m$q6TxskY5`A16zyA5rE&jbAH(A6n= znjk`bJjyv=XMDr}&8s6HEnQo>fl9~HTd8zY`9%5?9iQmvp>ik6u3nV8dk?5`uy?c< zf1|x4R8IHi_pKm*d~4rzeX+iL^2fV6u2?;-ziwc|!2XP{W~$+>EnHu|c6RY)u0pi$ zoBMx~wb!q2?N8TUzqZsRaT#%)r{imI-FKy1ipa>*{`$Am*Uoaw6km1^>5@2vxc0Qk zD)T+6t=GdQU7P0G%POwX&b61E)`#Pli}i-_+?q%Gzf0FhXL%(2NG1;15co|0h)V)n zKniv7Cz62gcWM$j&Gndd+PLO-HGg{5Pu3;3TJ^SXf5ar$Fn+pjw7+1$y0&z)wyV3c zu=aM0Rn2hSMZaZ%-yV&{+L3K8Fy_HeGuNdbr2?`$uCQ`#Qq4^7BBGh)GrcJJ#3xFO z;^nTs`zY7(NBuwRJE**J{wFWFJ=y;XMM*!UydK9N+FPIL<$TDg>5FFddGPVp^uyB^ z&G=^3+x4|g>s!~izFqI8(ZRL9c!n1lf09pJtDXvu6nRCjv&hDEHk%w=k5ik;br!2! zTxXG+xb=qdlQl#Aul4VA6+72EDZX&a>~wMcsHZNL(_D{Pr{daQg8Scx)l=wU|4-I^ zpgq0STK{uvh--7i6}X;0U|qZOE?Cb|3TLoS(fcROlh2@E45K&HAF3{=dyT|(fJSr( z*Ed8~YqFEKCYkL|EMt#-=ir@#%3H%%Gufkx>@&T7MRoMA?eGuD;5Wfsk_GJ7hEO;(v-`WMaU8?!d%I-6BoV?+*&kxg#m)|0nebD;kh{g1ke zo$E)*54&X^b#R?b40-BeInDK$b(&n`H_~{-(<9+4Hg#+tyvtgDGVw@wgSrQ882@F} zG2+^~mh0nDTRMX+%}2j2Lch-PWZX|&)33P**QUqzWjuCihsia?A`*#Mxn{DD^&T_X zhUczO9{WJwcZg?j49b6+$yN)~h(KPWtwv3M{bpfb>As4^mphAt^kn>z2A|y47DVy1cK{EwlJ?YkhAjuH8~rnP2)B(^=$}(X|QJ-d1sq zR<6C}v_2feT&xGzBNUwuxeB=6Xp*xr0H5xb8S>;ho1B&F>~%7YXXuH5rh0xy~TvIHP zAv?phjzq*`gKHGT*oaCHjeLw^4%|%y*Y~O^_SNjE5qUG!8Lo?n*{XH3oW;t}^y%wn ze{-%=V%@CAi0fsV>nu`sG8WJ3yV9*`-7IT;Z_dQI=9aR`{L&8&-7>m1lj|&2ag7$P zv&d9qW7SFhIQoo+ zhH1nSKPQu}%WL1Y-Cn!q)-aYPz_oilpOqu#80#{#$9(Z+0tt~Nbv~!Z7gB7Kd8vQPx)(*4W?I`r6Lo7;7p)9?<$shqh#OQ zmuuI}c9w(wgMR79O`qOZO6x~lM?U&q($W)rb4P3vY`>nkGmiCLGF zRpyrkbgp^Wq-ztdy{+OJtz3J{X?-|?xma%)(^}3@uggva=AH{bXYtn~6koVySjxnO zzLqA?gUcqTxgM)d=K4UeJ2o8mDb;x`(e}HyTD6WU>qOrb@z?q*9knX!)f*rN1L|!H zl<5;Y{m~dAk@)Fw9maAXAA%PeaE_0-_I;Fm_FC>enp}fyN8j;oqSC93_P*AOIJ<)S zk)SxGqG?Q_z*pz@ol*Y%K<`j*Bn+#5Q}QhJ4f{%+#mZ16#VXG(a7y%*LPm29sh2&Z zt|zW{W#}hQJlCy>b;)^DMC?CX<(9JA^veRW$wNlh#$0E!ifhzdXOq+V&|0}z53XM$ zZ#PQ)LVK}u4WDjb&vTGMUHn;^IOD0y&f(Z~GS@@F3i{6f2x$u|FY=~ieJN&@`=N=5!k%TRSeX1Ep z6ra&@;TmroO;v6g)>UfO zS3@#hnoyryALv}Gc-g}yC)e4m;uSV5Qr;u~kW!2ZVe|Ni`>ycH@g+G&d&(y|%dk?N{*Js@B%3m)=23zbLnR8|i zMc5RFD6ajHGV<5(*sAYHY@1w1J{plI+a%kJM&u3+W&OBlzK2w7a<|F`BF~MOoBNg0 zx5RxMEaz>O-Tk=+Us9l@a$ZBIaqM8Kp47y<{Bc+zW&*{Ems~aU|t7Rzhv%A zifC$`QqRu)$B4+$uSMmxQiS1_d3G-9-g> zBddOKmzO?h6Rt(;$g1nsKepLkcUfH9hTp*}aMk*Y?a;+F;_WzAt`E!^od>SziCsF1 z6pIuaizE^uw#_?_h(;o771@**A)jqVBTJFZ)}CA4g9P2;uR-iBy&aZ$^d`A5(Zcku z-i|xdw_-n&d9$yrZK`b|+HA$jP(#uGi2Ucd_Vv$J{bk9)f)3?}`4`q2z;)6o^=#Fe z3h3fCU7GiA(O#D(Y@@g~8~*Z&x07y*ScYpfjDnf}=3&#bRhnz|P1&rn*GSi`NweNC zRAW~Ezk z%+UvU?XZ!K<;?WmbO#=10LUk)o{mo#Dwi5uu>R(O^xL&BFR&JHcAx;)>15uqg3p!w z=PK)3Ojphn4?9e6t2ZN>Yn@UrFZf%qC4VmWaAnGp1TJG{L5U$?vU@jCv`b$=#!+otEYPXCl$77`J~EMGN$ zwf#m{y^!H^q=KHk+1sGwkfHJeb6%U%6^}(}d`KRZAl-3Xl+9uSe3F3febva5ai9ZpF|aE<(X zs4r}89O!Y_2N~8;5$#DmO=Dh7BaNZ517&B*S60%~GR!qHeay9)7qQ%>QCUBDZHyUF zg(4EOCrO^0?nIhi`xZs*Ehe#w+)OkAmbnPg9X-ovTk`$4mTq9XwkHSLzSvcJ{oA#= z{HW%05uxaFk-x3cYiKI@cI^*hl||gI9FCt*TyHL+=)tDL+$QtX9?9xy~v#A?uSIm$lq5u#MtV zXVF|Bf(83d3CwH4&=&V3ZW!2_RSsOQT<=|*UAM0Luj?LYzw8eC+N(ZA>&;vT|5{M@ z`mF=EJL-iF?px+Zo^CvE86PqfK2SDVRuN0Z27~a|b$+9aA`vUu=tHW}s?vx207cpq zjc|U1qU}+1Jj#_RaQLZ*BS3mVq`JXW~)A>}&smXyizR zJ>Cyfbf$IAzSdiM_R88O*h{0aT-r3(e0<3FXR%6gOYWx7sgcl|Ewfq|X2v}Y6(0zXhGWr{u@QRH2cBG{yMFV%$Y!?rPK}C3xF2cK z%{@uP+f>N^Vhjl)?@V-J=1sJZPOHenJRjiqiR#j|z8eg6WGf=zgvg^2so*wiSxM_x zzLdPP<|AtF>CL&dYttF7SFUezZ~2AVzmNT|%71EPvS+V!Nv!-o^?yN85A(&py*6Bl zGi{*FOM3RoZ%_tjVcWO1e6h>D{&S>>{Wbrpq>5=gteSnTi|a|Sp05$zEnA6e#HaT1 zv+&O>aR_*|uje^Paa-X3y$Qqv+2r5_K2Dz1Tf(}P)E)63YCmz?ygRJxZX9^5?q}hh zD$AFOu8gAIOB=Qk*LJDzk`#OOj)I!Dg>4Hn&w&xw#UtT-;#%EtM1&onNaPv^*?j*| zd2J$_;}PyhvgcM&39&7Ho4vP+yoqcp-Jn@Ycar7Ey`Dy_-b}fZ>wi=~$E3OGy9i`Nfg`Qn~Ub#%$yL@v@FR) zlMF>Lw_bs>f_(J{Ks99+=}9v684Mg&J{4@U?p7&AWhtMxk_jC0#G{=gpXzI{cXrCLht(4+UvibtT4}$)%9!B?6F6Jd>%j} z$!O`Oe^33rdUx|FWv#Qef%N7m|2`Qrmes1Rm+GxtXO)|f^<3xY);}}w(!evWa=XbE zntNwpucyp217F@`<@)i&L&U6G*E0i!+kPGf*FRYQ4bp`2c_Q0cnm+aYP1|S<*8MR( zDf7MMpZCxQ%aSS!a5epo7wmgH@ih;*?~`q)(=bjo7o3nn_J2gzUu>H{wtfjuBj<=QX=3eC$!ngSiij{Ass2tOoxeXEJt0@Y(4(~qW z-VW^Zm-M8-bf$ED3!HZLr&Vd&TmKPtm4Yn$YR&a<9FYOMsI&C9ZLh@^^y@kn?O*I7 zoo)TC#ZCD|SSuR$s*&&X%V~0+DQmR!2hDR}xZ1nE^{pRQHZo&lSe5>Kl8+JU9z$*d z)^nXdSP!bd?kez_M@=uXGvF=rbs}(c<~|<1p*fLF?xBJI+D`p5^Yb@!E3_K1AC>H|4m|uSBNXqgc*>r1I2?>5r0D`06D_aXLWnWUyS3=@`=!J@DNb zU)Z@fH5?ySUQ*ie`w8q97l|EY-B{lv!QpE1+sdmy+&QC0Yt`q;4ArvG;x8Gl?(1Yb z?9yY^!Rt7yKE9l0dwkjPtk1R1@oU1k(p;oO<}2$zPh8*bDk}Cd?}~|R_U}mE+VsiB z?CbTKh3eSL{G&ng*YtO$I2F4@-E*W^#P2IMJ+`w4nYp{3iANBV=(q%TZ@3_5g8Mis z{>HQ-T`f_W!pu2)sSoO*{j}sD0$NKJ$@l{B;me^seZN^(S z9M{^`(wnxdza{P7mSYw7a=m1!zo>P5DahwX%y;+ejVC-M))%#oZ8s~<&916sZgQM& z{#*;V-s>u_hF=Y{hsE`Byd6UpU~QV8>>W#1yqd@i28n7aqoG(d7R^K=0UFmgU$HH5 zw&Nb8^4Jt>TRgWA?#;RIuD(COV_%u_)i_6p>Fel8__DeJyzlJQdG{yqE^hn+=}2bm zi`Z=a#@O_ejaC9>x+*!ge;Ex`CC??ieWSkwakae^wPy2uEIn3zu(GH%*Q-crUR829 zJ~rFATMxU(Y6)msn;y%0v^S)3w;x;lWy?bp_aKh87tQs##Hr@tIA=exh4aIf@lhDd zKC7JQ7z{ibB%e*iABjbe;;p`U@YvLMo0H+1dyqOBfoDZgRO|nEBLf$^H}_y)D91U# zOkd|)V$i#?LG{R-`xCKfhsv|vo?4jRlR8oDJT@TZMD?BqJ9`&0x2K^Zs;>;A^h8m1 ztqa>$*ZWJfml<2yX$|*(IttE&vKKzj3Tx?ojC7ZQudPl!*7=E8Z{6-frrG{<0Ayw> z+E4tqmM>6D|B$O#xgLN2CTgdhYmkk;qd%JFoCvagWtLdPNw&lzLU<0}?A!S)5dP`= zBlM;cJjt-cC?l#VvK}n!N~9{;TMfr2f6ph{Qj;goT&#@#Ix!yCtLy36>Q>}qC$IL4 z*TnXJtn#w@Y*fE$<|aVb->m=9z>g_|;VjP#NF4HOOONQ{tz!+sbviIe{u<=~^&Ml; zA>4I@&&K^3cx=v$SmSK#{dMqdE#|W}wq>&3&AzOm_nsMuK;W&zsYF-hXb9*1nc{_Q zleNF^1wG8gaQxw}XSY1uF|*j*d(>o0oXy!0W*Zb+3nCToHBR2GTY>6ugs7(X zu7+Z9JiCJ{eMbS_Ncdjhak6X>uAim*J8r5U?mAO^rkJ^Snts3cy+*a%70Ax@>F{X_ z*Wx*|e?RTnFS@wamfDhj^4LT+{tg7s6eGs2;}{$HzOch*b37uWN0?*%AIpV%y;P>G zEXy){U*n@^(Aw3zgv(?1$Md60Rb;)V;r&Ima4{TzmhJ^TyTx5J*Qc5nrr&#e&*$Zn ziEmJB@ePlnxy~gA(;d4wg1xsEt|NKMV}orf$YYmBGFcHCwdzBZZH-3Yw>8~NG4nk3 ze=EsL6#sk<%roeHm-Op;!NKr~%C5>YVeT(hCEtrj*1IipUCLY>um0yd{_m&$`3`q! z?G%6Q%v$DJ!#gX-_P>z$@xa>@IlIf6ZQ`%T&U4V6-cXgw-%Y-~!ZmV;X~ZI`3J;v{m*xtZz;9h6Q2B|esLPj^D^=Fz{?&~gY)0CQznf*zq|8Na~;XU)00vT z1pOtki0VC>WQXw!bRe5!ZDAYtBY70bHEN3IilSF?SF6X_wR%K);2{PAY2axMuPbz{s_G_n7KwSTaztp zTVoT@%kw&35x(`e)0fXNLSg*cQlLFJQq~oxyZGUx^3|~jeD(XY zYRo_d`RYY&i_-7cGNX2^dw;mEH>38wyzlRI`-N+MORI`SEI#`*J)>}%#vf^)9SKlw zgxR*z&GCu-|GZ4ZqFL8|dp`YM68)+p@-WH3V5pqlHszx7~j{(7oRwZH|nfaZEp8^0qhE7_78!97U)dQ8}4TD-TNaJ%p3IS@XF znZ}hNS-IjQLB&@RgIp=N){tk#R&qp9tuT3}J; zxm|U?ma=Nx({+$dxsfx(_R$dCTi0G2j2F=Feub3pE+c9|w|v{ZHxaFVpOl_fV5Zvx zM~h>`bbbjubwtGq9;b7Q28<=QBA4fyw(NxS&(Z`_asRsiz5_O8|sTP=|7En;zxL(*+ zRhv})GwHXIJro$FaU++M91ZRy79D;&FGA4^E%Ot@nG(*#E!0C)kq5;d#PlW674*L2 z(a=ypJT1aE{qi8sRe(@2t9KqOb-RnQ=BSOEijoa;LSB^Fta1JaU+9)UBvc?VjFDkRCJRs zCc>rIe_g%3puJ$HNpv|m^wS~49vx;xoy?;r2Bw&vYJo{_f$Ur_Y%8qcH-Fmi*5FP% zu}zt6cJSUK+D8W8%8X0ipLjE`d&?)D}U%M zFc#Mf+dkCFy-4K#+HsHF(vy5NfH5SmD!M_qwOm4ZL8cjZb>P`SG-4Ode1Pexe&QcG zd++4_kIgk|e!7vf+A@A*C&d*qI!gI&^4>?ue~*MlLPWV)Fefw*26mDsM;?W1tBCHM z%6&{-qu$XL7@upfy*DL(I~(0r(k;^}GSNiSyJMqIH@uVQ>6GrN7C;N+#x*40Z2odw zzrzDDH%HSHn^>X~$_!H8o7ZrrTWW|!&Q-tJJk{z`E%0u%fKZofUANbF$HsnBi)hr} z6_H;jrijk9g{R~uqXmS%iRs$gFdRQ^z6(G!IKP+rhXUQPtCQ;e7w>2+H8I<#r2i0F Xz)9oO{8S4}wZK#hOtrv!xdr|oWv--k diff --git a/graphics/enginuity-ico.gif b/graphics/romraider-ico.gif similarity index 100% rename from graphics/enginuity-ico.gif rename to graphics/romraider-ico.gif diff --git a/graphics/enginuity-ico.ico b/graphics/romraider-ico.ico similarity index 100% rename from graphics/enginuity-ico.ico rename to graphics/romraider-ico.ico diff --git a/license.txt b/license.txt index be7bbc92..0f8e0173 100644 --- a/license.txt +++ b/license.txt @@ -1,346 +1,346 @@ -GNU GENERAL PUBLIC LICENSE -Version 2, June 1991 +GNU GENERAL PUBLIC LICENSE +Version 2, June 1991 -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -Everyone is permitted to copy and distribute verbatim copies -of this license document, but changing it is not allowed. +Copyright (C) 1989, 1991 Free Software Foundation, Inc. +51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. -Preamble +Preamble -The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. +The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. -When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. +When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. -To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. +To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. -For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. +For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. -We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. +We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. -Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. +Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. -Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. +Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. -The precise terms and conditions for copying, distribution and -modification follow. +The precise terms and conditions for copying, distribution and +modification follow. -GNU GENERAL PUBLIC LICENSE -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION +GNU GENERAL PUBLIC LICENSE +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". +0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. -1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. +1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. -2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: +2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: -a) You must cause the modified files to carry prominent notices -stating that you changed the files and the date of any change. +a) You must cause the modified files to carry prominent notices +stating that you changed the files and the date of any change. -b) You must cause any work that you distribute or publish, that in -whole or in part contains or is derived from the Program or any -part thereof, to be licensed as a whole at no charge to all third -parties under the terms of this License. +b) You must cause any work that you distribute or publish, that in +whole or in part contains or is derived from the Program or any +part thereof, to be licensed as a whole at no charge to all third +parties under the terms of this License. -c) If the modified program normally reads commands interactively -when run, you must cause it, when started running for such -interactive use in the most ordinary way, to print or display an -announcement including an appropriate copyright notice and a -notice that there is no warranty (or else, saying that you provide -a warranty) and that users may redistribute the program under -these conditions, and telling the user how to view a copy of this -License. (Exception: if the Program itself is interactive but -does not normally print such an announcement, your work based on -the Program is not required to print an announcement.) +c) If the modified program normally reads commands interactively +when run, you must cause it, when started running for such +interactive use in the most ordinary way, to print or display an +announcement including an appropriate copyright notice and a +notice that there is no warranty (or else, saying that you provide +a warranty) and that users may redistribute the program under +these conditions, and telling the user how to view a copy of this +License. (Exception: if the Program itself is interactive but +does not normally print such an announcement, your work based on +the Program is not required to print an announcement.) -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. -3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: +3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: -a) Accompany it with the complete corresponding machine-readable -source code, which must be distributed under the terms of Sections -1 and 2 above on a medium customarily used for software interchange; or, +a) Accompany it with the complete corresponding machine-readable +source code, which must be distributed under the terms of Sections +1 and 2 above on a medium customarily used for software interchange; or, -b) Accompany it with a written offer, valid for at least three -years, to give any third party, for a charge no more than your -cost of physically performing source distribution, a complete -machine-readable copy of the corresponding source code, to be -distributed under the terms of Sections 1 and 2 above on a medium -customarily used for software interchange; or, +b) Accompany it with a written offer, valid for at least three +years, to give any third party, for a charge no more than your +cost of physically performing source distribution, a complete +machine-readable copy of the corresponding source code, to be +distributed under the terms of Sections 1 and 2 above on a medium +customarily used for software interchange; or, -c) Accompany it with the information you received as to the offer -to distribute corresponding source code. (This alternative is -allowed only for noncommercial distribution and only if you -received the program in object code or executable form with such -an offer, in accord with Subsection b above.) +c) Accompany it with the information you received as to the offer +to distribute corresponding source code. (This alternative is +allowed only for noncommercial distribution and only if you +received the program in object code or executable form with such +an offer, in accord with Subsection b above.) -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. -4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. +4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. -5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. +5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. -6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. +6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. -7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. +7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. -8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. +8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. -9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. +9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. -10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. +10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. -NO WARRANTY +NO WARRANTY -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. -END OF TERMS AND CONDITIONS +END OF TERMS AND CONDITIONS -How to Apply These Terms to Your New Programs +How to Apply These Terms to Your New Programs -If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. +If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. -To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. +To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. - -Copyright (C) + +Copyright (C) -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 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. +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 St, Fifth Floor, Boston, MA 02110-1301 USA +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 St, Fifth Floor, Boston, MA 02110-1301 USA -Also add information on how to contact you by electronic and paper mail. +Also add information on how to contact you by electronic and paper mail. -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: -Gnomovision version 69, Copyright (C) year name of author -Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. -This is free software, and you are welcome to redistribute it -under certain conditions; type `show c' for details. +Gnomovision version 69, Copyright (C) year name of author +Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. +This is free software, and you are welcome to redistribute it +under certain conditions; type `show c' for details. -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: -Yoyodyne, Inc., hereby disclaims all copyright interest in the program -`Gnomovision' (which makes passes at compilers) written by James Hacker. +Yoyodyne, Inc., hereby disclaims all copyright interest in the program +`Gnomovision' (which makes passes at compilers) written by James Hacker. -, 1 April 1989 -Ty Coon, President of Vice +, 1 April 1989 +Ty Coon, President of Vice -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General Public License instead of this License. ----- -Enginuity is created for FREE without any sort of guarantee. The +RomRaider is created for FREE without any sort of guarantee. The developers cannot be held liable for any damage incurred as a result of -using Enginuity. USE AT YOUR OWN RISK. \ No newline at end of file +using RomRaider. USE AT YOUR OWN RISK. \ No newline at end of file diff --git a/log4j.properties b/log4j.properties index db98ddba..2c729b69 100644 --- a/log4j.properties +++ b/log4j.properties @@ -5,6 +5,6 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%-5r %-5p [%t] - %m%n log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.File=enginuity.log +log4j.appender.file.File=romraider.log log4j.appender.file.layout=org.apache.log4j.PatternLayout log4j.appender.file.layout.ConversionPattern=%-5r %-5p [%t] - %m%n diff --git a/manifest b/manifest index e5f845c1..7b350b36 100644 --- a/manifest +++ b/manifest @@ -1,30 +1,30 @@ Manifest-Version: 1.0 Ant-Version: Apache Ant 1.6.5 Created-By: 1.5.0_07-b03 (Sun Microsystems Inc.) -Main-Class: enginuity.ECUExec -Class-Path: - lib/BareBonesBrowserLaunch.jar - lib/jep.jar - lib/log4j-1.2.14.jar +Main-Class: com.romraider.ECUExec +Class-Path: + lib/BareBonesBrowserLaunch.jar + lib/jep.jar + lib/log4j-1.2.14.jar lib/Jama.jar lib/jamlab.jar lib/JFontChooser.jar - lib/swing-layout-1.0.jar - lib/jcommon-1.0.7.jar - lib/jfreechart-1.0.3.jar - lib/RXTXcomm.jar - lib/jdic.jar - lib/jama-1.0.2.jar - lib/Graph3d.jar - lib/j3dcore.jar - lib/j3dutils.jar - lib/vecmath.jar - lib/swing-layout-1.0.jar - lib/jdic_stub.jar - lib/log4j-1.2.14.jar - lib/cmu_time_awb.jar - lib/cmu_us_kal.jar - lib/cmutimelex.jar - lib/en_us.jar - lib/freetts.jar + lib/swing-layout-1.0.jar + lib/jcommon-1.0.7.jar + lib/jfreechart-1.0.3.jar + lib/RXTXcomm.jar + lib/jdic.jar + lib/jama-1.0.2.jar + lib/Graph3d.jar + lib/j3dcore.jar + lib/j3dutils.jar + lib/vecmath.jar + lib/swing-layout-1.0.jar + lib/jdic_stub.jar + lib/log4j-1.2.14.jar + lib/cmu_time_awb.jar + lib/cmu_us_kal.jar + lib/cmutimelex.jar + lib/en_us.jar + lib/freetts.jar X-COMMENT: Main-Class will be added automatically by build \ No newline at end of file diff --git a/plugins/aem.plugin b/plugins/aem.plugin index 48b043b7..08bce2ac 100644 --- a/plugins/aem.plugin +++ b/plugins/aem.plugin @@ -1 +1 @@ -datasource.class=enginuity.logger.aem.plugin.AemDataSource \ No newline at end of file +datasource.class=com.romraider.logger.aem.plugin.AemDataSource \ No newline at end of file diff --git a/plugins/lc1.plugin b/plugins/lc1.plugin index 6a01a842..b4cc9d4e 100644 --- a/plugins/lc1.plugin +++ b/plugins/lc1.plugin @@ -1 +1 @@ -datasource.class=enginuity.logger.innovate.lc1.plugin.Lc1DataSource \ No newline at end of file +datasource.class=com.romraider.logger.innovate.lc1.plugin.Lc1DataSource \ No newline at end of file diff --git a/plugins/lm1.plugin b/plugins/lm1.plugin index b2f22fca..85a74ada 100644 --- a/plugins/lm1.plugin +++ b/plugins/lm1.plugin @@ -1 +1 @@ -datasource.class=enginuity.logger.innovate.lm1.plugin.Lm1DataSource \ No newline at end of file +datasource.class=com.romraider.logger.innovate.lm1.plugin.Lm1DataSource \ No newline at end of file diff --git a/plugins/utec.plugin b/plugins/utec.plugin index ebae6680..692de841 100644 --- a/plugins/utec.plugin +++ b/plugins/utec.plugin @@ -1 +1 @@ -datasource.class=enginuity.logger.utec.plugin.UtecDataSource \ No newline at end of file +datasource.class=com.romraider.logger.utec.plugin.UtecDataSource \ No newline at end of file diff --git a/release_notes.txt b/release_notes.txt index 6d852a89..5039007e 100644 --- a/release_notes.txt +++ b/release_notes.txt @@ -1,354 +1,354 @@ - - Enginuity 0.4.2 Beta - - Open-Source ECU Tuning -- www.enginuity.org - - -PLEASE MAKE SURE TO READ RELEASE _NOTES.TXT_ EACH TIME YOU DOWNLOAD -A NEW VERSION OF ENGINUITY. IMPORTANT NOTICES, KNOWN ISSUES AND -NEW FEATURES WILL BE DISCUSSED. - -Enginuity is a full featured Engine Control Unit editing application -for tuning virtually any manufacturer, meant to be used in conjuction -with ECU flash and dump utilities. Enginuity will give you full -control over timing, fuel, boost and many other parameters in your -ECU, competing with very expensive and proprietary software. Enginuity -will remove your need for piggyback systems designed to control these -functions, and, in most cases, work as well as or better than any -stand alone engine management. Reflashing your stock ECU also has the -added benefit of a manufacturer tested base map, giving you top notch -performance and saving time tuning idle and low throttle applications -while retaining all of the benefit of the research and development -manufacturer's spend millions of dollars on. - -Enginuity is currently in BETA TEST status, meaning it is not -thoroughly tested and not intended for use by inexperienced users. In -addition to being incomplete and untested, only experienced tuners -with the required tools (ie, wideband oxygen sensor) should modify an -ECU image. As with any engine management, changes could result in -severe engine damage. Use at your own risk. - -Documentation is available at http://wiki.enginuity.org and the -official Enginuity FAQ can be found at -http://www.enginuity.org/about444.html. Please be aware that as -Enginuity is still in beta status and changing frequently, -documentation may be incomplete or out of date. - - - ------------------------------ -- 0.4.1b Notes (2/8/2007) - ------------------------------ -This release includes a couple minor fixes to the tuning interface and -major enhancements to the datalogger. - - - ------------------------ -- 0.4.1b Known Issues - ------------------------ -- 3d graph - - Java3d over most VNC implementations will show a blank JFrame - - You MUST have up to date graphics drivers that support OpenGL 1.2 - - Expect ~200 megs of usage when using 3d graphing - - Expect possible memory leaks when using 3d graphing - - There are some problems with cell selection in 3d graphs - - Numerical interpolation can take some time on slower machines -- Other - - File associations will work only in Windows systems - - - --------------- -- Change Log - --------------- - -0.4.1b (2/8/2007) ------------------ - ---- Tuning --- -- Fix frame sizes too small on 2d tables -- Fix switch tables displaying wrong icon in table tree - ---- Datalogging --- -- Autoconnect -- Reset, disconnect buttons -- Reset data buttons per tab -- Updated dash tab with warning levels (warning levels not currently - saved to profile) -- Fixed "Manifold Relative Pressure (Corrected)" parameter -- Fixed profile save/load problems -- ECU id display in status bar -- Updated address format in logger.xml (length attribute added to - replace multiple tags. length defauilts to 1 if not specified) -- Autodetection of ecu specific parameters via new tags in - logger.xml (IAM, engine load) -- ECU connection status indicator added to interface (stopped, - connecting, reading data, logging to file) -- Auto filtering of parameter list based on ECU init response (should - only display now what your car says it supports) -- Enable defogger switch based file logging via menu bar (don't need to - select it in switch list anymore) -- Defogger switch is only logged to file when explicitly enabled -- Absolute timestamp option added for file logging -- Relative timestamp now reset to zero at the beginning of each log file - (unless absolute timestamp is selected) -- Graph tab color scheme updated -- Enhancements to the map overlay feature, including display of the live - data and overlay of the live data values on the map cells. -- Tooltips added to parameter list showing parameter description (not all - parameters have a description yet though) -- General logger parameter updates/additions - - -0.4.0b (11/10/2006) -------------------- -- Add file associations -- Ability to view (but not modify) tables above userlevel -- Add link to latest ECU definitions -- Fix switch (CEL fix) inheritance -- Fix table ordering in child ROMs -- Fix table level display in property panel -- Fix label fonts on 3D tables -- Logging -- 3D graphing -- Interpolating (map smoothing) - - -0.3.2b (8/12/2006) ------------------- -- Installer/Shortcuts -- Add status bar -- Add support for hex ID strings for Mitsubishi support -- Fix goofy behavior of increase/decrease at limits -- Add multiply values function -- Improve exception handling in XML parser -- Add lockable tables via ECU definitions -- Rearrange 3D table labels -- Improve datacell colorize method -- Add limits to table values in XML -- Fix exiting through menu not saving settings -- Add ECU Definition Manager - - -0.3.1b (7/11/2006) ------------------- -- Change year attribute to string from int -- Fix incrementing in compare mode -- Fix refresh tables working improperly with multiple ROMs open -- Update table property panel -- Fix float values not incrementing properly in axiis -- Fix values not incrementing if increment amount is less than LSB -- Add option whether to display tables higher than userlevel -- Add option whether to save changes made to debug tables -- Fix clicking on ROM tree opening/closing wrong tables -- Fix switch tables not compensating for RAM -- Fix many memory leak problems -- List tables above userlevel, but disabled -- Color debug tables red -- Add "version" tag to settings -- Show release notes on first run -- Remove unnecessary variables from settings XML -- Add name and description to CEL/checksum fix tables -- Fix "(null)" text on static 2D axiis -- Remove table name from bottom of 2D table -- Allow single clicking to open tables (via settings) -- Add fine adjustment values to ECU definition -- Fix map copy/paste -- Increment affects real instead of binary value -- User levels -- Fix definition parser rounding incrementby values -- Improve table properties display -- Fix byte/real conversion validation - - -0.3.0b (7/2/2006) ---------------------------------------- -- Finish map comparing implementation - - -0.2.93a Private Test Release (7/1/2006) ---------------------------------------- -- Added "switch" table type - - -0.2.92a Private Test Release (7/1/2006) ----------------------------------------- -- Fixed squares appearing instead of some float values -- Fixed exception when entering decimals in coarse value -- Fixed set value field being cast to integer instead of decimal -- Fixed progress bar not closing on errors -- Pressing "." now focuses set value field - - -0.2.91a Private Test Release (6/30/2006) ----------------------------------------- -- Fixed memory usage issues -- Added performance and other memory optimizations - - -0.2.90a Private Test Release (6/30/2006) ----------------------------------------- -- Added 32-bit ECU (float) support - - -0.2.7.4b (5/09/2006) --------------------- -- Fixed 16-bit 3D tables saving improperly -- Added compare to original value function - - -0.2.7.3b (4/17/2006) --------------------- -- Fix border colors not showing changes from keyboard -- Add progress indicators -- Remove table definition generator -- Fix refresh button closing images with same filename -- Fix border/background of static axiis -- Fix rounding problems causing false conflicts for conversion expressions -- Fix set value not updating borders -- Reset default settings option -- Fix cell border not saving -- Improve warning messages -- Fix ECU definition file settings not saving -- Fix last image directory resetting -- Fix updated cell border not updating - - -0.2.7.2b (4/12/2006) --------------------- -- Fixed close all images - - -0.2.7.1b (4/12/2006) --------------------- -- Fixed ECU definitions not saving -- Fixed last image directory not saving -- Fixed colors not saving -- Fixed increased/decreased cell borders not updating - - -0.2.7b (4/12/2006) ------------------- -- Replace serialized settings object with XML -- Settings panel -- Custom sizes/fonts/colors for tables -- Fix blue 2D table axiis -- Fix exception when clicking on table list -- Expression/to_byte conflict warning -- Rename packages to conventional lowercase -- Improve refresh method when saving -- Improve exception reporting -- Implement "obsolete" tag -- set up wiki with ROM revision info -- Group tables by category -- Fix descriptions not working -- Fix 2D table navigation - - -0.2.6b (4/5/2006) ------------------ -- Shortcut keys -- Improve display of tables too large for window (MDI) -- Improve exception reporting -- Improve saved window position on exit (panel size, maximized) -- Remove "copy" from table menu -- its in the edit menu -- Fix vertical overhead on table size for new graphical buttons -- Fix rounding issues with set value -- Fix ctrl-click on tables -- Resize cells to make best use of screen -- Prevent simultaneous selection of axiis and table values -- Map copying -- Graphical icons -- Cascade windows (MDI) -- Fix table frame JScrollPane (MDI) - - -0.2.5b (3/28/2006) ------------------- -- Import tables by single address -- Refresh image button -- Table properties -- Add "obsolete" tag for images with more recent revisions -- Fix application not closing files after reading -- Add file extensions to open/save dialog (HEX, BIN) -- Fix parser searching by XML ID instead of internal storage ID -- Image properties -- Show positive (red) and negative (blue) value changes on tables -BUG FIXES: -- Decrement (fine) increments -- Files not closing after being read -- Set value rounds goofy -- 1D tables not colorizing properly -- 2D tables not working properly -- Set value field shows negative numbers - - -0.2.4a (3/21/2006) ------------------- -- "Base" attribute for extending/duplicating tables -- "Omit" attribute not required to omit tables -- just set storageaddress to "0" -- Fine and coarse adjustment of values -- Direct value input -- Support for ROMs with or without RAM sectors - - -0.2.3a (2/27/2006) ------------------- -- ECU definitions including each other (endless loop) is now handled -- "Omit" attribute allows incomplete tables to be removed from inheriting definitions -- Nested includes (includes more than 1 definition deep) tested and working properly - - -0.2.2a (2/26/2006) ------------------- -- Include support in XML definitions (exception handling not yet implemented!) - - -0.2.1a (2/13/2006) ------------------- -- Handles storage addresses that are out of range -- Fixed conflicting parent/child table sizes (done) -- Replaced "" menu with "Table" -- makes it more obviously a menu -- Fixed 3D table sizing problem -- Fixed colorizing exception -- Fixed backwards endians -- Fixed storage address out of range exception -- Improved close image method - - -.20a (2/11/2006) ----------------- --Completely rewritten --XML ECU definitions --View multiple images and tables - - -.14a (11/26/2005) ------------------- --Improved axis cell modification --Fixed absolute value calculations - -.13a ------ --Revised text entry of values --Added EUDM WRX support --Improved multiple cell selection --Improved axis cell modification --Axis cell changes can be saved - -Supported ECU Versions/Version Added - Deprecated as of version .20a. ECU versions are now defined in ecu_defs.xml. ----------------------- -2004/2005 USDM WRX: --A4TF300E .13a --A4TF400E .13a --A4TF800E .13a --A4TF500F .13a --A4TF510F .13a --A4TF800F .13a - -2002/2003 USDM WRX: --A4TC300L .13a --A4SGC00C .13a --A4SGD10C .13a --A4SG900C .13a - -2003 EUDM WRX: + - RomRaider 0.4.2 Beta - + Open-Source ECU Tuning -- www.romraider.com + + +PLEASE MAKE SURE TO READ RELEASE _NOTES.TXT_ EACH TIME YOU DOWNLOAD +A NEW VERSION OF ROMRAIDER. IMPORTANT NOTICES, KNOWN ISSUES AND +NEW FEATURES WILL BE DISCUSSED. + +RomRaider is a full featured Engine Control Unit editing application +for tuning virtually any manufacturer, meant to be used in conjuction +with ECU flash and dump utilities. RomRaider will give you full +control over timing, fuel, boost and many other parameters in your +ECU, competing with very expensive and proprietary software. RomRaider +will remove your need for piggyback systems designed to control these +functions, and, in most cases, work as well as or better than any +stand alone engine management. Reflashing your stock ECU also has the +added benefit of a manufacturer tested base map, giving you top notch +performance and saving time tuning idle and low throttle applications +while retaining all of the benefit of the research and development +manufacturer's spend millions of dollars on. + +RomRaider is currently in BETA TEST status, meaning it is not +thoroughly tested and not intended for use by inexperienced users. In +addition to being incomplete and untested, only experienced tuners +with the required tools (ie, wideband oxygen sensor) should modify an +ECU image. As with any engine management, changes could result in +severe engine damage. Use at your own risk. + +Documentation is available at http://wiki.romraider.com and the +official RomRaider FAQ can be found at +http://www.romraider.com/about444.html. Please be aware that as +RomRaider is still in beta status and changing frequently, +documentation may be incomplete or out of date. + + + +----------------------------- +- 0.4.1b Notes (2/8/2007) - +----------------------------- +This release includes a couple minor fixes to the tuning interface and +major enhancements to the datalogger. + + + +----------------------- +- 0.4.1b Known Issues - +----------------------- +- 3d graph + - Java3d over most VNC implementations will show a blank JFrame + - You MUST have up to date graphics drivers that support OpenGL 1.2 + - Expect ~200 megs of usage when using 3d graphing + - Expect possible memory leaks when using 3d graphing + - There are some problems with cell selection in 3d graphs + - Numerical interpolation can take some time on slower machines +- Other + - File associations will work only in Windows systems + + + +-------------- +- Change Log - +-------------- + +0.4.1b (2/8/2007) +----------------- + +--- Tuning --- +- Fix frame sizes too small on 2d tables +- Fix switch tables displaying wrong icon in table tree + +--- Datalogging --- +- Autoconnect +- Reset, disconnect buttons +- Reset data buttons per tab +- Updated dash tab with warning levels (warning levels not currently + saved to profile) +- Fixed "Manifold Relative Pressure (Corrected)" parameter +- Fixed profile save/load problems +- ECU id display in status bar +- Updated address format in logger.xml (length attribute added to + replace multiple tags. length defauilts to 1 if not specified) +- Autodetection of ecu specific parameters via new tags in + logger.xml (IAM, engine load) +- ECU connection status indicator added to interface (stopped, + connecting, reading data, logging to file) +- Auto filtering of parameter list based on ECU init response (should + only display now what your car says it supports) +- Enable defogger switch based file logging via menu bar (don't need to + select it in switch list anymore) +- Defogger switch is only logged to file when explicitly enabled +- Absolute timestamp option added for file logging +- Relative timestamp now reset to zero at the beginning of each log file + (unless absolute timestamp is selected) +- Graph tab color scheme updated +- Enhancements to the map overlay feature, including display of the live + data and overlay of the live data values on the map cells. +- Tooltips added to parameter list showing parameter description (not all + parameters have a description yet though) +- General logger parameter updates/additions + + +0.4.0b (11/10/2006) +------------------- +- Add file associations +- Ability to view (but not modify) tables above userlevel +- Add link to latest ECU definitions +- Fix switch (CEL fix) inheritance +- Fix table ordering in child ROMs +- Fix table level display in property panel +- Fix label fonts on 3D tables +- Logging +- 3D graphing +- Interpolating (map smoothing) + + +0.3.2b (8/12/2006) +------------------ +- Installer/Shortcuts +- Add status bar +- Add support for hex ID strings for Mitsubishi support +- Fix goofy behavior of increase/decrease at limits +- Add multiply values function +- Improve exception handling in XML parser +- Add lockable tables via ECU definitions +- Rearrange 3D table labels +- Improve datacell colorize method +- Add limits to table values in XML +- Fix exiting through menu not saving settings +- Add ECU Definition Manager + + +0.3.1b (7/11/2006) +------------------ +- Change year attribute to string from int +- Fix incrementing in compare mode +- Fix refresh tables working improperly with multiple ROMs open +- Update table property panel +- Fix float values not incrementing properly in axiis +- Fix values not incrementing if increment amount is less than LSB +- Add option whether to display tables higher than userlevel +- Add option whether to save changes made to debug tables +- Fix clicking on ROM tree opening/closing wrong tables +- Fix switch tables not compensating for RAM +- Fix many memory leak problems +- List tables above userlevel, but disabled +- Color debug tables red +- Add "version" tag to settings +- Show release notes on first run +- Remove unnecessary variables from settings XML +- Add name and description to CEL/checksum fix tables +- Fix "(null)" text on static 2D axiis +- Remove table name from bottom of 2D table +- Allow single clicking to open tables (via settings) +- Add fine adjustment values to ECU definition +- Fix map copy/paste +- Increment affects real instead of binary value +- User levels +- Fix definition parser rounding incrementby values +- Improve table properties display +- Fix byte/real conversion validation + + +0.3.0b (7/2/2006) +--------------------------------------- +- Finish map comparing implementation + + +0.2.93a Private Test Release (7/1/2006) +--------------------------------------- +- Added "switch" table type + + +0.2.92a Private Test Release (7/1/2006) +---------------------------------------- +- Fixed squares appearing instead of some float values +- Fixed exception when entering decimals in coarse value +- Fixed set value field being cast to integer instead of decimal +- Fixed progress bar not closing on errors +- Pressing "." now focuses set value field + + +0.2.91a Private Test Release (6/30/2006) +---------------------------------------- +- Fixed memory usage issues +- Added performance and other memory optimizations + + +0.2.90a Private Test Release (6/30/2006) +---------------------------------------- +- Added 32-bit ECU (float) support + + +0.2.7.4b (5/09/2006) +-------------------- +- Fixed 16-bit 3D tables saving improperly +- Added compare to original value function + + +0.2.7.3b (4/17/2006) +-------------------- +- Fix border colors not showing changes from keyboard +- Add progress indicators +- Remove table definition generator +- Fix refresh button closing images with same filename +- Fix border/background of static axiis +- Fix rounding problems causing false conflicts for conversion expressions +- Fix set value not updating borders +- Reset default settings option +- Fix cell border not saving +- Improve warning messages +- Fix ECU definition file settings not saving +- Fix last image directory resetting +- Fix updated cell border not updating + + +0.2.7.2b (4/12/2006) +-------------------- +- Fixed close all images + + +0.2.7.1b (4/12/2006) +-------------------- +- Fixed ECU definitions not saving +- Fixed last image directory not saving +- Fixed colors not saving +- Fixed increased/decreased cell borders not updating + + +0.2.7b (4/12/2006) +------------------ +- Replace serialized settings object with XML +- Settings panel +- Custom sizes/fonts/colors for tables +- Fix blue 2D table axiis +- Fix exception when clicking on table list +- Expression/to_byte conflict warning +- Rename packages to conventional lowercase +- Improve refresh method when saving +- Improve exception reporting +- Implement "obsolete" tag -- set up wiki with ROM revision info +- Group tables by category +- Fix descriptions not working +- Fix 2D table navigation + + +0.2.6b (4/5/2006) +----------------- +- Shortcut keys +- Improve display of tables too large for window (MDI) +- Improve exception reporting +- Improve saved window position on exit (panel size, maximized) +- Remove "copy" from table menu -- its in the edit menu +- Fix vertical overhead on table size for new graphical buttons +- Fix rounding issues with set value +- Fix ctrl-click on tables +- Resize cells to make best use of screen +- Prevent simultaneous selection of axiis and table values +- Map copying +- Graphical icons +- Cascade windows (MDI) +- Fix table frame JScrollPane (MDI) + + +0.2.5b (3/28/2006) +------------------ +- Import tables by single address +- Refresh image button +- Table properties +- Add "obsolete" tag for images with more recent revisions +- Fix application not closing files after reading +- Add file extensions to open/save dialog (HEX, BIN) +- Fix parser searching by XML ID instead of internal storage ID +- Image properties +- Show positive (red) and negative (blue) value changes on tables +BUG FIXES: +- Decrement (fine) increments +- Files not closing after being read +- Set value rounds goofy +- 1D tables not colorizing properly +- 2D tables not working properly +- Set value field shows negative numbers + + +0.2.4a (3/21/2006) +------------------ +- "Base" attribute for extending/duplicating tables +- "Omit" attribute not required to omit tables -- just set storageaddress to "0" +- Fine and coarse adjustment of values +- Direct value input +- Support for ROMs with or without RAM sectors + + +0.2.3a (2/27/2006) +------------------ +- ECU definitions including each other (endless loop) is now handled +- "Omit" attribute allows incomplete tables to be removed from inheriting definitions +- Nested includes (includes more than 1 definition deep) tested and working properly + + +0.2.2a (2/26/2006) +------------------ +- Include support in XML definitions (exception handling not yet implemented!) + + +0.2.1a (2/13/2006) +------------------ +- Handles storage addresses that are out of range +- Fixed conflicting parent/child table sizes (done) +- Replaced "
" menu with "Table" -- makes it more obviously a menu +- Fixed 3D table sizing problem +- Fixed colorizing exception +- Fixed backwards endians +- Fixed storage address out of range exception +- Improved close image method + + +.20a (2/11/2006) +---------------- +-Completely rewritten +-XML ECU definitions +-View multiple images and tables + + +.14a (11/26/2005) +------------------ +-Improved axis cell modification +-Fixed absolute value calculations + +.13a +----- +-Revised text entry of values +-Added EUDM WRX support +-Improved multiple cell selection +-Improved axis cell modification +-Axis cell changes can be saved + +Supported ECU Versions/Version Added - Deprecated as of version .20a. ECU versions are now defined in ecu_defs.xml. +---------------------- +2004/2005 USDM WRX: +-A4TF300E .13a +-A4TF400E .13a +-A4TF800E .13a +-A4TF500F .13a +-A4TF510F .13a +-A4TF800F .13a + +2002/2003 USDM WRX: +-A4TC300L .13a +-A4SGC00C .13a +-A4SGD10C .13a +-A4SG900C .13a + +2003 EUDM WRX: -A4TE001G .13a diff --git a/src/enginuity/ECUEditor.java b/src/com/romraider/ECUEditor.java similarity index 94% rename from src/enginuity/ECUEditor.java rename to src/com/romraider/ECUEditor.java index f4bea95e..87fdbc44 100644 --- a/src/enginuity/ECUEditor.java +++ b/src/com/romraider/ECUEditor.java @@ -19,27 +19,26 @@ * */ -package enginuity; +package com.romraider; +import com.romraider.logger.ecu.ui.handler.table.TableUpdateHandler; +import com.romraider.maps.Rom; +import com.romraider.maps.Table; +import com.romraider.net.URL; +import com.romraider.swing.ECUEditorMenuBar; +import com.romraider.swing.ECUEditorToolBar; +import com.romraider.swing.JProgressPane; +import com.romraider.swing.MDIDesktopPane; +import com.romraider.swing.RomTree; +import com.romraider.swing.RomTreeNode; +import com.romraider.swing.RomTreeRootNode; +import com.romraider.swing.TableFrame; +import com.romraider.util.SettingsManager; +import com.romraider.util.SettingsManagerImpl; +import com.romraider.xml.DOMRomUnmarshaller; +import com.romraider.xml.RomNotFoundException; import com.sun.org.apache.xerces.internal.parsers.DOMParser; import com.sun.org.apache.xerces.internal.xni.parser.XMLParseException; -import enginuity.logger.ecu.ui.handler.table.TableUpdateHandler; -import enginuity.Version; // this is a generated class - see build.xml -import enginuity.maps.Rom; -import enginuity.maps.Table; -import enginuity.net.URL; -import enginuity.swing.ECUEditorMenuBar; -import enginuity.swing.ECUEditorToolBar; -import enginuity.swing.JProgressPane; -import enginuity.swing.MDIDesktopPane; -import enginuity.swing.RomTree; -import enginuity.swing.RomTreeNode; -import enginuity.swing.RomTreeRootNode; -import enginuity.swing.TableFrame; -import enginuity.util.SettingsManager; -import enginuity.util.SettingsManagerImpl; -import enginuity.xml.DOMRomUnmarshaller; -import enginuity.xml.RomNotFoundException; import org.w3c.dom.Document; import org.xml.sax.InputSource; import javax.swing.ImageIcon; @@ -123,7 +122,7 @@ public class ECUEditor extends JFrame implements WindowListener, PropertyChangeL this.add(statusPanel, BorderLayout.SOUTH); //set remaining window properties - setIconImage(new ImageIcon("./graphics/enginuity-ico.gif").getImage()); + setIconImage(new ImageIcon("./graphics/romraider-ico.gif").getImage()); setDefaultCloseOperation(EXIT_ON_CLOSE); addWindowListener(this); setTitle(titleText); @@ -155,7 +154,7 @@ public class ECUEditor extends JFrame implements WindowListener, PropertyChangeL releaseNotes.setText(sb.toString()); JOptionPane.showMessageDialog(this, scroller, - Version.PRODUCT_NAME + Version.VERSION + " Release Notes", JOptionPane.INFORMATION_MESSAGE); + Version.PRODUCT_NAME + Version.VERSION + " Release Notes", JOptionPane.INFORMATION_MESSAGE); } finally { br.close(); } diff --git a/src/enginuity/ECUEditorManager.java b/src/com/romraider/ECUEditorManager.java similarity index 96% rename from src/enginuity/ECUEditorManager.java rename to src/com/romraider/ECUEditorManager.java index 6bc15702..41fd59ea 100644 --- a/src/enginuity/ECUEditorManager.java +++ b/src/com/romraider/ECUEditorManager.java @@ -19,8 +19,9 @@ * */ -package enginuity; +package com.romraider; +import com.romraider.ECUEditor; import javax.swing.SwingUtilities; public class ECUEditorManager { diff --git a/src/enginuity/ECUExec.java b/src/com/romraider/ECUExec.java similarity index 96% rename from src/enginuity/ECUExec.java rename to src/com/romraider/ECUExec.java index 44123867..1b0be3de 100644 --- a/src/enginuity/ECUExec.java +++ b/src/com/romraider/ECUExec.java @@ -19,10 +19,11 @@ * */ -package enginuity; +package com.romraider; -import enginuity.swing.LookAndFeelManager; -import enginuity.util.LogManager; +import com.romraider.swing.LookAndFeelManager; +import com.romraider.util.LogManager; +import com.romraider.ECUEditor; import org.apache.log4j.Logger; import java.io.BufferedReader; import java.io.File; diff --git a/src/enginuity/NewGUI/NewGUI.java b/src/com/romraider/NewGUI/NewGUI.java similarity index 85% rename from src/enginuity/NewGUI/NewGUI.java rename to src/com/romraider/NewGUI/NewGUI.java index 7272bde9..1a7a9a66 100644 --- a/src/enginuity/NewGUI/NewGUI.java +++ b/src/com/romraider/NewGUI/NewGUI.java @@ -1,15 +1,15 @@ -package enginuity.NewGUI; +package com.romraider.NewGUI; -import enginuity.NewGUI.data.ApplicationStateManager; -import enginuity.NewGUI.data.TableMetaData; -import enginuity.NewGUI.desktop.EDesktopPane; -import enginuity.NewGUI.etable.EInternalFrame; -import enginuity.NewGUI.interfaces.TuningEntity; -import enginuity.NewGUI.interfaces.TuningEntityListener; -import enginuity.NewGUI.tree.ETree; -import enginuity.NewGUI.tree.ETreeNode; -import enginuity.logger.utec.impl.UtecTuningEntityImpl; -import enginuity.swing.LookAndFeelManager; +import com.romraider.NewGUI.data.ApplicationStateManager; +import com.romraider.NewGUI.data.TableMetaData; +import com.romraider.NewGUI.desktop.EDesktopPane; +import com.romraider.NewGUI.etable.EInternalFrame; +import com.romraider.NewGUI.interfaces.TuningEntity; +import com.romraider.NewGUI.interfaces.TuningEntityListener; +import com.romraider.NewGUI.tree.ETree; +import com.romraider.NewGUI.tree.ETreeNode; +import com.romraider.logger.utec.impl.UtecTuningEntityImpl; +import com.romraider.swing.LookAndFeelManager; import org.apache.log4j.Logger; import javax.swing.JFrame; import javax.swing.JInternalFrame; @@ -35,7 +35,7 @@ import java.util.Vector; public class NewGUI extends JFrame implements WindowListener, ActionListener, TreeSelectionListener, TuningEntityListener { private static final Logger LOGGER = Logger.getLogger(NewGUI.class); - private final String engninuityVersionTitle = "RomRaider v0.5.0 alpha 1"; + private final String romRaiderVersionTitle = "RomRaider v0.5.0 alpha 1"; private JPanel mainJPanel = new JPanel(); @@ -61,11 +61,11 @@ public class NewGUI extends JFrame implements WindowListener, ActionListener, } public static NewGUI getInstance() { - if (ApplicationStateManager.getEnginuityInstance() == null) { - ApplicationStateManager.setEnginuityInstance(new NewGUI()); + if (ApplicationStateManager.getRomRaiderInstance() == null) { + ApplicationStateManager.setRomRaiderInstance(new NewGUI()); } - return ApplicationStateManager.getEnginuityInstance(); + return ApplicationStateManager.getRomRaiderInstance(); } private void initData() { @@ -81,11 +81,11 @@ public class NewGUI extends JFrame implements WindowListener, ActionListener, // Set the frame icon Image img = Toolkit.getDefaultToolkit().getImage( - "graphics/enginuity-ico.gif"); + "graphics/romraider-ico.gif"); setIconImage(img); // Set frame title - this.setTitle(this.engninuityVersionTitle); + this.setTitle(this.romRaiderVersionTitle); // Set main JFrame size this.setSize(800, 600); @@ -159,7 +159,7 @@ public class NewGUI extends JFrame implements WindowListener, ActionListener, } public void addTuningGroupNameToTitle(String titleAppend) { - this.setTitle(this.engninuityVersionTitle + ": " + titleAppend); + this.setTitle(this.romRaiderVersionTitle + ": " + titleAppend); } /** @@ -243,7 +243,7 @@ public class NewGUI extends JFrame implements WindowListener, ActionListener, /* * Helper method that returns the number of maps that have had their data changed. * (non-Javadoc) - * @see enginuity.NewGUI.interfaces.TuningEntityListener#getMapChangeCount(enginuity.NewGUI.interfaces.TuningEntity, java.lang.String) + * @see com.romraider.NewGUI.interfaces.TuningEntityListener#getMapChangeCount(com.romraider.NewGUI.interfaces.TuningEntity, java.lang.String) */ public int getMapChangeCount(TuningEntity tuningEntity, String tableGroup) { JInternalFrame[] allFrames = this.rightDesktopPane.getAllFrames(); @@ -267,7 +267,7 @@ public class NewGUI extends JFrame implements WindowListener, ActionListener, * Method walks through all opened JInternalFrames in right pane. If an InternFrame claims its * data has been changed, the tuning entity parent is notified. * (non-Javadoc) - * @see enginuity.NewGUI.interfaces.TuningEntityListener#saveMaps() + * @see com.romraider.NewGUI.interfaces.TuningEntityListener#saveMaps() */ public void saveMaps() { JInternalFrame[] allFrames = this.rightDesktopPane.getAllFrames(); @@ -286,18 +286,18 @@ public class NewGUI extends JFrame implements WindowListener, ActionListener, } /** - * Getter that returns the title of Enginuity + * Getter that returns the title of RomRaider * * @return */ - public String getEngninuityTitle() { - return engninuityVersionTitle; + public String getRomRaiderTitle() { + return romRaiderVersionTitle; } /* * Tuning entity in scope will call this when it is ready to exit. Some entities might need to cleanup connections or save files. * (non-Javadoc) - * @see enginuity.NewGUI.interfaces.TuningEntityListener#readyForExit() + * @see com.romraider.NewGUI.interfaces.TuningEntityListener#readyForExit() */ public void readyForExit() { LOGGER.info("RomRaider is now exiting as per tuning entity notification: " + ApplicationStateManager.getCurrentTuningEntity().getName()); diff --git a/src/enginuity/NewGUI/TestNewGUI.java b/src/com/romraider/NewGUI/TestNewGUI.java similarity index 67% rename from src/enginuity/NewGUI/TestNewGUI.java rename to src/com/romraider/NewGUI/TestNewGUI.java index 89c41d04..eb429d2a 100644 --- a/src/enginuity/NewGUI/TestNewGUI.java +++ b/src/com/romraider/NewGUI/TestNewGUI.java @@ -1,6 +1,6 @@ -package enginuity.NewGUI; +package com.romraider.NewGUI; -import enginuity.util.LogManager; +import com.romraider.util.LogManager; public class TestNewGUI { public static void main(String[] args) { diff --git a/src/enginuity/NewGUI/data/ApplicationStateManager.java b/src/com/romraider/NewGUI/data/ApplicationStateManager.java similarity index 80% rename from src/enginuity/NewGUI/data/ApplicationStateManager.java rename to src/com/romraider/NewGUI/data/ApplicationStateManager.java index f1c28c67..7f1edd2c 100644 --- a/src/enginuity/NewGUI/data/ApplicationStateManager.java +++ b/src/com/romraider/NewGUI/data/ApplicationStateManager.java @@ -1,8 +1,8 @@ -package enginuity.NewGUI.data; +package com.romraider.NewGUI.data; -import enginuity.NewGUI.NewGUI; -import enginuity.NewGUI.interfaces.TuningEntity; -import enginuity.NewGUI.interfaces.TuningEntityListener; +import com.romraider.NewGUI.NewGUI; +import com.romraider.NewGUI.interfaces.TuningEntity; +import com.romraider.NewGUI.interfaces.TuningEntityListener; import java.util.Iterator; import java.util.Vector; @@ -18,7 +18,7 @@ public class ApplicationStateManager { private static TuningEntity currentTuningEntity; private static int currentUserLevel = ApplicationStateManager.USER_LEVEL_1; - private static NewGUI enginuityInstance = null; + private static NewGUI romRaiderInstance = null; private static String selectedTuningGroup = ""; @@ -61,12 +61,12 @@ public class ApplicationStateManager { return currentTuningEntity; } - public static NewGUI getEnginuityInstance() { - return enginuityInstance; + public static NewGUI getRomRaiderInstance() { + return romRaiderInstance; } - public static void setEnginuityInstance(NewGUI enginuityInstance) { - ApplicationStateManager.enginuityInstance = enginuityInstance; + public static void setRomRaiderInstance(NewGUI romRaiderInstance) { + ApplicationStateManager.romRaiderInstance = romRaiderInstance; } public static String getSelectedTuningGroup() { diff --git a/src/enginuity/NewGUI/data/TableMetaData.java b/src/com/romraider/NewGUI/data/TableMetaData.java similarity index 94% rename from src/enginuity/NewGUI/data/TableMetaData.java rename to src/com/romraider/NewGUI/data/TableMetaData.java index ec1f3179..201ac409 100644 --- a/src/enginuity/NewGUI/data/TableMetaData.java +++ b/src/com/romraider/NewGUI/data/TableMetaData.java @@ -1,6 +1,6 @@ -package enginuity.NewGUI.data; +package com.romraider.NewGUI.data; -import enginuity.NewGUI.interfaces.TuningEntity; +import com.romraider.NewGUI.interfaces.TuningEntity; import java.awt.Dimension; import java.text.DecimalFormat; diff --git a/src/enginuity/NewGUI/desktop/EDesktopPane.java b/src/com/romraider/NewGUI/desktop/EDesktopPane.java similarity index 95% rename from src/enginuity/NewGUI/desktop/EDesktopPane.java rename to src/com/romraider/NewGUI/desktop/EDesktopPane.java index a4389437..bc77e89f 100644 --- a/src/enginuity/NewGUI/desktop/EDesktopPane.java +++ b/src/com/romraider/NewGUI/desktop/EDesktopPane.java @@ -1,7 +1,7 @@ -package enginuity.NewGUI.desktop; +package com.romraider.NewGUI.desktop; -import enginuity.NewGUI.data.TableMetaData; -import enginuity.NewGUI.etable.EInternalFrame; +import com.romraider.NewGUI.data.TableMetaData; +import com.romraider.NewGUI.etable.EInternalFrame; import org.apache.log4j.Logger; import javax.swing.DefaultDesktopManager; import javax.swing.JComponent; diff --git a/src/enginuity/NewGUI/etable/EInternalFrame.java b/src/com/romraider/NewGUI/etable/EInternalFrame.java similarity index 91% rename from src/enginuity/NewGUI/etable/EInternalFrame.java rename to src/com/romraider/NewGUI/etable/EInternalFrame.java index 217aca25..c6b946a4 100644 --- a/src/enginuity/NewGUI/etable/EInternalFrame.java +++ b/src/com/romraider/NewGUI/etable/EInternalFrame.java @@ -1,9 +1,9 @@ -package enginuity.NewGUI.etable; +package com.romraider.NewGUI.etable; -import enginuity.NewGUI.data.TableMetaData; -import enginuity.NewGUI.etable.dataJPanel.DataJPanel1DString; -import enginuity.NewGUI.etable.dataJPanel.DataJPanel3DDouble; -import enginuity.NewGUI.etable.dataJPanel.DataJPanelInterface; +import com.romraider.NewGUI.data.TableMetaData; +import com.romraider.NewGUI.etable.dataJPanel.DataJPanel1DString; +import com.romraider.NewGUI.etable.dataJPanel.DataJPanel3DDouble; +import com.romraider.NewGUI.etable.dataJPanel.DataJPanelInterface; import org.apache.log4j.Logger; import javax.swing.ImageIcon; import javax.swing.JInternalFrame; @@ -54,7 +54,7 @@ public class EInternalFrame extends JInternalFrame implements InternalFrameListe // ***************************** // Build up final internal frame // ***************************** - Image img = Toolkit.getDefaultToolkit().getImage("graphics/enginuity-ico.gif"); + Image img = Toolkit.getDefaultToolkit().getImage("graphics/romraider-ico.gif"); ImageIcon imgIcon = new ImageIcon(img); this.setFrameIcon(imgIcon); this.setVisible(true); diff --git a/src/enginuity/NewGUI/etable/ETable.java b/src/com/romraider/NewGUI/etable/ETable.java similarity index 98% rename from src/enginuity/NewGUI/etable/ETable.java rename to src/com/romraider/NewGUI/etable/ETable.java index c04335b6..016242c3 100644 --- a/src/enginuity/NewGUI/etable/ETable.java +++ b/src/com/romraider/NewGUI/etable/ETable.java @@ -1,7 +1,7 @@ -package enginuity.NewGUI.etable; +package com.romraider.NewGUI.etable; -import enginuity.NewGUI.data.TableMetaData; -import enginuity.NewGUI.tools.FitData; +import com.romraider.NewGUI.data.TableMetaData; +import com.romraider.NewGUI.tools.FitData; import org.apache.log4j.Logger; import javax.swing.JTable; import javax.swing.ListSelectionModel; diff --git a/src/enginuity/NewGUI/etable/ETableCellRenderer.java b/src/com/romraider/NewGUI/etable/ETableCellRenderer.java similarity index 95% rename from src/enginuity/NewGUI/etable/ETableCellRenderer.java rename to src/com/romraider/NewGUI/etable/ETableCellRenderer.java index 3cb3d940..232ffe08 100644 --- a/src/enginuity/NewGUI/etable/ETableCellRenderer.java +++ b/src/com/romraider/NewGUI/etable/ETableCellRenderer.java @@ -1,4 +1,4 @@ -package enginuity.NewGUI.etable; +package com.romraider.NewGUI.etable; import com.ecm.graphics.tools.ColorTable; import javax.swing.JTable; diff --git a/src/enginuity/NewGUI/etable/ETableMenuBar.java b/src/com/romraider/NewGUI/etable/ETableMenuBar.java similarity index 93% rename from src/enginuity/NewGUI/etable/ETableMenuBar.java rename to src/com/romraider/NewGUI/etable/ETableMenuBar.java index fdae246d..781adea0 100644 --- a/src/enginuity/NewGUI/etable/ETableMenuBar.java +++ b/src/com/romraider/NewGUI/etable/ETableMenuBar.java @@ -1,6 +1,6 @@ -package enginuity.NewGUI.etable; +package com.romraider.NewGUI.etable; -import enginuity.NewGUI.etable.dataJPanel.DataJPanelInterface; +import com.romraider.NewGUI.etable.dataJPanel.DataJPanelInterface; import javax.swing.JMenu; import javax.swing.JMenuBar; import javax.swing.JMenuItem; diff --git a/src/enginuity/NewGUI/etable/ETableModel.java b/src/com/romraider/NewGUI/etable/ETableModel.java similarity index 97% rename from src/enginuity/NewGUI/etable/ETableModel.java rename to src/com/romraider/NewGUI/etable/ETableModel.java index 496ed22b..5448a240 100644 --- a/src/enginuity/NewGUI/etable/ETableModel.java +++ b/src/com/romraider/NewGUI/etable/ETableModel.java @@ -1,6 +1,6 @@ -package enginuity.NewGUI.etable; +package com.romraider.NewGUI.etable; -import enginuity.NewGUI.data.TableMetaData; +import com.romraider.NewGUI.data.TableMetaData; import org.apache.log4j.Logger; import javax.swing.table.AbstractTableModel; import java.text.DecimalFormat; diff --git a/src/enginuity/NewGUI/etable/ETableRowLabel.java b/src/com/romraider/NewGUI/etable/ETableRowLabel.java similarity index 90% rename from src/enginuity/NewGUI/etable/ETableRowLabel.java rename to src/com/romraider/NewGUI/etable/ETableRowLabel.java index de731919..bef371c5 100644 --- a/src/enginuity/NewGUI/etable/ETableRowLabel.java +++ b/src/com/romraider/NewGUI/etable/ETableRowLabel.java @@ -1,4 +1,4 @@ -package enginuity.NewGUI.etable; +package com.romraider.NewGUI.etable; import javax.swing.table.AbstractTableModel; diff --git a/src/enginuity/NewGUI/etable/ETableSaveState.java b/src/com/romraider/NewGUI/etable/ETableSaveState.java similarity index 92% rename from src/enginuity/NewGUI/etable/ETableSaveState.java rename to src/com/romraider/NewGUI/etable/ETableSaveState.java index ae68b5a8..1314bb72 100644 --- a/src/enginuity/NewGUI/etable/ETableSaveState.java +++ b/src/com/romraider/NewGUI/etable/ETableSaveState.java @@ -1,4 +1,4 @@ -package enginuity.NewGUI.etable; +package com.romraider.NewGUI.etable; import org.apache.log4j.Logger; diff --git a/src/enginuity/NewGUI/etable/ETableSelectionListener.java b/src/com/romraider/NewGUI/etable/ETableSelectionListener.java similarity index 84% rename from src/enginuity/NewGUI/etable/ETableSelectionListener.java rename to src/com/romraider/NewGUI/etable/ETableSelectionListener.java index d01b4e81..0485661a 100644 --- a/src/enginuity/NewGUI/etable/ETableSelectionListener.java +++ b/src/com/romraider/NewGUI/etable/ETableSelectionListener.java @@ -1,4 +1,4 @@ -package enginuity.NewGUI.etable; +package com.romraider.NewGUI.etable; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; diff --git a/src/enginuity/NewGUI/etable/ETableToolBar.java b/src/com/romraider/NewGUI/etable/ETableToolBar.java similarity index 96% rename from src/enginuity/NewGUI/etable/ETableToolBar.java rename to src/com/romraider/NewGUI/etable/ETableToolBar.java index b4e6a0f1..ac3dbf18 100644 --- a/src/enginuity/NewGUI/etable/ETableToolBar.java +++ b/src/com/romraider/NewGUI/etable/ETableToolBar.java @@ -1,6 +1,6 @@ -package enginuity.NewGUI.etable; +package com.romraider.NewGUI.etable; -import enginuity.NewGUI.data.TableMetaData; +import com.romraider.NewGUI.data.TableMetaData; import org.apache.log4j.Logger; import javax.swing.AbstractAction; import javax.swing.Action; diff --git a/src/enginuity/NewGUI/etable/dataJPanel/DataJPanel1DString.java b/src/com/romraider/NewGUI/etable/dataJPanel/DataJPanel1DString.java similarity index 92% rename from src/enginuity/NewGUI/etable/dataJPanel/DataJPanel1DString.java rename to src/com/romraider/NewGUI/etable/dataJPanel/DataJPanel1DString.java index ee5d8075..bc28c95b 100644 --- a/src/enginuity/NewGUI/etable/dataJPanel/DataJPanel1DString.java +++ b/src/com/romraider/NewGUI/etable/dataJPanel/DataJPanel1DString.java @@ -1,6 +1,6 @@ -package enginuity.NewGUI.etable.dataJPanel; +package com.romraider.NewGUI.etable.dataJPanel; -import enginuity.NewGUI.data.TableMetaData; +import com.romraider.NewGUI.data.TableMetaData; import javax.swing.JMenuBar; import javax.swing.JPanel; import javax.swing.JScrollPane; diff --git a/src/enginuity/NewGUI/etable/dataJPanel/DataJPanel3DDouble.java b/src/com/romraider/NewGUI/etable/dataJPanel/DataJPanel3DDouble.java similarity index 90% rename from src/enginuity/NewGUI/etable/dataJPanel/DataJPanel3DDouble.java rename to src/com/romraider/NewGUI/etable/dataJPanel/DataJPanel3DDouble.java index e49d694f..698825bd 100644 --- a/src/enginuity/NewGUI/etable/dataJPanel/DataJPanel3DDouble.java +++ b/src/com/romraider/NewGUI/etable/dataJPanel/DataJPanel3DDouble.java @@ -1,13 +1,13 @@ -package enginuity.NewGUI.etable.dataJPanel; +package com.romraider.NewGUI.etable.dataJPanel; -import enginuity.NewGUI.data.TableMetaData; -import enginuity.NewGUI.etable.ETable; -import enginuity.NewGUI.etable.ETableMenuBar; -import enginuity.NewGUI.etable.ETableRowLabel; -import enginuity.NewGUI.etable.ETableSaveState; -import enginuity.NewGUI.etable.ETableToolBar; -import enginuity.NewGUI.etable.text.RotatedLabel; -import enginuity.NewGUI.tools.ClipBoardCopy; +import com.romraider.NewGUI.data.TableMetaData; +import com.romraider.NewGUI.etable.ETable; +import com.romraider.NewGUI.etable.ETableMenuBar; +import com.romraider.NewGUI.etable.ETableRowLabel; +import com.romraider.NewGUI.etable.ETableSaveState; +import com.romraider.NewGUI.etable.ETableToolBar; +import com.romraider.NewGUI.etable.text.RotatedLabel; +import com.romraider.NewGUI.tools.ClipBoardCopy; import org.apache.log4j.Logger; import javax.swing.JLabel; import javax.swing.JMenuBar; diff --git a/src/enginuity/NewGUI/etable/dataJPanel/DataJPanelInterface.java b/src/com/romraider/NewGUI/etable/dataJPanel/DataJPanelInterface.java similarity index 87% rename from src/enginuity/NewGUI/etable/dataJPanel/DataJPanelInterface.java rename to src/com/romraider/NewGUI/etable/dataJPanel/DataJPanelInterface.java index ff1b7289..464acd54 100644 --- a/src/enginuity/NewGUI/etable/dataJPanel/DataJPanelInterface.java +++ b/src/com/romraider/NewGUI/etable/dataJPanel/DataJPanelInterface.java @@ -1,4 +1,4 @@ -package enginuity.NewGUI.etable.dataJPanel; +package com.romraider.NewGUI.etable.dataJPanel; import javax.swing.JMenuBar; import javax.swing.JToolBar; diff --git a/src/enginuity/NewGUI/etable/text/RotatedLabel.java b/src/com/romraider/NewGUI/etable/text/RotatedLabel.java similarity index 94% rename from src/enginuity/NewGUI/etable/text/RotatedLabel.java rename to src/com/romraider/NewGUI/etable/text/RotatedLabel.java index 35561151..254affc1 100644 --- a/src/enginuity/NewGUI/etable/text/RotatedLabel.java +++ b/src/com/romraider/NewGUI/etable/text/RotatedLabel.java @@ -1,4 +1,4 @@ -package enginuity.NewGUI.etable.text; +package com.romraider.NewGUI.etable.text; import javax.swing.Icon; import javax.swing.JLabel; diff --git a/src/enginuity/NewGUI/interfaces/TuningEntity.java b/src/com/romraider/NewGUI/interfaces/TuningEntity.java similarity index 92% rename from src/enginuity/NewGUI/interfaces/TuningEntity.java rename to src/com/romraider/NewGUI/interfaces/TuningEntity.java index ce998d1f..3dfcc246 100644 --- a/src/enginuity/NewGUI/interfaces/TuningEntity.java +++ b/src/com/romraider/NewGUI/interfaces/TuningEntity.java @@ -1,4 +1,4 @@ -package enginuity.NewGUI.interfaces; +package com.romraider.NewGUI.interfaces; import javax.swing.JMenu; import javax.swing.JToolBar; diff --git a/src/enginuity/NewGUI/interfaces/TuningEntityListener.java b/src/com/romraider/NewGUI/interfaces/TuningEntityListener.java similarity index 90% rename from src/enginuity/NewGUI/interfaces/TuningEntityListener.java rename to src/com/romraider/NewGUI/interfaces/TuningEntityListener.java index 26bf2878..3c4047bb 100644 --- a/src/enginuity/NewGUI/interfaces/TuningEntityListener.java +++ b/src/com/romraider/NewGUI/interfaces/TuningEntityListener.java @@ -1,6 +1,6 @@ -package enginuity.NewGUI.interfaces; +package com.romraider.NewGUI.interfaces; -import enginuity.NewGUI.tree.ETreeNode; +import com.romraider.NewGUI.tree.ETreeNode; import javax.swing.JMenu; import javax.swing.JToolBar; import java.util.Vector; diff --git a/src/enginuity/NewGUI/tools/ClipBoardCopy.java b/src/com/romraider/NewGUI/tools/ClipBoardCopy.java similarity index 96% rename from src/enginuity/NewGUI/tools/ClipBoardCopy.java rename to src/com/romraider/NewGUI/tools/ClipBoardCopy.java index 382603d1..450d62ad 100644 --- a/src/enginuity/NewGUI/tools/ClipBoardCopy.java +++ b/src/com/romraider/NewGUI/tools/ClipBoardCopy.java @@ -1,6 +1,6 @@ -package enginuity.NewGUI.tools; +package com.romraider.NewGUI.tools; -import enginuity.NewGUI.etable.ETable; +import com.romraider.NewGUI.etable.ETable; import org.apache.log4j.Logger; import javax.swing.JComponent; import javax.swing.JOptionPane; diff --git a/src/enginuity/NewGUI/tools/FitData.java b/src/com/romraider/NewGUI/tools/FitData.java similarity index 95% rename from src/enginuity/NewGUI/tools/FitData.java rename to src/com/romraider/NewGUI/tools/FitData.java index 4b850bff..a3e7d88a 100644 --- a/src/enginuity/NewGUI/tools/FitData.java +++ b/src/com/romraider/NewGUI/tools/FitData.java @@ -1,4 +1,4 @@ -package enginuity.NewGUI.tools; +package com.romraider.NewGUI.tools; import Jama.Matrix; diff --git a/src/com/romraider/NewGUI/tools/RomRaiderDataTools.java b/src/com/romraider/NewGUI/tools/RomRaiderDataTools.java new file mode 100644 index 00000000..78714257 --- /dev/null +++ b/src/com/romraider/NewGUI/tools/RomRaiderDataTools.java @@ -0,0 +1,5 @@ +package com.romraider.NewGUI.tools; + +public class RomRaiderDataTools { + +} diff --git a/src/enginuity/NewGUI/tree/ETree.java b/src/com/romraider/NewGUI/tree/ETree.java similarity index 87% rename from src/enginuity/NewGUI/tree/ETree.java rename to src/com/romraider/NewGUI/tree/ETree.java index 58875309..b6eec620 100644 --- a/src/enginuity/NewGUI/tree/ETree.java +++ b/src/com/romraider/NewGUI/tree/ETree.java @@ -1,7 +1,7 @@ -package enginuity.NewGUI.tree; +package com.romraider.NewGUI.tree; -import enginuity.NewGUI.data.ApplicationStateManager; -import enginuity.NewGUI.data.TableMetaData; +import com.romraider.NewGUI.data.ApplicationStateManager; +import com.romraider.NewGUI.data.TableMetaData; import org.apache.log4j.Logger; import javax.swing.JTree; import java.awt.Font; @@ -37,7 +37,7 @@ public class ETree extends JTree implements MouseListener { if (selectedObject instanceof ETreeNode) { ETreeNode theNode = (ETreeNode) selectedObject; - ApplicationStateManager.getEnginuityInstance().addTuningGroupNameToTitle(theNode.getTableMetaData().getTableGroup()); + ApplicationStateManager.getRomRaiderInstance().addTuningGroupNameToTitle(theNode.getTableMetaData().getTableGroup()); String tableGroup = theNode.getTableMetaData().getTableGroup(); if (tableGroup != null && tableGroup != "") { ApplicationStateManager.setSelectedTuningGroup(tableGroup); @@ -48,7 +48,7 @@ public class ETree extends JTree implements MouseListener { LOGGER.debug("ETree Table data:" + theNode.getTableMetaData().getTableIdentifier()); Object[][] tableData = ApplicationStateManager.getCurrentTuningEntity().getTableData(theNode.getTableMetaData().getTableIdentifier()); LOGGER.debug("ETree size:" + tableData.length); - ApplicationStateManager.getEnginuityInstance().displayInternalFrameTable(tableData, theNode.getTableMetaData()); + ApplicationStateManager.getRomRaiderInstance().displayInternalFrameTable(tableData, theNode.getTableMetaData()); } } diff --git a/src/enginuity/NewGUI/tree/ETreeCellRenderer.java b/src/com/romraider/NewGUI/tree/ETreeCellRenderer.java similarity index 94% rename from src/enginuity/NewGUI/tree/ETreeCellRenderer.java rename to src/com/romraider/NewGUI/tree/ETreeCellRenderer.java index 3a58b8ff..0e96b1f5 100644 --- a/src/enginuity/NewGUI/tree/ETreeCellRenderer.java +++ b/src/com/romraider/NewGUI/tree/ETreeCellRenderer.java @@ -1,7 +1,7 @@ -package enginuity.NewGUI.tree; +package com.romraider.NewGUI.tree; -import enginuity.NewGUI.data.ApplicationStateManager; -import enginuity.NewGUI.data.TableMetaData; +import com.romraider.NewGUI.data.ApplicationStateManager; +import com.romraider.NewGUI.data.TableMetaData; import static javax.swing.BorderFactory.createLineBorder; import javax.swing.ImageIcon; import javax.swing.JLabel; diff --git a/src/enginuity/NewGUI/tree/ETreeNode.java b/src/com/romraider/NewGUI/tree/ETreeNode.java similarity index 82% rename from src/enginuity/NewGUI/tree/ETreeNode.java rename to src/com/romraider/NewGUI/tree/ETreeNode.java index b8817c45..cef16738 100644 --- a/src/enginuity/NewGUI/tree/ETreeNode.java +++ b/src/com/romraider/NewGUI/tree/ETreeNode.java @@ -1,7 +1,7 @@ -package enginuity.NewGUI.tree; +package com.romraider.NewGUI.tree; -import enginuity.NewGUI.data.ApplicationStateManager; -import enginuity.NewGUI.data.TableMetaData; +import com.romraider.NewGUI.data.ApplicationStateManager; +import com.romraider.NewGUI.data.TableMetaData; import javax.swing.tree.DefaultMutableTreeNode; public class ETreeNode extends DefaultMutableTreeNode { diff --git a/src/enginuity/Settings.java b/src/com/romraider/Settings.java similarity index 98% rename from src/enginuity/Settings.java rename to src/com/romraider/Settings.java index 7d235108..c8f7a430 100644 --- a/src/enginuity/Settings.java +++ b/src/com/romraider/Settings.java @@ -19,11 +19,11 @@ * */ -package enginuity; +package com.romraider; -import enginuity.io.connection.ConnectionProperties; -import enginuity.logger.ecu.definition.EcuDefinition; -import static enginuity.util.ParamChecker.checkNotNullOrEmpty; +import com.romraider.io.connection.ConnectionProperties; +import com.romraider.logger.ecu.definition.EcuDefinition; +import static com.romraider.util.ParamChecker.checkNotNullOrEmpty; import java.awt.Color; import java.awt.Dimension; import java.awt.Font; diff --git a/src/enginuity/Version.java.template b/src/com/romraider/Version.java.template similarity index 98% rename from src/enginuity/Version.java.template rename to src/com/romraider/Version.java.template index c976b40b..8c82feae 100644 --- a/src/enginuity/Version.java.template +++ b/src/com/romraider/Version.java.template @@ -21,7 +21,7 @@ * */ -package enginuity; +package com.romraider; public final class Version { public static final String PRODUCT_NAME = "@name.package@"; diff --git a/src/enginuity/io/connection/ConnectionProperties.java b/src/com/romraider/io/connection/ConnectionProperties.java similarity index 93% rename from src/enginuity/io/connection/ConnectionProperties.java rename to src/com/romraider/io/connection/ConnectionProperties.java index 90b78473..43f54384 100644 --- a/src/enginuity/io/connection/ConnectionProperties.java +++ b/src/com/romraider/io/connection/ConnectionProperties.java @@ -19,7 +19,7 @@ * */ -package enginuity.io.connection; +package com.romraider.io.connection; public interface ConnectionProperties { diff --git a/src/enginuity/io/connection/ConnectionPropertiesImpl.java b/src/com/romraider/io/connection/ConnectionPropertiesImpl.java similarity index 94% rename from src/enginuity/io/connection/ConnectionPropertiesImpl.java rename to src/com/romraider/io/connection/ConnectionPropertiesImpl.java index 7c2bce36..fa089932 100644 --- a/src/enginuity/io/connection/ConnectionPropertiesImpl.java +++ b/src/com/romraider/io/connection/ConnectionPropertiesImpl.java @@ -1,4 +1,4 @@ -package enginuity.io.connection; +package com.romraider.io.connection; public final class ConnectionPropertiesImpl implements ConnectionProperties { private final int baudRate; diff --git a/src/enginuity/io/connection/EcuConnection.java b/src/com/romraider/io/connection/EcuConnection.java similarity index 93% rename from src/enginuity/io/connection/EcuConnection.java rename to src/com/romraider/io/connection/EcuConnection.java index b99edc84..f99964a2 100644 --- a/src/enginuity/io/connection/EcuConnection.java +++ b/src/com/romraider/io/connection/EcuConnection.java @@ -19,7 +19,7 @@ * */ -package enginuity.io.connection; +package com.romraider.io.connection; public interface EcuConnection { diff --git a/src/enginuity/io/connection/EcuConnectionImpl.java b/src/com/romraider/io/connection/EcuConnectionImpl.java similarity index 87% rename from src/enginuity/io/connection/EcuConnectionImpl.java rename to src/com/romraider/io/connection/EcuConnectionImpl.java index d749963f..c516b832 100644 --- a/src/enginuity/io/connection/EcuConnectionImpl.java +++ b/src/com/romraider/io/connection/EcuConnectionImpl.java @@ -19,12 +19,12 @@ * */ -package enginuity.io.connection; +package com.romraider.io.connection; -import enginuity.logger.ecu.exception.SerialCommunicationException; -import static enginuity.util.ParamChecker.checkNotNull; -import static enginuity.util.ParamChecker.checkNotNullOrEmpty; -import static enginuity.util.ThreadUtil.sleep; +import com.romraider.logger.ecu.exception.SerialCommunicationException; +import static com.romraider.util.ParamChecker.checkNotNull; +import static com.romraider.util.ParamChecker.checkNotNullOrEmpty; +import static com.romraider.util.ThreadUtil.sleep; public final class EcuConnectionImpl implements EcuConnection { private final long sendTimeout; diff --git a/src/enginuity/io/connection/SerialConnection.java b/src/com/romraider/io/connection/SerialConnection.java similarity index 93% rename from src/enginuity/io/connection/SerialConnection.java rename to src/com/romraider/io/connection/SerialConnection.java index 48363063..3eaaf7b5 100644 --- a/src/enginuity/io/connection/SerialConnection.java +++ b/src/com/romraider/io/connection/SerialConnection.java @@ -19,7 +19,7 @@ * */ -package enginuity.io.connection; +package com.romraider.io.connection; import java.io.IOException; diff --git a/src/enginuity/io/connection/SerialConnectionImpl.java b/src/com/romraider/io/connection/SerialConnectionImpl.java similarity index 89% rename from src/enginuity/io/connection/SerialConnectionImpl.java rename to src/com/romraider/io/connection/SerialConnectionImpl.java index bbfc5ed5..a9e96ca3 100644 --- a/src/enginuity/io/connection/SerialConnectionImpl.java +++ b/src/com/romraider/io/connection/SerialConnectionImpl.java @@ -19,15 +19,15 @@ * */ -package enginuity.io.connection; +package com.romraider.io.connection; -import enginuity.logger.ecu.exception.NotConnectedException; -import enginuity.logger.ecu.exception.PortNotFoundException; -import enginuity.logger.ecu.exception.SerialCommunicationException; -import enginuity.logger.ecu.exception.UnsupportedPortTypeException; -import static enginuity.util.HexUtil.asHex; -import static enginuity.util.ParamChecker.checkNotNull; -import static enginuity.util.ParamChecker.checkNotNullOrEmpty; +import com.romraider.logger.ecu.exception.NotConnectedException; +import com.romraider.logger.ecu.exception.PortNotFoundException; +import com.romraider.logger.ecu.exception.SerialCommunicationException; +import com.romraider.logger.ecu.exception.UnsupportedPortTypeException; +import static com.romraider.util.HexUtil.asHex; +import static com.romraider.util.ParamChecker.checkNotNull; +import static com.romraider.util.ParamChecker.checkNotNullOrEmpty; import gnu.io.CommPortIdentifier; import static gnu.io.CommPortIdentifier.PORT_SERIAL; import static gnu.io.CommPortIdentifier.getPortIdentifier; diff --git a/src/enginuity/io/connection/TestSSMConnectionImpl.java b/src/com/romraider/io/connection/TestSSMConnectionImpl.java similarity index 79% rename from src/enginuity/io/connection/TestSSMConnectionImpl.java rename to src/com/romraider/io/connection/TestSSMConnectionImpl.java index 6aafc201..cf3f40a5 100644 --- a/src/enginuity/io/connection/TestSSMConnectionImpl.java +++ b/src/com/romraider/io/connection/TestSSMConnectionImpl.java @@ -1,27 +1,27 @@ -package enginuity.io.connection; +package com.romraider.io.connection; -import static enginuity.io.protocol.SSMChecksumCalculator.calculateChecksum; -import static enginuity.io.protocol.SSMProtocol.ADDRESS_SIZE; -import static enginuity.io.protocol.SSMProtocol.DATA_SIZE; -import static enginuity.io.protocol.SSMProtocol.DIAGNOSTIC_TOOL_ID; -import static enginuity.io.protocol.SSMProtocol.ECU_ID; -import static enginuity.io.protocol.SSMProtocol.ECU_INIT_COMMAND; -import static enginuity.io.protocol.SSMProtocol.HEADER; -import static enginuity.io.protocol.SSMProtocol.READ_ADDRESS_COMMAND; -import static enginuity.io.protocol.SSMProtocol.READ_ADDRESS_RESPONSE; -import static enginuity.io.protocol.SSMProtocol.READ_MEMORY_COMMAND; -import static enginuity.io.protocol.SSMProtocol.READ_MEMORY_RESPONSE; -import static enginuity.io.protocol.SSMProtocol.REQUEST_NON_DATA_BYTES; -import static enginuity.io.protocol.SSMProtocol.RESPONSE_NON_DATA_BYTES; -import static enginuity.io.protocol.SSMProtocol.WRITE_MEMORY_COMMAND; -import static enginuity.io.protocol.SSMProtocol.WRITE_MEMORY_RESPONSE; -import enginuity.logger.ecu.exception.SerialCommunicationException; -import static enginuity.util.ByteUtil.asInt; -import static enginuity.util.HexUtil.asBytes; -import static enginuity.util.HexUtil.asHex; -import static enginuity.util.ParamChecker.checkNotNull; -import static enginuity.util.ParamChecker.checkNotNullOrEmpty; -import static enginuity.util.ThreadUtil.sleep; +import static com.romraider.io.protocol.SSMChecksumCalculator.calculateChecksum; +import static com.romraider.io.protocol.SSMProtocol.ADDRESS_SIZE; +import static com.romraider.io.protocol.SSMProtocol.DATA_SIZE; +import static com.romraider.io.protocol.SSMProtocol.DIAGNOSTIC_TOOL_ID; +import static com.romraider.io.protocol.SSMProtocol.ECU_ID; +import static com.romraider.io.protocol.SSMProtocol.ECU_INIT_COMMAND; +import static com.romraider.io.protocol.SSMProtocol.HEADER; +import static com.romraider.io.protocol.SSMProtocol.READ_ADDRESS_COMMAND; +import static com.romraider.io.protocol.SSMProtocol.READ_ADDRESS_RESPONSE; +import static com.romraider.io.protocol.SSMProtocol.READ_MEMORY_COMMAND; +import static com.romraider.io.protocol.SSMProtocol.READ_MEMORY_RESPONSE; +import static com.romraider.io.protocol.SSMProtocol.REQUEST_NON_DATA_BYTES; +import static com.romraider.io.protocol.SSMProtocol.RESPONSE_NON_DATA_BYTES; +import static com.romraider.io.protocol.SSMProtocol.WRITE_MEMORY_COMMAND; +import static com.romraider.io.protocol.SSMProtocol.WRITE_MEMORY_RESPONSE; +import com.romraider.logger.ecu.exception.SerialCommunicationException; +import static com.romraider.util.ByteUtil.asInt; +import static com.romraider.util.HexUtil.asBytes; +import static com.romraider.util.HexUtil.asHex; +import static com.romraider.util.ParamChecker.checkNotNull; +import static com.romraider.util.ParamChecker.checkNotNullOrEmpty; +import static com.romraider.util.ThreadUtil.sleep; import org.apache.log4j.Logger; import java.util.Random; diff --git a/src/enginuity/io/port/SerialPortDiscoverer.java b/src/com/romraider/io/port/SerialPortDiscoverer.java similarity index 94% rename from src/enginuity/io/port/SerialPortDiscoverer.java rename to src/com/romraider/io/port/SerialPortDiscoverer.java index 9aa5d7c9..0171a45a 100644 --- a/src/enginuity/io/port/SerialPortDiscoverer.java +++ b/src/com/romraider/io/port/SerialPortDiscoverer.java @@ -19,7 +19,7 @@ * */ -package enginuity.io.port; +package com.romraider.io.port; import gnu.io.CommPortIdentifier; import java.util.List; diff --git a/src/enginuity/io/port/SerialPortDiscovererImpl.java b/src/com/romraider/io/port/SerialPortDiscovererImpl.java similarity index 95% rename from src/enginuity/io/port/SerialPortDiscovererImpl.java rename to src/com/romraider/io/port/SerialPortDiscovererImpl.java index c3ac06ce..c89ef03d 100644 --- a/src/enginuity/io/port/SerialPortDiscovererImpl.java +++ b/src/com/romraider/io/port/SerialPortDiscovererImpl.java @@ -19,7 +19,7 @@ * */ -package enginuity.io.port; +package com.romraider.io.port; import gnu.io.CommPortIdentifier; import static gnu.io.CommPortIdentifier.PORT_SERIAL; diff --git a/src/enginuity/io/port/SerialPortRefreshListener.java b/src/com/romraider/io/port/SerialPortRefreshListener.java similarity index 94% rename from src/enginuity/io/port/SerialPortRefreshListener.java rename to src/com/romraider/io/port/SerialPortRefreshListener.java index 1edf386c..1e224565 100644 --- a/src/enginuity/io/port/SerialPortRefreshListener.java +++ b/src/com/romraider/io/port/SerialPortRefreshListener.java @@ -19,7 +19,7 @@ * */ -package enginuity.io.port; +package com.romraider.io.port; import java.util.Set; diff --git a/src/enginuity/io/port/SerialPortRefresher.java b/src/com/romraider/io/port/SerialPortRefresher.java similarity index 91% rename from src/enginuity/io/port/SerialPortRefresher.java rename to src/com/romraider/io/port/SerialPortRefresher.java index bca0fee0..1eb67039 100644 --- a/src/enginuity/io/port/SerialPortRefresher.java +++ b/src/com/romraider/io/port/SerialPortRefresher.java @@ -19,10 +19,10 @@ * */ -package enginuity.io.port; +package com.romraider.io.port; -import static enginuity.util.ParamChecker.checkNotNull; -import static enginuity.util.ThreadUtil.sleep; +import static com.romraider.util.ParamChecker.checkNotNull; +import static com.romraider.util.ThreadUtil.sleep; import gnu.io.CommPortIdentifier; import javax.swing.SwingUtilities; import java.util.List; diff --git a/src/enginuity/io/protocol/Protocol.java b/src/com/romraider/io/protocol/Protocol.java similarity index 88% rename from src/enginuity/io/protocol/Protocol.java rename to src/com/romraider/io/protocol/Protocol.java index e702c965..708270bc 100644 --- a/src/enginuity/io/protocol/Protocol.java +++ b/src/com/romraider/io/protocol/Protocol.java @@ -19,10 +19,10 @@ * */ -package enginuity.io.protocol; +package com.romraider.io.protocol; -import enginuity.io.connection.ConnectionProperties; -import enginuity.logger.ecu.comms.query.EcuInit; +import com.romraider.io.connection.ConnectionProperties; +import com.romraider.logger.ecu.comms.query.EcuInit; public interface Protocol { diff --git a/src/enginuity/io/protocol/ProtocolFactory.java b/src/com/romraider/io/protocol/ProtocolFactory.java similarity index 90% rename from src/enginuity/io/protocol/ProtocolFactory.java rename to src/com/romraider/io/protocol/ProtocolFactory.java index 5246cf09..882a2700 100644 --- a/src/enginuity/io/protocol/ProtocolFactory.java +++ b/src/com/romraider/io/protocol/ProtocolFactory.java @@ -19,9 +19,9 @@ * */ -package enginuity.io.protocol; +package com.romraider.io.protocol; -import enginuity.logger.ecu.exception.UnsupportedProtocolException; +import com.romraider.logger.ecu.exception.UnsupportedProtocolException; public final class ProtocolFactory { private static final ProtocolFactory INSTANCE = new ProtocolFactory(); diff --git a/src/enginuity/io/protocol/SSMChecksumCalculator.java b/src/com/romraider/io/protocol/SSMChecksumCalculator.java similarity index 87% rename from src/enginuity/io/protocol/SSMChecksumCalculator.java rename to src/com/romraider/io/protocol/SSMChecksumCalculator.java index e299c201..4928c567 100644 --- a/src/enginuity/io/protocol/SSMChecksumCalculator.java +++ b/src/com/romraider/io/protocol/SSMChecksumCalculator.java @@ -19,10 +19,10 @@ * */ -package enginuity.io.protocol; +package com.romraider.io.protocol; -import static enginuity.util.ByteUtil.asByte; -import static enginuity.util.ByteUtil.asInt; +import static com.romraider.util.ByteUtil.asByte; +import static com.romraider.util.ByteUtil.asInt; public final class SSMChecksumCalculator { diff --git a/src/enginuity/io/protocol/SSMProtocol.java b/src/com/romraider/io/protocol/SSMProtocol.java similarity index 86% rename from src/enginuity/io/protocol/SSMProtocol.java rename to src/com/romraider/io/protocol/SSMProtocol.java index 7982adb7..e4987f85 100644 --- a/src/enginuity/io/protocol/SSMProtocol.java +++ b/src/com/romraider/io/protocol/SSMProtocol.java @@ -19,21 +19,21 @@ * */ -package enginuity.io.protocol; +package com.romraider.io.protocol; -import enginuity.io.connection.ConnectionProperties; -import static enginuity.io.protocol.SSMChecksumCalculator.calculateChecksum; -import static enginuity.io.protocol.SSMResponseProcessor.extractResponseData; -import static enginuity.io.protocol.SSMResponseProcessor.filterRequestFromResponse; -import static enginuity.io.protocol.SSMResponseProcessor.validateResponse; -import enginuity.logger.ecu.comms.query.EcuInit; -import enginuity.logger.ecu.comms.query.SSMEcuInit; -import enginuity.logger.ecu.exception.InvalidResponseException; -import static enginuity.util.ByteUtil.asByte; -import static enginuity.util.HexUtil.asHex; -import static enginuity.util.ParamChecker.checkGreaterThanZero; -import static enginuity.util.ParamChecker.checkNotNull; -import static enginuity.util.ParamChecker.checkNotNullOrEmpty; +import com.romraider.io.connection.ConnectionProperties; +import static com.romraider.io.protocol.SSMChecksumCalculator.calculateChecksum; +import static com.romraider.io.protocol.SSMResponseProcessor.extractResponseData; +import static com.romraider.io.protocol.SSMResponseProcessor.filterRequestFromResponse; +import static com.romraider.io.protocol.SSMResponseProcessor.validateResponse; +import com.romraider.logger.ecu.comms.query.EcuInit; +import com.romraider.logger.ecu.comms.query.SSMEcuInit; +import com.romraider.logger.ecu.exception.InvalidResponseException; +import static com.romraider.util.ByteUtil.asByte; +import static com.romraider.util.HexUtil.asHex; +import static com.romraider.util.ParamChecker.checkGreaterThanZero; +import static com.romraider.util.ParamChecker.checkNotNull; +import static com.romraider.util.ParamChecker.checkNotNullOrEmpty; public final class SSMProtocol implements Protocol { public static final byte HEADER = (byte) 0x80; diff --git a/src/enginuity/io/protocol/SSMResponseProcessor.java b/src/com/romraider/io/protocol/SSMResponseProcessor.java similarity index 77% rename from src/enginuity/io/protocol/SSMResponseProcessor.java rename to src/com/romraider/io/protocol/SSMResponseProcessor.java index 0b29dc6a..b6691c42 100644 --- a/src/enginuity/io/protocol/SSMResponseProcessor.java +++ b/src/com/romraider/io/protocol/SSMResponseProcessor.java @@ -19,23 +19,23 @@ * */ -package enginuity.io.protocol; +package com.romraider.io.protocol; -import static enginuity.io.protocol.SSMChecksumCalculator.calculateChecksum; -import static enginuity.io.protocol.SSMProtocol.DIAGNOSTIC_TOOL_ID; -import static enginuity.io.protocol.SSMProtocol.ECU_ID; -import static enginuity.io.protocol.SSMProtocol.ECU_INIT_RESPONSE; -import static enginuity.io.protocol.SSMProtocol.HEADER; -import static enginuity.io.protocol.SSMProtocol.READ_ADDRESS_RESPONSE; -import static enginuity.io.protocol.SSMProtocol.READ_MEMORY_RESPONSE; -import static enginuity.io.protocol.SSMProtocol.RESPONSE_NON_DATA_BYTES; -import static enginuity.io.protocol.SSMProtocol.WRITE_ADDRESS_RESPONSE; -import static enginuity.io.protocol.SSMProtocol.WRITE_MEMORY_RESPONSE; -import enginuity.logger.ecu.exception.InvalidResponseException; -import static enginuity.util.ByteUtil.asByte; -import static enginuity.util.HexUtil.asHex; -import static enginuity.util.ParamChecker.checkNotNull; -import static enginuity.util.ParamChecker.checkNotNullOrEmpty; +import static com.romraider.io.protocol.SSMChecksumCalculator.calculateChecksum; +import static com.romraider.io.protocol.SSMProtocol.DIAGNOSTIC_TOOL_ID; +import static com.romraider.io.protocol.SSMProtocol.ECU_ID; +import static com.romraider.io.protocol.SSMProtocol.ECU_INIT_RESPONSE; +import static com.romraider.io.protocol.SSMProtocol.HEADER; +import static com.romraider.io.protocol.SSMProtocol.READ_ADDRESS_RESPONSE; +import static com.romraider.io.protocol.SSMProtocol.READ_MEMORY_RESPONSE; +import static com.romraider.io.protocol.SSMProtocol.RESPONSE_NON_DATA_BYTES; +import static com.romraider.io.protocol.SSMProtocol.WRITE_ADDRESS_RESPONSE; +import static com.romraider.io.protocol.SSMProtocol.WRITE_MEMORY_RESPONSE; +import com.romraider.logger.ecu.exception.InvalidResponseException; +import static com.romraider.util.ByteUtil.asByte; +import static com.romraider.util.HexUtil.asHex; +import static com.romraider.util.ParamChecker.checkNotNull; +import static com.romraider.util.ParamChecker.checkNotNullOrEmpty; public final class SSMResponseProcessor { diff --git a/src/enginuity/logger/aem/io/AemConnection.java b/src/com/romraider/logger/aem/io/AemConnection.java similarity index 62% rename from src/enginuity/logger/aem/io/AemConnection.java rename to src/com/romraider/logger/aem/io/AemConnection.java index dd06bf2a..fe56f2c3 100644 --- a/src/enginuity/logger/aem/io/AemConnection.java +++ b/src/com/romraider/logger/aem/io/AemConnection.java @@ -1,4 +1,4 @@ -package enginuity.logger.aem.io; +package com.romraider.logger.aem.io; public interface AemConnection { byte[] read(); diff --git a/src/enginuity/logger/aem/io/AemConnectionImpl.java b/src/com/romraider/logger/aem/io/AemConnectionImpl.java similarity index 82% rename from src/enginuity/logger/aem/io/AemConnectionImpl.java rename to src/com/romraider/logger/aem/io/AemConnectionImpl.java index 02e586a9..b4aeb33d 100644 --- a/src/enginuity/logger/aem/io/AemConnectionImpl.java +++ b/src/com/romraider/logger/aem/io/AemConnectionImpl.java @@ -1,13 +1,13 @@ -package enginuity.logger.aem.io; +package com.romraider.logger.aem.io; -import enginuity.io.connection.ConnectionProperties; -import enginuity.io.connection.SerialConnection; -import enginuity.io.connection.SerialConnectionImpl; -import enginuity.logger.ecu.exception.SerialCommunicationException; -import static enginuity.util.HexUtil.asHex; -import static enginuity.util.ParamChecker.checkNotNull; -import static enginuity.util.ParamChecker.checkNotNullOrEmpty; -import static enginuity.util.ThreadUtil.sleep; +import com.romraider.io.connection.ConnectionProperties; +import com.romraider.io.connection.SerialConnection; +import com.romraider.io.connection.SerialConnectionImpl; +import com.romraider.logger.ecu.exception.SerialCommunicationException; +import static com.romraider.util.HexUtil.asHex; +import static com.romraider.util.ParamChecker.checkNotNull; +import static com.romraider.util.ParamChecker.checkNotNullOrEmpty; +import static com.romraider.util.ThreadUtil.sleep; import org.apache.log4j.Logger; import static java.lang.System.currentTimeMillis; import java.util.ArrayList; diff --git a/src/enginuity/logger/aem/io/AemConnectionProperties.java b/src/com/romraider/logger/aem/io/AemConnectionProperties.java similarity index 79% rename from src/enginuity/logger/aem/io/AemConnectionProperties.java rename to src/com/romraider/logger/aem/io/AemConnectionProperties.java index 34a9766f..f425bc1f 100644 --- a/src/enginuity/logger/aem/io/AemConnectionProperties.java +++ b/src/com/romraider/logger/aem/io/AemConnectionProperties.java @@ -1,6 +1,6 @@ -package enginuity.logger.aem.io; +package com.romraider.logger.aem.io; -import enginuity.io.connection.ConnectionProperties; +import com.romraider.io.connection.ConnectionProperties; public final class AemConnectionProperties implements ConnectionProperties { public int getBaudRate() { diff --git a/src/enginuity/logger/aem/io/AemRunner.java b/src/com/romraider/logger/aem/io/AemRunner.java similarity index 61% rename from src/enginuity/logger/aem/io/AemRunner.java rename to src/com/romraider/logger/aem/io/AemRunner.java index ef286424..397649c6 100644 --- a/src/enginuity/logger/aem/io/AemRunner.java +++ b/src/com/romraider/logger/aem/io/AemRunner.java @@ -1,4 +1,4 @@ -package enginuity.logger.aem.io; +package com.romraider.logger.aem.io; public interface AemRunner extends Runnable { void stop(); diff --git a/src/enginuity/logger/aem/io/AemRunnerImpl.java b/src/com/romraider/logger/aem/io/AemRunnerImpl.java similarity index 79% rename from src/enginuity/logger/aem/io/AemRunnerImpl.java rename to src/com/romraider/logger/aem/io/AemRunnerImpl.java index 6a9a7db1..8e055195 100644 --- a/src/enginuity/logger/aem/io/AemRunnerImpl.java +++ b/src/com/romraider/logger/aem/io/AemRunnerImpl.java @@ -1,7 +1,7 @@ -package enginuity.logger.aem.io; +package com.romraider.logger.aem.io; -import enginuity.logger.aem.plugin.AemSettings; -import enginuity.logger.aem.plugin.DataListener; +import com.romraider.logger.aem.plugin.AemSettings; +import com.romraider.logger.aem.plugin.DataListener; public final class AemRunnerImpl implements AemRunner { private final AemConnection connection; diff --git a/src/enginuity/logger/aem/plugin/AemConvertor.java b/src/com/romraider/logger/aem/plugin/AemConvertor.java similarity index 60% rename from src/enginuity/logger/aem/plugin/AemConvertor.java rename to src/com/romraider/logger/aem/plugin/AemConvertor.java index 41fa8ca9..67981a32 100644 --- a/src/enginuity/logger/aem/plugin/AemConvertor.java +++ b/src/com/romraider/logger/aem/plugin/AemConvertor.java @@ -1,4 +1,4 @@ -package enginuity.logger.aem.plugin; +package com.romraider.logger.aem.plugin; public interface AemConvertor { double convert(byte[] bytes); diff --git a/src/enginuity/logger/aem/plugin/AemConvertorImpl.java b/src/com/romraider/logger/aem/plugin/AemConvertorImpl.java similarity index 86% rename from src/enginuity/logger/aem/plugin/AemConvertorImpl.java rename to src/com/romraider/logger/aem/plugin/AemConvertorImpl.java index b3826710..e692cb6f 100644 --- a/src/enginuity/logger/aem/plugin/AemConvertorImpl.java +++ b/src/com/romraider/logger/aem/plugin/AemConvertorImpl.java @@ -1,6 +1,6 @@ -package enginuity.logger.aem.plugin; +package com.romraider.logger.aem.plugin; -import static enginuity.util.HexUtil.asHex; +import static com.romraider.util.HexUtil.asHex; import org.apache.log4j.Logger; public final class AemConvertorImpl implements AemConvertor { diff --git a/src/enginuity/logger/aem/plugin/AemDataItem.java b/src/com/romraider/logger/aem/plugin/AemDataItem.java similarity index 82% rename from src/enginuity/logger/aem/plugin/AemDataItem.java rename to src/com/romraider/logger/aem/plugin/AemDataItem.java index a59c2136..930e06f1 100644 --- a/src/enginuity/logger/aem/plugin/AemDataItem.java +++ b/src/com/romraider/logger/aem/plugin/AemDataItem.java @@ -1,6 +1,6 @@ -package enginuity.logger.aem.plugin; +package com.romraider.logger.aem.plugin; -import enginuity.logger.ecu.external.ExternalDataItem; +import com.romraider.logger.ecu.external.ExternalDataItem; public final class AemDataItem implements ExternalDataItem, DataListener { private final AemConvertor convertor = new AemConvertorImpl(); diff --git a/src/enginuity/logger/aem/plugin/AemDataSource.java b/src/com/romraider/logger/aem/plugin/AemDataSource.java similarity index 69% rename from src/enginuity/logger/aem/plugin/AemDataSource.java rename to src/com/romraider/logger/aem/plugin/AemDataSource.java index 5760c855..63743eae 100644 --- a/src/enginuity/logger/aem/plugin/AemDataSource.java +++ b/src/com/romraider/logger/aem/plugin/AemDataSource.java @@ -1,11 +1,11 @@ -package enginuity.logger.aem.plugin; +package com.romraider.logger.aem.plugin; -import enginuity.logger.aem.io.AemRunnerImpl; -import enginuity.logger.ecu.EcuLogger; -import enginuity.logger.ecu.external.ExternalDataItem; -import enginuity.logger.ecu.external.ExternalDataSource; -import enginuity.logger.ecu.ui.swing.menubar.action.GenericPluginMenuAction; -import static enginuity.util.ThreadUtil.runAsDaemon; +import com.romraider.logger.aem.io.AemRunnerImpl; +import com.romraider.logger.ecu.EcuLogger; +import com.romraider.logger.ecu.external.ExternalDataItem; +import com.romraider.logger.ecu.external.ExternalDataSource; +import com.romraider.logger.ecu.ui.swing.menubar.action.GenericPluginMenuAction; +import static com.romraider.util.ThreadUtil.runAsDaemon; import javax.swing.Action; import static java.util.Arrays.asList; import java.util.List; diff --git a/src/enginuity/logger/aem/plugin/AemSettings.java b/src/com/romraider/logger/aem/plugin/AemSettings.java similarity index 64% rename from src/enginuity/logger/aem/plugin/AemSettings.java rename to src/com/romraider/logger/aem/plugin/AemSettings.java index ed2491d6..3c5bf0db 100644 --- a/src/enginuity/logger/aem/plugin/AemSettings.java +++ b/src/com/romraider/logger/aem/plugin/AemSettings.java @@ -1,4 +1,4 @@ -package enginuity.logger.aem.plugin; +package com.romraider.logger.aem.plugin; public interface AemSettings { void setPort(String port); diff --git a/src/enginuity/logger/aem/plugin/AemSettingsImpl.java b/src/com/romraider/logger/aem/plugin/AemSettingsImpl.java similarity index 80% rename from src/enginuity/logger/aem/plugin/AemSettingsImpl.java rename to src/com/romraider/logger/aem/plugin/AemSettingsImpl.java index b5e4e6dd..1e994269 100644 --- a/src/enginuity/logger/aem/plugin/AemSettingsImpl.java +++ b/src/com/romraider/logger/aem/plugin/AemSettingsImpl.java @@ -1,4 +1,4 @@ -package enginuity.logger.aem.plugin; +package com.romraider.logger.aem.plugin; public final class AemSettingsImpl implements AemSettings { private String port; diff --git a/src/enginuity/logger/aem/plugin/DataListener.java b/src/com/romraider/logger/aem/plugin/DataListener.java similarity index 59% rename from src/enginuity/logger/aem/plugin/DataListener.java rename to src/com/romraider/logger/aem/plugin/DataListener.java index c0f663c6..7f5628f0 100644 --- a/src/enginuity/logger/aem/plugin/DataListener.java +++ b/src/com/romraider/logger/aem/plugin/DataListener.java @@ -1,4 +1,4 @@ -package enginuity.logger.aem.plugin; +package com.romraider.logger.aem.plugin; public interface DataListener { void setBytes(byte[] bytes); diff --git a/src/enginuity/logger/ecu/EcuLogger.java b/src/com/romraider/logger/ecu/EcuLogger.java similarity index 88% rename from src/enginuity/logger/ecu/EcuLogger.java rename to src/com/romraider/logger/ecu/EcuLogger.java index fe380e51..7dcb67ee 100644 --- a/src/enginuity/logger/ecu/EcuLogger.java +++ b/src/com/romraider/logger/ecu/EcuLogger.java @@ -19,69 +19,69 @@ * */ -package enginuity.logger.ecu; +package com.romraider.logger.ecu; -import enginuity.ECUEditor; -import enginuity.Settings; -import enginuity.io.port.SerialPortRefresher; -import enginuity.logger.ecu.comms.controller.LoggerController; -import enginuity.logger.ecu.comms.controller.LoggerControllerImpl; -import enginuity.logger.ecu.comms.query.EcuInit; -import enginuity.logger.ecu.comms.query.EcuInitCallback; -import enginuity.logger.ecu.comms.reset.ResetManager; -import enginuity.logger.ecu.comms.reset.ResetManagerImpl; -import enginuity.logger.ecu.definition.EcuDataLoader; -import enginuity.logger.ecu.definition.EcuDataLoaderImpl; -import enginuity.logger.ecu.definition.EcuDefinition; -import enginuity.logger.ecu.definition.EcuParameter; -import enginuity.logger.ecu.definition.EcuSwitch; -import enginuity.logger.ecu.definition.ExternalData; -import enginuity.logger.ecu.definition.ExternalDataImpl; -import enginuity.logger.ecu.definition.LoggerData; -import enginuity.logger.ecu.external.ExternalDataItem; -import enginuity.logger.ecu.external.ExternalDataSource; -import enginuity.logger.ecu.external.ExternalDataSourceLoader; -import enginuity.logger.ecu.external.ExternalDataSourceLoaderImpl; -import enginuity.logger.ecu.profile.UserProfile; -import enginuity.logger.ecu.profile.UserProfileImpl; -import enginuity.logger.ecu.profile.UserProfileItem; -import enginuity.logger.ecu.profile.UserProfileItemImpl; -import enginuity.logger.ecu.profile.UserProfileLoader; -import enginuity.logger.ecu.profile.UserProfileLoaderImpl; -import enginuity.logger.ecu.ui.DataRegistrationBroker; -import enginuity.logger.ecu.ui.DataRegistrationBrokerImpl; -import enginuity.logger.ecu.ui.EcuDataComparator; -import enginuity.logger.ecu.ui.MessageListener; -import enginuity.logger.ecu.ui.SerialPortComboBox; -import enginuity.logger.ecu.ui.StatusIndicator; -import enginuity.logger.ecu.ui.handler.DataUpdateHandlerManager; -import enginuity.logger.ecu.ui.handler.DataUpdateHandlerManagerImpl; -import enginuity.logger.ecu.ui.handler.dash.DashboardUpdateHandler; -import enginuity.logger.ecu.ui.handler.file.FileLoggerControllerSwitchHandler; -import enginuity.logger.ecu.ui.handler.file.FileLoggerControllerSwitchMonitorImpl; -import enginuity.logger.ecu.ui.handler.file.FileUpdateHandlerImpl; -import enginuity.logger.ecu.ui.handler.graph.GraphUpdateHandler; -import enginuity.logger.ecu.ui.handler.injector.InjectorUpdateHandler; -import enginuity.logger.ecu.ui.handler.livedata.LiveDataTableModel; -import enginuity.logger.ecu.ui.handler.livedata.LiveDataUpdateHandler; -import enginuity.logger.ecu.ui.handler.maf.MafUpdateHandler; -import enginuity.logger.ecu.ui.handler.table.TableUpdateHandler; -import enginuity.logger.ecu.ui.paramlist.ParameterListTable; -import enginuity.logger.ecu.ui.paramlist.ParameterListTableModel; -import enginuity.logger.ecu.ui.paramlist.ParameterRow; -import enginuity.logger.ecu.ui.playback.PlaybackManagerImpl; -import enginuity.logger.ecu.ui.swing.menubar.EcuLoggerMenuBar; -import enginuity.logger.ecu.ui.swing.menubar.action.ToggleButtonAction; -import enginuity.logger.ecu.ui.tab.injector.InjectorTab; -import enginuity.logger.ecu.ui.tab.injector.InjectorTabImpl; -import enginuity.logger.ecu.ui.tab.maf.MafTab; -import enginuity.logger.ecu.ui.tab.maf.MafTabImpl; -import static enginuity.util.ParamChecker.checkNotNull; -import static enginuity.util.ParamChecker.isNullOrEmpty; -import enginuity.util.SettingsManagerImpl; -import enginuity.util.ThreadUtil; -import static enginuity.util.ThreadUtil.runAsDaemon; -import static enginuity.util.ThreadUtil.sleep; +import com.romraider.ECUEditor; +import com.romraider.Settings; +import com.romraider.io.port.SerialPortRefresher; +import com.romraider.logger.ecu.comms.controller.LoggerController; +import com.romraider.logger.ecu.comms.controller.LoggerControllerImpl; +import com.romraider.logger.ecu.comms.query.EcuInit; +import com.romraider.logger.ecu.comms.query.EcuInitCallback; +import com.romraider.logger.ecu.comms.reset.ResetManager; +import com.romraider.logger.ecu.comms.reset.ResetManagerImpl; +import com.romraider.logger.ecu.definition.EcuDataLoader; +import com.romraider.logger.ecu.definition.EcuDataLoaderImpl; +import com.romraider.logger.ecu.definition.EcuDefinition; +import com.romraider.logger.ecu.definition.EcuParameter; +import com.romraider.logger.ecu.definition.EcuSwitch; +import com.romraider.logger.ecu.definition.ExternalData; +import com.romraider.logger.ecu.definition.ExternalDataImpl; +import com.romraider.logger.ecu.definition.LoggerData; +import com.romraider.logger.ecu.external.ExternalDataItem; +import com.romraider.logger.ecu.external.ExternalDataSource; +import com.romraider.logger.ecu.external.ExternalDataSourceLoader; +import com.romraider.logger.ecu.external.ExternalDataSourceLoaderImpl; +import com.romraider.logger.ecu.profile.UserProfile; +import com.romraider.logger.ecu.profile.UserProfileImpl; +import com.romraider.logger.ecu.profile.UserProfileItem; +import com.romraider.logger.ecu.profile.UserProfileItemImpl; +import com.romraider.logger.ecu.profile.UserProfileLoader; +import com.romraider.logger.ecu.profile.UserProfileLoaderImpl; +import com.romraider.logger.ecu.ui.DataRegistrationBroker; +import com.romraider.logger.ecu.ui.DataRegistrationBrokerImpl; +import com.romraider.logger.ecu.ui.EcuDataComparator; +import com.romraider.logger.ecu.ui.MessageListener; +import com.romraider.logger.ecu.ui.SerialPortComboBox; +import com.romraider.logger.ecu.ui.StatusIndicator; +import com.romraider.logger.ecu.ui.handler.DataUpdateHandlerManager; +import com.romraider.logger.ecu.ui.handler.DataUpdateHandlerManagerImpl; +import com.romraider.logger.ecu.ui.handler.dash.DashboardUpdateHandler; +import com.romraider.logger.ecu.ui.handler.file.FileLoggerControllerSwitchHandler; +import com.romraider.logger.ecu.ui.handler.file.FileLoggerControllerSwitchMonitorImpl; +import com.romraider.logger.ecu.ui.handler.file.FileUpdateHandlerImpl; +import com.romraider.logger.ecu.ui.handler.graph.GraphUpdateHandler; +import com.romraider.logger.ecu.ui.handler.injector.InjectorUpdateHandler; +import com.romraider.logger.ecu.ui.handler.livedata.LiveDataTableModel; +import com.romraider.logger.ecu.ui.handler.livedata.LiveDataUpdateHandler; +import com.romraider.logger.ecu.ui.handler.maf.MafUpdateHandler; +import com.romraider.logger.ecu.ui.handler.table.TableUpdateHandler; +import com.romraider.logger.ecu.ui.paramlist.ParameterListTable; +import com.romraider.logger.ecu.ui.paramlist.ParameterListTableModel; +import com.romraider.logger.ecu.ui.paramlist.ParameterRow; +import com.romraider.logger.ecu.ui.playback.PlaybackManagerImpl; +import com.romraider.logger.ecu.ui.swing.menubar.EcuLoggerMenuBar; +import com.romraider.logger.ecu.ui.swing.menubar.action.ToggleButtonAction; +import com.romraider.logger.ecu.ui.tab.injector.InjectorTab; +import com.romraider.logger.ecu.ui.tab.injector.InjectorTabImpl; +import com.romraider.logger.ecu.ui.tab.maf.MafTab; +import com.romraider.logger.ecu.ui.tab.maf.MafTabImpl; +import static com.romraider.util.ParamChecker.checkNotNull; +import static com.romraider.util.ParamChecker.isNullOrEmpty; +import com.romraider.util.SettingsManagerImpl; +import com.romraider.util.ThreadUtil; +import static com.romraider.util.ThreadUtil.runAsDaemon; +import static com.romraider.util.ThreadUtil.sleep; import org.apache.log4j.Logger; import static javax.swing.BorderFactory.createLoweredBevelBorder; import javax.swing.ImageIcon; @@ -149,7 +149,7 @@ TODO: Add log analysis tab (or maybe new window?), including log playback, custo public final class EcuLogger extends JFrame implements WindowListener, PropertyChangeListener, MessageListener { private static final Logger LOGGER = Logger.getLogger(EcuLogger.class); - private static final String ENGINUITY_ECU_LOGGER_TITLE = "RomRaider ECU Logger"; + private static final String ECU_LOGGER_TITLE = "RomRaider ECU Logger"; private static final String HEADING_PARAMETERS = "Parameters"; private static final String HEADING_SWITCHES = "Switches"; private static final String HEADING_EXTERNAL = "External"; @@ -202,12 +202,12 @@ public final class EcuLogger extends JFrame implements WindowListener, PropertyC private List ecuParams; public EcuLogger(Settings settings) { - super(ENGINUITY_ECU_LOGGER_TITLE); + super(ECU_LOGGER_TITLE); construct(settings); } public EcuLogger(ECUEditor ecuEditor) { - super(ENGINUITY_ECU_LOGGER_TITLE); + super(ECU_LOGGER_TITLE); this.ecuEditor = ecuEditor; construct(ecuEditor.getSettings()); } @@ -272,7 +272,7 @@ public final class EcuLogger extends JFrame implements WindowListener, PropertyC injectorTab = new InjectorTabImpl(injectorTabBroker, ecuEditor); injectorUpdateHandler.setInjectorTab(injectorTab); resetManager = new ResetManagerImpl(settings, this); - messageLabel = new JLabel(ENGINUITY_ECU_LOGGER_TITLE); + messageLabel = new JLabel(ECU_LOGGER_TITLE); calIdLabel = new JLabel(buildEcuInfoLabelText(CAL_ID_LABEL, null)); ecuIdLabel = new JLabel(buildEcuInfoLabelText(ECU_ID_LABEL, null)); statsLabel = buildStatsLabel(); @@ -1008,8 +1008,8 @@ public final class EcuLogger extends JFrame implements WindowListener, PropertyC public void setTitle(String title) { if (title != null) { - if (!title.startsWith(ENGINUITY_ECU_LOGGER_TITLE)) { - title = ENGINUITY_ECU_LOGGER_TITLE + (title.length() == 0 ? "" : " - " + title); + if (!title.startsWith(ECU_LOGGER_TITLE)) { + title = ECU_LOGGER_TITLE + (title.length() == 0 ? "" : " - " + title); } super.setTitle(title); } @@ -1047,7 +1047,7 @@ public final class EcuLogger extends JFrame implements WindowListener, PropertyC // set remaining window properties ecuLogger.pack(); ecuLogger.setSize(settings.getLoggerWindowSize()); - ecuLogger.setIconImage(new ImageIcon("./graphics/enginuity-ico.gif").getImage()); + ecuLogger.setIconImage(new ImageIcon("./graphics/romraider-ico.gif").getImage()); ecuLogger.addWindowListener(ecuLogger); // display the window diff --git a/src/enginuity/logger/ecu/EcuLoggerExec.java b/src/com/romraider/logger/ecu/EcuLoggerExec.java similarity index 88% rename from src/enginuity/logger/ecu/EcuLoggerExec.java rename to src/com/romraider/logger/ecu/EcuLoggerExec.java index 06407990..12adfd0a 100644 --- a/src/enginuity/logger/ecu/EcuLoggerExec.java +++ b/src/com/romraider/logger/ecu/EcuLoggerExec.java @@ -19,12 +19,12 @@ * */ -package enginuity.logger.ecu; +package com.romraider.logger.ecu; -import enginuity.Settings; -import enginuity.swing.LookAndFeelManager; -import enginuity.util.LogManager; -import enginuity.util.SettingsManagerImpl; +import com.romraider.Settings; +import com.romraider.swing.LookAndFeelManager; +import com.romraider.util.LogManager; +import com.romraider.util.SettingsManagerImpl; import static javax.swing.WindowConstants.EXIT_ON_CLOSE; public final class EcuLoggerExec { diff --git a/src/enginuity/logger/ecu/comms/controller/LoggerController.java b/src/com/romraider/logger/ecu/comms/controller/LoggerController.java similarity index 80% rename from src/enginuity/logger/ecu/comms/controller/LoggerController.java rename to src/com/romraider/logger/ecu/comms/controller/LoggerController.java index 55f21e66..c8fa30f8 100644 --- a/src/enginuity/logger/ecu/comms/controller/LoggerController.java +++ b/src/com/romraider/logger/ecu/comms/controller/LoggerController.java @@ -19,11 +19,11 @@ * */ -package enginuity.logger.ecu.comms.controller; +package com.romraider.logger.ecu.comms.controller; -import enginuity.logger.ecu.definition.LoggerData; -import enginuity.logger.ecu.ui.StatusChangeListener; -import enginuity.logger.ecu.ui.handler.file.FileLoggerControllerSwitchMonitor; +import com.romraider.logger.ecu.definition.LoggerData; +import com.romraider.logger.ecu.ui.StatusChangeListener; +import com.romraider.logger.ecu.ui.handler.file.FileLoggerControllerSwitchMonitor; public interface LoggerController { diff --git a/src/enginuity/logger/ecu/comms/controller/LoggerControllerImpl.java b/src/com/romraider/logger/ecu/comms/controller/LoggerControllerImpl.java similarity index 78% rename from src/enginuity/logger/ecu/comms/controller/LoggerControllerImpl.java rename to src/com/romraider/logger/ecu/comms/controller/LoggerControllerImpl.java index 800611b1..9ee7097e 100644 --- a/src/enginuity/logger/ecu/comms/controller/LoggerControllerImpl.java +++ b/src/com/romraider/logger/ecu/comms/controller/LoggerControllerImpl.java @@ -19,19 +19,19 @@ * */ -package enginuity.logger.ecu.comms.controller; +package com.romraider.logger.ecu.comms.controller; -import enginuity.Settings; -import enginuity.logger.ecu.comms.manager.QueryManager; -import enginuity.logger.ecu.comms.manager.QueryManagerImpl; -import enginuity.logger.ecu.comms.query.EcuInitCallback; -import enginuity.logger.ecu.definition.LoggerData; -import enginuity.logger.ecu.ui.MessageListener; -import enginuity.logger.ecu.ui.StatusChangeListener; -import enginuity.logger.ecu.ui.handler.DataUpdateHandler; -import enginuity.logger.ecu.ui.handler.file.FileLoggerControllerSwitchMonitor; -import static enginuity.util.ParamChecker.checkNotNull; -import static enginuity.util.ThreadUtil.runAsDaemon; +import com.romraider.Settings; +import com.romraider.logger.ecu.comms.manager.QueryManager; +import com.romraider.logger.ecu.comms.manager.QueryManagerImpl; +import com.romraider.logger.ecu.comms.query.EcuInitCallback; +import com.romraider.logger.ecu.definition.LoggerData; +import com.romraider.logger.ecu.ui.MessageListener; +import com.romraider.logger.ecu.ui.StatusChangeListener; +import com.romraider.logger.ecu.ui.handler.DataUpdateHandler; +import com.romraider.logger.ecu.ui.handler.file.FileLoggerControllerSwitchMonitor; +import static com.romraider.util.ParamChecker.checkNotNull; +import static com.romraider.util.ThreadUtil.runAsDaemon; import org.apache.log4j.Logger; public final class LoggerControllerImpl implements LoggerController { diff --git a/src/enginuity/logger/ecu/comms/io/connection/LoggerConnection.java b/src/com/romraider/logger/ecu/comms/io/connection/LoggerConnection.java similarity index 87% rename from src/enginuity/logger/ecu/comms/io/connection/LoggerConnection.java rename to src/com/romraider/logger/ecu/comms/io/connection/LoggerConnection.java index 41ef3908..8503807d 100644 --- a/src/enginuity/logger/ecu/comms/io/connection/LoggerConnection.java +++ b/src/com/romraider/logger/ecu/comms/io/connection/LoggerConnection.java @@ -19,9 +19,9 @@ * */ -package enginuity.logger.ecu.comms.io.connection; +package com.romraider.logger.ecu.comms.io.connection; -import enginuity.logger.ecu.comms.query.EcuQuery; +import com.romraider.logger.ecu.comms.query.EcuQuery; import java.util.Collection; public interface LoggerConnection { diff --git a/src/enginuity/logger/ecu/comms/io/connection/LoggerConnectionFactory.java b/src/com/romraider/logger/ecu/comms/io/connection/LoggerConnectionFactory.java similarity index 88% rename from src/enginuity/logger/ecu/comms/io/connection/LoggerConnectionFactory.java rename to src/com/romraider/logger/ecu/comms/io/connection/LoggerConnectionFactory.java index f461608c..477a3278 100644 --- a/src/enginuity/logger/ecu/comms/io/connection/LoggerConnectionFactory.java +++ b/src/com/romraider/logger/ecu/comms/io/connection/LoggerConnectionFactory.java @@ -19,10 +19,10 @@ * */ -package enginuity.logger.ecu.comms.io.connection; +package com.romraider.logger.ecu.comms.io.connection; -import enginuity.io.connection.ConnectionProperties; -import enginuity.logger.ecu.exception.UnsupportedProtocolException; +import com.romraider.io.connection.ConnectionProperties; +import com.romraider.logger.ecu.exception.UnsupportedProtocolException; public final class LoggerConnectionFactory { private static final LoggerConnectionFactory INSTANCE = new LoggerConnectionFactory(); diff --git a/src/enginuity/logger/ecu/comms/io/connection/SSMLoggerConnection.java b/src/com/romraider/logger/ecu/comms/io/connection/SSMLoggerConnection.java similarity index 78% rename from src/enginuity/logger/ecu/comms/io/connection/SSMLoggerConnection.java rename to src/com/romraider/logger/ecu/comms/io/connection/SSMLoggerConnection.java index f6252e0d..44da88ae 100644 --- a/src/enginuity/logger/ecu/comms/io/connection/SSMLoggerConnection.java +++ b/src/com/romraider/logger/ecu/comms/io/connection/SSMLoggerConnection.java @@ -19,19 +19,19 @@ * */ -package enginuity.logger.ecu.comms.io.connection; +package com.romraider.logger.ecu.comms.io.connection; -import enginuity.io.connection.ConnectionProperties; -import enginuity.io.connection.SerialConnection; -import enginuity.io.connection.SerialConnectionImpl; -import enginuity.logger.ecu.comms.io.protocol.LoggerProtocol; -import enginuity.logger.ecu.comms.io.protocol.SSMLoggerProtocol; -import enginuity.logger.ecu.comms.query.EcuQuery; -import enginuity.logger.ecu.exception.SerialCommunicationException; -import static enginuity.util.HexUtil.asHex; -import static enginuity.util.ParamChecker.checkNotNull; -import static enginuity.util.ParamChecker.checkNotNullOrEmpty; -import static enginuity.util.ThreadUtil.sleep; +import com.romraider.io.connection.ConnectionProperties; +import com.romraider.io.connection.SerialConnection; +import com.romraider.io.connection.SerialConnectionImpl; +import com.romraider.logger.ecu.comms.io.protocol.LoggerProtocol; +import com.romraider.logger.ecu.comms.io.protocol.SSMLoggerProtocol; +import com.romraider.logger.ecu.comms.query.EcuQuery; +import com.romraider.logger.ecu.exception.SerialCommunicationException; +import static com.romraider.util.HexUtil.asHex; +import static com.romraider.util.ParamChecker.checkNotNull; +import static com.romraider.util.ParamChecker.checkNotNullOrEmpty; +import static com.romraider.util.ThreadUtil.sleep; import org.apache.log4j.Logger; import java.util.Collection; diff --git a/src/enginuity/logger/ecu/comms/io/protocol/LoggerProtocol.java b/src/com/romraider/logger/ecu/comms/io/protocol/LoggerProtocol.java similarity index 89% rename from src/enginuity/logger/ecu/comms/io/protocol/LoggerProtocol.java rename to src/com/romraider/logger/ecu/comms/io/protocol/LoggerProtocol.java index f74cecb8..bd4942af 100644 --- a/src/enginuity/logger/ecu/comms/io/protocol/LoggerProtocol.java +++ b/src/com/romraider/logger/ecu/comms/io/protocol/LoggerProtocol.java @@ -19,9 +19,9 @@ * */ -package enginuity.logger.ecu.comms.io.protocol; +package com.romraider.logger.ecu.comms.io.protocol; -import enginuity.logger.ecu.comms.query.EcuQuery; +import com.romraider.logger.ecu.comms.query.EcuQuery; import java.util.Collection; public interface LoggerProtocol { diff --git a/src/enginuity/logger/ecu/comms/io/protocol/SSMLoggerProtocol.java b/src/com/romraider/logger/ecu/comms/io/protocol/SSMLoggerProtocol.java similarity index 83% rename from src/enginuity/logger/ecu/comms/io/protocol/SSMLoggerProtocol.java rename to src/com/romraider/logger/ecu/comms/io/protocol/SSMLoggerProtocol.java index abd4c48f..14e0cc8a 100644 --- a/src/enginuity/logger/ecu/comms/io/protocol/SSMLoggerProtocol.java +++ b/src/com/romraider/logger/ecu/comms/io/protocol/SSMLoggerProtocol.java @@ -19,18 +19,18 @@ * */ -package enginuity.logger.ecu.comms.io.protocol; +package com.romraider.logger.ecu.comms.io.protocol; -import enginuity.io.protocol.Protocol; -import enginuity.io.protocol.SSMProtocol; -import static enginuity.io.protocol.SSMProtocol.ADDRESS_SIZE; -import static enginuity.io.protocol.SSMProtocol.DATA_SIZE; -import static enginuity.io.protocol.SSMProtocol.REQUEST_NON_DATA_BYTES; -import static enginuity.io.protocol.SSMProtocol.RESPONSE_NON_DATA_BYTES; -import static enginuity.io.protocol.SSMResponseProcessor.extractResponseData; -import static enginuity.io.protocol.SSMResponseProcessor.filterRequestFromResponse; -import enginuity.logger.ecu.comms.query.EcuQuery; -import static enginuity.util.ParamChecker.checkNotNullOrEmpty; +import com.romraider.io.protocol.Protocol; +import com.romraider.io.protocol.SSMProtocol; +import static com.romraider.io.protocol.SSMProtocol.ADDRESS_SIZE; +import static com.romraider.io.protocol.SSMProtocol.DATA_SIZE; +import static com.romraider.io.protocol.SSMProtocol.REQUEST_NON_DATA_BYTES; +import static com.romraider.io.protocol.SSMProtocol.RESPONSE_NON_DATA_BYTES; +import static com.romraider.io.protocol.SSMResponseProcessor.extractResponseData; +import static com.romraider.io.protocol.SSMResponseProcessor.filterRequestFromResponse; +import com.romraider.logger.ecu.comms.query.EcuQuery; +import static com.romraider.util.ParamChecker.checkNotNullOrEmpty; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; diff --git a/src/enginuity/logger/ecu/comms/manager/QueryManager.java b/src/com/romraider/logger/ecu/comms/manager/QueryManager.java similarity index 80% rename from src/enginuity/logger/ecu/comms/manager/QueryManager.java rename to src/com/romraider/logger/ecu/comms/manager/QueryManager.java index aa42a3fa..8563b9c0 100644 --- a/src/enginuity/logger/ecu/comms/manager/QueryManager.java +++ b/src/com/romraider/logger/ecu/comms/manager/QueryManager.java @@ -19,11 +19,11 @@ * */ -package enginuity.logger.ecu.comms.manager; +package com.romraider.logger.ecu.comms.manager; -import enginuity.logger.ecu.definition.LoggerData; -import enginuity.logger.ecu.ui.StatusChangeListener; -import enginuity.logger.ecu.ui.handler.file.FileLoggerControllerSwitchMonitor; +import com.romraider.logger.ecu.definition.LoggerData; +import com.romraider.logger.ecu.ui.StatusChangeListener; +import com.romraider.logger.ecu.ui.handler.file.FileLoggerControllerSwitchMonitor; public interface QueryManager extends Runnable { diff --git a/src/enginuity/logger/ecu/comms/manager/QueryManagerImpl.java b/src/com/romraider/logger/ecu/comms/manager/QueryManagerImpl.java similarity index 86% rename from src/enginuity/logger/ecu/comms/manager/QueryManagerImpl.java rename to src/com/romraider/logger/ecu/comms/manager/QueryManagerImpl.java index 97cc5daa..f57ea22e 100644 --- a/src/enginuity/logger/ecu/comms/manager/QueryManagerImpl.java +++ b/src/com/romraider/logger/ecu/comms/manager/QueryManagerImpl.java @@ -19,33 +19,33 @@ * */ -package enginuity.logger.ecu.comms.manager; +package com.romraider.logger.ecu.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.ecu.comms.query.EcuInitCallback; -import enginuity.logger.ecu.comms.query.EcuQuery; -import enginuity.logger.ecu.comms.query.EcuQueryImpl; -import enginuity.logger.ecu.comms.query.ExternalQuery; -import enginuity.logger.ecu.comms.query.ExternalQueryImpl; -import enginuity.logger.ecu.comms.query.Query; -import enginuity.logger.ecu.comms.query.Response; -import enginuity.logger.ecu.comms.query.ResponseImpl; -import enginuity.logger.ecu.definition.EcuData; -import static enginuity.logger.ecu.definition.EcuDataType.EXTERNAL; -import enginuity.logger.ecu.definition.ExternalData; -import enginuity.logger.ecu.definition.LoggerData; -import enginuity.logger.ecu.ui.MessageListener; -import enginuity.logger.ecu.ui.StatusChangeListener; -import enginuity.logger.ecu.ui.handler.DataUpdateHandler; -import enginuity.logger.ecu.ui.handler.file.FileLoggerControllerSwitchMonitor; -import static enginuity.util.HexUtil.asHex; -import static enginuity.util.ParamChecker.checkNotNull; -import static enginuity.util.ThreadUtil.runAsDaemon; -import static enginuity.util.ThreadUtil.sleep; +import com.romraider.Settings; +import com.romraider.io.connection.EcuConnection; +import com.romraider.io.connection.EcuConnectionImpl; +import com.romraider.io.protocol.Protocol; +import com.romraider.io.protocol.ProtocolFactory; +import com.romraider.logger.ecu.comms.query.EcuInitCallback; +import com.romraider.logger.ecu.comms.query.EcuQuery; +import com.romraider.logger.ecu.comms.query.EcuQueryImpl; +import com.romraider.logger.ecu.comms.query.ExternalQuery; +import com.romraider.logger.ecu.comms.query.ExternalQueryImpl; +import com.romraider.logger.ecu.comms.query.Query; +import com.romraider.logger.ecu.comms.query.Response; +import com.romraider.logger.ecu.comms.query.ResponseImpl; +import com.romraider.logger.ecu.definition.EcuData; +import static com.romraider.logger.ecu.definition.EcuDataType.EXTERNAL; +import com.romraider.logger.ecu.definition.ExternalData; +import com.romraider.logger.ecu.definition.LoggerData; +import com.romraider.logger.ecu.ui.MessageListener; +import com.romraider.logger.ecu.ui.StatusChangeListener; +import com.romraider.logger.ecu.ui.handler.DataUpdateHandler; +import com.romraider.logger.ecu.ui.handler.file.FileLoggerControllerSwitchMonitor; +import static com.romraider.util.HexUtil.asHex; +import static com.romraider.util.ParamChecker.checkNotNull; +import static com.romraider.util.ThreadUtil.runAsDaemon; +import static com.romraider.util.ThreadUtil.sleep; import org.apache.log4j.Logger; import javax.swing.SwingUtilities; import java.text.DecimalFormat; diff --git a/src/enginuity/logger/ecu/comms/manager/TransmissionManager.java b/src/com/romraider/logger/ecu/comms/manager/TransmissionManager.java similarity index 87% rename from src/enginuity/logger/ecu/comms/manager/TransmissionManager.java rename to src/com/romraider/logger/ecu/comms/manager/TransmissionManager.java index 6018554b..da122e86 100644 --- a/src/enginuity/logger/ecu/comms/manager/TransmissionManager.java +++ b/src/com/romraider/logger/ecu/comms/manager/TransmissionManager.java @@ -19,9 +19,9 @@ * */ -package enginuity.logger.ecu.comms.manager; +package com.romraider.logger.ecu.comms.manager; -import enginuity.logger.ecu.comms.query.EcuQuery; +import com.romraider.logger.ecu.comms.query.EcuQuery; import java.util.Collection; public interface TransmissionManager { diff --git a/src/enginuity/logger/ecu/comms/manager/TransmissionManagerImpl.java b/src/com/romraider/logger/ecu/comms/manager/TransmissionManagerImpl.java similarity index 81% rename from src/enginuity/logger/ecu/comms/manager/TransmissionManagerImpl.java rename to src/com/romraider/logger/ecu/comms/manager/TransmissionManagerImpl.java index 192d01b2..08f859f4 100644 --- a/src/enginuity/logger/ecu/comms/manager/TransmissionManagerImpl.java +++ b/src/com/romraider/logger/ecu/comms/manager/TransmissionManagerImpl.java @@ -19,15 +19,15 @@ * */ -package enginuity.logger.ecu.comms.manager; +package com.romraider.logger.ecu.comms.manager; -import enginuity.Settings; -import enginuity.logger.ecu.comms.io.connection.LoggerConnection; -import enginuity.logger.ecu.comms.io.connection.LoggerConnectionFactory; -import enginuity.logger.ecu.comms.query.EcuQuery; -import enginuity.logger.ecu.exception.NotConnectedException; -import enginuity.logger.ecu.exception.SerialCommunicationException; -import static enginuity.util.ParamChecker.checkNotNull; +import com.romraider.Settings; +import com.romraider.logger.ecu.comms.io.connection.LoggerConnection; +import com.romraider.logger.ecu.comms.io.connection.LoggerConnectionFactory; +import com.romraider.logger.ecu.comms.query.EcuQuery; +import com.romraider.logger.ecu.exception.NotConnectedException; +import com.romraider.logger.ecu.exception.SerialCommunicationException; +import static com.romraider.util.ParamChecker.checkNotNull; import org.apache.log4j.Logger; import java.util.Collection; diff --git a/src/enginuity/logger/ecu/comms/query/EcuInit.java b/src/com/romraider/logger/ecu/comms/query/EcuInit.java similarity index 92% rename from src/enginuity/logger/ecu/comms/query/EcuInit.java rename to src/com/romraider/logger/ecu/comms/query/EcuInit.java index 3666c0bc..b4347c09 100644 --- a/src/enginuity/logger/ecu/comms/query/EcuInit.java +++ b/src/com/romraider/logger/ecu/comms/query/EcuInit.java @@ -19,7 +19,7 @@ * */ -package enginuity.logger.ecu.comms.query; +package com.romraider.logger.ecu.comms.query; public interface EcuInit { diff --git a/src/enginuity/logger/ecu/comms/query/EcuInitCallback.java b/src/com/romraider/logger/ecu/comms/query/EcuInitCallback.java similarity index 92% rename from src/enginuity/logger/ecu/comms/query/EcuInitCallback.java rename to src/com/romraider/logger/ecu/comms/query/EcuInitCallback.java index d527881e..46808bae 100644 --- a/src/enginuity/logger/ecu/comms/query/EcuInitCallback.java +++ b/src/com/romraider/logger/ecu/comms/query/EcuInitCallback.java @@ -19,7 +19,7 @@ * */ -package enginuity.logger.ecu.comms.query; +package com.romraider.logger.ecu.comms.query; public interface EcuInitCallback { diff --git a/src/enginuity/logger/ecu/comms/query/EcuQuery.java b/src/com/romraider/logger/ecu/comms/query/EcuQuery.java similarity index 92% rename from src/enginuity/logger/ecu/comms/query/EcuQuery.java rename to src/com/romraider/logger/ecu/comms/query/EcuQuery.java index 0a4405fe..df0f3403 100644 --- a/src/enginuity/logger/ecu/comms/query/EcuQuery.java +++ b/src/com/romraider/logger/ecu/comms/query/EcuQuery.java @@ -19,7 +19,7 @@ * */ -package enginuity.logger.ecu.comms.query; +package com.romraider.logger.ecu.comms.query; public interface EcuQuery extends Query { diff --git a/src/enginuity/logger/ecu/comms/query/EcuQueryImpl.java b/src/com/romraider/logger/ecu/comms/query/EcuQueryImpl.java similarity index 85% rename from src/enginuity/logger/ecu/comms/query/EcuQueryImpl.java rename to src/com/romraider/logger/ecu/comms/query/EcuQueryImpl.java index f799c6ab..acb4df35 100644 --- a/src/enginuity/logger/ecu/comms/query/EcuQueryImpl.java +++ b/src/com/romraider/logger/ecu/comms/query/EcuQueryImpl.java @@ -19,12 +19,12 @@ * */ -package enginuity.logger.ecu.comms.query; +package com.romraider.logger.ecu.comms.query; -import enginuity.logger.ecu.definition.EcuData; -import enginuity.logger.ecu.definition.LoggerData; -import static enginuity.util.HexUtil.asHex; -import static enginuity.util.ParamChecker.checkNotNull; +import com.romraider.logger.ecu.definition.EcuData; +import com.romraider.logger.ecu.definition.LoggerData; +import static com.romraider.util.HexUtil.asHex; +import static com.romraider.util.ParamChecker.checkNotNull; public final class EcuQueryImpl implements EcuQuery { private final EcuData ecuData; diff --git a/src/enginuity/logger/ecu/comms/query/ExternalQuery.java b/src/com/romraider/logger/ecu/comms/query/ExternalQuery.java similarity index 63% rename from src/enginuity/logger/ecu/comms/query/ExternalQuery.java rename to src/com/romraider/logger/ecu/comms/query/ExternalQuery.java index 5d1572b0..812ff3f7 100644 --- a/src/enginuity/logger/ecu/comms/query/ExternalQuery.java +++ b/src/com/romraider/logger/ecu/comms/query/ExternalQuery.java @@ -1,4 +1,4 @@ -package enginuity.logger.ecu.comms.query; +package com.romraider.logger.ecu.comms.query; public interface ExternalQuery extends Query { diff --git a/src/enginuity/logger/ecu/comms/query/ExternalQueryImpl.java b/src/com/romraider/logger/ecu/comms/query/ExternalQueryImpl.java similarity index 67% rename from src/enginuity/logger/ecu/comms/query/ExternalQueryImpl.java rename to src/com/romraider/logger/ecu/comms/query/ExternalQueryImpl.java index cf13bf88..d8fd0f5c 100644 --- a/src/enginuity/logger/ecu/comms/query/ExternalQueryImpl.java +++ b/src/com/romraider/logger/ecu/comms/query/ExternalQueryImpl.java @@ -1,8 +1,8 @@ -package enginuity.logger.ecu.comms.query; +package com.romraider.logger.ecu.comms.query; -import enginuity.logger.ecu.definition.ExternalData; -import enginuity.logger.ecu.definition.LoggerData; -import static enginuity.util.ParamChecker.checkNotNull; +import com.romraider.logger.ecu.definition.ExternalData; +import com.romraider.logger.ecu.definition.LoggerData; +import static com.romraider.util.ParamChecker.checkNotNull; public final class ExternalQueryImpl implements ExternalQuery { private final ExternalData externalData; diff --git a/src/com/romraider/logger/ecu/comms/query/Query.java b/src/com/romraider/logger/ecu/comms/query/Query.java new file mode 100644 index 00000000..0c89877d --- /dev/null +++ b/src/com/romraider/logger/ecu/comms/query/Query.java @@ -0,0 +1,11 @@ +package com.romraider.logger.ecu.comms.query; + +import com.romraider.logger.ecu.definition.LoggerData; + +public interface Query { + + LoggerData getLoggerData(); + + double getResponse(); + +} diff --git a/src/enginuity/logger/ecu/comms/query/Response.java b/src/com/romraider/logger/ecu/comms/query/Response.java similarity index 67% rename from src/enginuity/logger/ecu/comms/query/Response.java rename to src/com/romraider/logger/ecu/comms/query/Response.java index 93893a33..c0587a26 100644 --- a/src/enginuity/logger/ecu/comms/query/Response.java +++ b/src/com/romraider/logger/ecu/comms/query/Response.java @@ -1,6 +1,6 @@ -package enginuity.logger.ecu.comms.query; +package com.romraider.logger.ecu.comms.query; -import enginuity.logger.ecu.definition.LoggerData; +import com.romraider.logger.ecu.definition.LoggerData; import java.util.Set; public interface Response { diff --git a/src/enginuity/logger/ecu/comms/query/ResponseImpl.java b/src/com/romraider/logger/ecu/comms/query/ResponseImpl.java similarity index 88% rename from src/enginuity/logger/ecu/comms/query/ResponseImpl.java rename to src/com/romraider/logger/ecu/comms/query/ResponseImpl.java index fe1da49e..e5dbf39d 100644 --- a/src/enginuity/logger/ecu/comms/query/ResponseImpl.java +++ b/src/com/romraider/logger/ecu/comms/query/ResponseImpl.java @@ -1,6 +1,6 @@ -package enginuity.logger.ecu.comms.query; +package com.romraider.logger.ecu.comms.query; -import enginuity.logger.ecu.definition.LoggerData; +import com.romraider.logger.ecu.definition.LoggerData; import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; diff --git a/src/enginuity/logger/ecu/comms/query/SSMEcuInit.java b/src/com/romraider/logger/ecu/comms/query/SSMEcuInit.java similarity index 86% rename from src/enginuity/logger/ecu/comms/query/SSMEcuInit.java rename to src/com/romraider/logger/ecu/comms/query/SSMEcuInit.java index a601a0db..48e62acf 100644 --- a/src/enginuity/logger/ecu/comms/query/SSMEcuInit.java +++ b/src/com/romraider/logger/ecu/comms/query/SSMEcuInit.java @@ -19,10 +19,10 @@ * */ -package enginuity.logger.ecu.comms.query; +package com.romraider.logger.ecu.comms.query; -import static enginuity.util.HexUtil.asHex; -import static enginuity.util.ParamChecker.checkNotNullOrEmpty; +import static com.romraider.util.HexUtil.asHex; +import static com.romraider.util.ParamChecker.checkNotNullOrEmpty; public final class SSMEcuInit implements EcuInit { private byte[] ecuInitBytes; diff --git a/src/enginuity/logger/ecu/comms/reset/ResetManager.java b/src/com/romraider/logger/ecu/comms/reset/ResetManager.java similarity index 53% rename from src/enginuity/logger/ecu/comms/reset/ResetManager.java rename to src/com/romraider/logger/ecu/comms/reset/ResetManager.java index ad34d053..ec03f157 100644 --- a/src/enginuity/logger/ecu/comms/reset/ResetManager.java +++ b/src/com/romraider/logger/ecu/comms/reset/ResetManager.java @@ -1,4 +1,4 @@ -package enginuity.logger.ecu.comms.reset; +package com.romraider.logger.ecu.comms.reset; public interface ResetManager { boolean resetEcu(); diff --git a/src/enginuity/logger/ecu/comms/reset/ResetManagerImpl.java b/src/com/romraider/logger/ecu/comms/reset/ResetManagerImpl.java similarity index 80% rename from src/enginuity/logger/ecu/comms/reset/ResetManagerImpl.java rename to src/com/romraider/logger/ecu/comms/reset/ResetManagerImpl.java index aed47059..18472833 100644 --- a/src/enginuity/logger/ecu/comms/reset/ResetManagerImpl.java +++ b/src/com/romraider/logger/ecu/comms/reset/ResetManagerImpl.java @@ -1,13 +1,13 @@ -package enginuity.logger.ecu.comms.reset; +package com.romraider.logger.ecu.comms.reset; -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.ecu.ui.MessageListener; -import static enginuity.util.HexUtil.asHex; -import static enginuity.util.ParamChecker.checkNotNull; +import com.romraider.Settings; +import com.romraider.io.connection.EcuConnection; +import com.romraider.io.connection.EcuConnectionImpl; +import com.romraider.io.protocol.Protocol; +import com.romraider.io.protocol.ProtocolFactory; +import com.romraider.logger.ecu.ui.MessageListener; +import static com.romraider.util.HexUtil.asHex; +import static com.romraider.util.ParamChecker.checkNotNull; import org.apache.log4j.Logger; public final class ResetManagerImpl implements ResetManager { diff --git a/src/enginuity/logger/ecu/definition/ConvertorUpdateListener.java b/src/com/romraider/logger/ecu/definition/ConvertorUpdateListener.java similarity index 92% rename from src/enginuity/logger/ecu/definition/ConvertorUpdateListener.java rename to src/com/romraider/logger/ecu/definition/ConvertorUpdateListener.java index 213382b1..2182511c 100644 --- a/src/enginuity/logger/ecu/definition/ConvertorUpdateListener.java +++ b/src/com/romraider/logger/ecu/definition/ConvertorUpdateListener.java @@ -19,7 +19,7 @@ * */ -package enginuity.logger.ecu.definition; +package com.romraider.logger.ecu.definition; public interface ConvertorUpdateListener { diff --git a/src/enginuity/logger/ecu/definition/EcuAddress.java b/src/com/romraider/logger/ecu/definition/EcuAddress.java similarity index 69% rename from src/enginuity/logger/ecu/definition/EcuAddress.java rename to src/com/romraider/logger/ecu/definition/EcuAddress.java index 9ba987d0..01254c09 100644 --- a/src/enginuity/logger/ecu/definition/EcuAddress.java +++ b/src/com/romraider/logger/ecu/definition/EcuAddress.java @@ -1,4 +1,4 @@ -package enginuity.logger.ecu.definition; +package com.romraider.logger.ecu.definition; public interface EcuAddress { diff --git a/src/enginuity/logger/ecu/definition/EcuAddressImpl.java b/src/com/romraider/logger/ecu/definition/EcuAddressImpl.java similarity index 85% rename from src/enginuity/logger/ecu/definition/EcuAddressImpl.java rename to src/com/romraider/logger/ecu/definition/EcuAddressImpl.java index c27b592e..b32ab075 100644 --- a/src/enginuity/logger/ecu/definition/EcuAddressImpl.java +++ b/src/com/romraider/logger/ecu/definition/EcuAddressImpl.java @@ -1,10 +1,10 @@ -package enginuity.logger.ecu.definition; +package com.romraider.logger.ecu.definition; -import static enginuity.util.HexUtil.asBytes; -import static enginuity.util.HexUtil.hexToInt; -import static enginuity.util.HexUtil.intToHexString; -import static enginuity.util.ParamChecker.checkGreaterThanZero; -import static enginuity.util.ParamChecker.checkNotNullOrEmpty; +import static com.romraider.util.HexUtil.asBytes; +import static com.romraider.util.HexUtil.hexToInt; +import static com.romraider.util.HexUtil.intToHexString; +import static com.romraider.util.ParamChecker.checkGreaterThanZero; +import static com.romraider.util.ParamChecker.checkNotNullOrEmpty; import java.util.LinkedList; import java.util.List; diff --git a/src/enginuity/logger/ecu/definition/EcuData.java b/src/com/romraider/logger/ecu/definition/EcuData.java similarity index 92% rename from src/enginuity/logger/ecu/definition/EcuData.java rename to src/com/romraider/logger/ecu/definition/EcuData.java index 90e1e54c..1fd15488 100644 --- a/src/enginuity/logger/ecu/definition/EcuData.java +++ b/src/com/romraider/logger/ecu/definition/EcuData.java @@ -19,7 +19,7 @@ * */ -package enginuity.logger.ecu.definition; +package com.romraider.logger.ecu.definition; public interface EcuData extends LoggerData { diff --git a/src/enginuity/logger/ecu/definition/EcuDataConvertor.java b/src/com/romraider/logger/ecu/definition/EcuDataConvertor.java similarity index 92% rename from src/enginuity/logger/ecu/definition/EcuDataConvertor.java rename to src/com/romraider/logger/ecu/definition/EcuDataConvertor.java index e7565ef7..4de7b21b 100644 --- a/src/enginuity/logger/ecu/definition/EcuDataConvertor.java +++ b/src/com/romraider/logger/ecu/definition/EcuDataConvertor.java @@ -19,7 +19,7 @@ * */ -package enginuity.logger.ecu.definition; +package com.romraider.logger.ecu.definition; public interface EcuDataConvertor { diff --git a/src/enginuity/logger/ecu/definition/EcuDataLoader.java b/src/com/romraider/logger/ecu/definition/EcuDataLoader.java similarity index 87% rename from src/enginuity/logger/ecu/definition/EcuDataLoader.java rename to src/com/romraider/logger/ecu/definition/EcuDataLoader.java index f1cc79e1..017dc69b 100644 --- a/src/enginuity/logger/ecu/definition/EcuDataLoader.java +++ b/src/com/romraider/logger/ecu/definition/EcuDataLoader.java @@ -19,10 +19,10 @@ * */ -package enginuity.logger.ecu.definition; +package com.romraider.logger.ecu.definition; -import enginuity.io.connection.ConnectionProperties; -import enginuity.logger.ecu.comms.query.EcuInit; +import com.romraider.io.connection.ConnectionProperties; +import com.romraider.logger.ecu.comms.query.EcuInit; import java.io.File; import java.util.List; import java.util.Map; diff --git a/src/enginuity/logger/ecu/definition/EcuDataLoaderImpl.java b/src/com/romraider/logger/ecu/definition/EcuDataLoaderImpl.java similarity index 84% rename from src/enginuity/logger/ecu/definition/EcuDataLoaderImpl.java rename to src/com/romraider/logger/ecu/definition/EcuDataLoaderImpl.java index bdda313c..682867af 100644 --- a/src/enginuity/logger/ecu/definition/EcuDataLoaderImpl.java +++ b/src/com/romraider/logger/ecu/definition/EcuDataLoaderImpl.java @@ -19,16 +19,16 @@ * */ -package enginuity.logger.ecu.definition; +package com.romraider.logger.ecu.definition; -import enginuity.io.connection.ConnectionProperties; -import enginuity.logger.ecu.comms.query.EcuInit; -import enginuity.logger.ecu.definition.xml.EcuDefinitionHandler; -import enginuity.logger.ecu.definition.xml.LoggerDefinitionHandler; -import enginuity.logger.ecu.exception.ConfigurationException; -import static enginuity.util.ParamChecker.checkNotNull; -import static enginuity.util.ParamChecker.checkNotNullOrEmpty; -import static enginuity.util.SaxParserFactory.getSaxParser; +import com.romraider.io.connection.ConnectionProperties; +import com.romraider.logger.ecu.comms.query.EcuInit; +import com.romraider.logger.ecu.definition.xml.EcuDefinitionHandler; +import com.romraider.logger.ecu.definition.xml.LoggerDefinitionHandler; +import com.romraider.logger.ecu.exception.ConfigurationException; +import static com.romraider.util.ParamChecker.checkNotNull; +import static com.romraider.util.ParamChecker.checkNotNullOrEmpty; +import static com.romraider.util.SaxParserFactory.getSaxParser; import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; diff --git a/src/enginuity/logger/ecu/definition/EcuDataType.java b/src/com/romraider/logger/ecu/definition/EcuDataType.java similarity index 92% rename from src/enginuity/logger/ecu/definition/EcuDataType.java rename to src/com/romraider/logger/ecu/definition/EcuDataType.java index 7ff1ca32..88290b60 100644 --- a/src/enginuity/logger/ecu/definition/EcuDataType.java +++ b/src/com/romraider/logger/ecu/definition/EcuDataType.java @@ -19,7 +19,7 @@ * */ -package enginuity.logger.ecu.definition; +package com.romraider.logger.ecu.definition; public enum EcuDataType { PARAMETER, diff --git a/src/enginuity/logger/ecu/definition/EcuDefinition.java b/src/com/romraider/logger/ecu/definition/EcuDefinition.java similarity index 65% rename from src/enginuity/logger/ecu/definition/EcuDefinition.java rename to src/com/romraider/logger/ecu/definition/EcuDefinition.java index c826418d..a8598cce 100644 --- a/src/enginuity/logger/ecu/definition/EcuDefinition.java +++ b/src/com/romraider/logger/ecu/definition/EcuDefinition.java @@ -1,4 +1,4 @@ -package enginuity.logger.ecu.definition; +package com.romraider.logger.ecu.definition; public interface EcuDefinition { diff --git a/src/enginuity/logger/ecu/definition/EcuDefinitionImpl.java b/src/com/romraider/logger/ecu/definition/EcuDefinitionImpl.java similarity index 80% rename from src/enginuity/logger/ecu/definition/EcuDefinitionImpl.java rename to src/com/romraider/logger/ecu/definition/EcuDefinitionImpl.java index 005537ed..449f6d4e 100644 --- a/src/enginuity/logger/ecu/definition/EcuDefinitionImpl.java +++ b/src/com/romraider/logger/ecu/definition/EcuDefinitionImpl.java @@ -1,6 +1,6 @@ -package enginuity.logger.ecu.definition; +package com.romraider.logger.ecu.definition; -import static enginuity.util.ParamChecker.checkNotNullOrEmpty; +import static com.romraider.util.ParamChecker.checkNotNullOrEmpty; public final class EcuDefinitionImpl implements EcuDefinition { private final String ecuId; diff --git a/src/enginuity/logger/ecu/definition/EcuDerivedParameterConvertor.java b/src/com/romraider/logger/ecu/definition/EcuDerivedParameterConvertor.java similarity index 92% rename from src/enginuity/logger/ecu/definition/EcuDerivedParameterConvertor.java rename to src/com/romraider/logger/ecu/definition/EcuDerivedParameterConvertor.java index 52bc1b8e..025407e9 100644 --- a/src/enginuity/logger/ecu/definition/EcuDerivedParameterConvertor.java +++ b/src/com/romraider/logger/ecu/definition/EcuDerivedParameterConvertor.java @@ -19,7 +19,7 @@ * */ -package enginuity.logger.ecu.definition; +package com.romraider.logger.ecu.definition; public interface EcuDerivedParameterConvertor extends EcuDataConvertor { diff --git a/src/enginuity/logger/ecu/definition/EcuDerivedParameterConvertorImpl.java b/src/com/romraider/logger/ecu/definition/EcuDerivedParameterConvertorImpl.java similarity index 93% rename from src/enginuity/logger/ecu/definition/EcuDerivedParameterConvertorImpl.java rename to src/com/romraider/logger/ecu/definition/EcuDerivedParameterConvertorImpl.java index 223e81c8..64f27cc9 100644 --- a/src/enginuity/logger/ecu/definition/EcuDerivedParameterConvertorImpl.java +++ b/src/com/romraider/logger/ecu/definition/EcuDerivedParameterConvertorImpl.java @@ -19,11 +19,11 @@ * */ -package enginuity.logger.ecu.definition; +package com.romraider.logger.ecu.definition; -import static enginuity.util.JEPUtil.evaluate; -import static enginuity.util.ParamChecker.checkNotNull; -import static enginuity.util.ParamChecker.checkNotNullOrEmpty; +import static com.romraider.util.JEPUtil.evaluate; +import static com.romraider.util.ParamChecker.checkNotNull; +import static com.romraider.util.ParamChecker.checkNotNullOrEmpty; import java.text.DecimalFormat; import static java.util.Collections.synchronizedMap; import java.util.HashMap; diff --git a/src/enginuity/logger/ecu/definition/EcuDerivedParameterImpl.java b/src/com/romraider/logger/ecu/definition/EcuDerivedParameterImpl.java similarity index 91% rename from src/enginuity/logger/ecu/definition/EcuDerivedParameterImpl.java rename to src/com/romraider/logger/ecu/definition/EcuDerivedParameterImpl.java index 17d0d8cd..c6b3149c 100644 --- a/src/enginuity/logger/ecu/definition/EcuDerivedParameterImpl.java +++ b/src/com/romraider/logger/ecu/definition/EcuDerivedParameterImpl.java @@ -19,11 +19,11 @@ * */ -package enginuity.logger.ecu.definition; +package com.romraider.logger.ecu.definition; -import static enginuity.logger.ecu.definition.EcuDataType.PARAMETER; -import static enginuity.util.ParamChecker.checkNotNull; -import static enginuity.util.ParamChecker.checkNotNullOrEmpty; +import static com.romraider.logger.ecu.definition.EcuDataType.PARAMETER; +import static com.romraider.util.ParamChecker.checkNotNull; +import static com.romraider.util.ParamChecker.checkNotNullOrEmpty; import java.util.HashSet; import java.util.Set; diff --git a/src/enginuity/logger/ecu/definition/EcuParameter.java b/src/com/romraider/logger/ecu/definition/EcuParameter.java similarity index 92% rename from src/enginuity/logger/ecu/definition/EcuParameter.java rename to src/com/romraider/logger/ecu/definition/EcuParameter.java index d70f7cd2..4fa246cd 100644 --- a/src/enginuity/logger/ecu/definition/EcuParameter.java +++ b/src/com/romraider/logger/ecu/definition/EcuParameter.java @@ -19,7 +19,7 @@ * */ -package enginuity.logger.ecu.definition; +package com.romraider.logger.ecu.definition; public interface EcuParameter extends EcuData { diff --git a/src/enginuity/logger/ecu/definition/EcuParameterConvertorImpl.java b/src/com/romraider/logger/ecu/definition/EcuParameterConvertorImpl.java similarity index 86% rename from src/enginuity/logger/ecu/definition/EcuParameterConvertorImpl.java rename to src/com/romraider/logger/ecu/definition/EcuParameterConvertorImpl.java index e42e9140..4d3da0d9 100644 --- a/src/enginuity/logger/ecu/definition/EcuParameterConvertorImpl.java +++ b/src/com/romraider/logger/ecu/definition/EcuParameterConvertorImpl.java @@ -19,13 +19,13 @@ * */ -package enginuity.logger.ecu.definition; +package com.romraider.logger.ecu.definition; -import static enginuity.util.ByteUtil.asUnsignedInt; -import static enginuity.util.JEPUtil.evaluate; -import static enginuity.util.ParamChecker.checkNotNull; -import static enginuity.util.ParamChecker.checkNotNullOrEmpty; -import static enginuity.util.ParamChecker.isValidBit; +import static com.romraider.util.ByteUtil.asUnsignedInt; +import static com.romraider.util.JEPUtil.evaluate; +import static com.romraider.util.ParamChecker.checkNotNull; +import static com.romraider.util.ParamChecker.checkNotNullOrEmpty; +import static com.romraider.util.ParamChecker.isValidBit; import static java.lang.Float.intBitsToFloat; import java.text.DecimalFormat; import java.util.HashMap; diff --git a/src/enginuity/logger/ecu/definition/EcuParameterImpl.java b/src/com/romraider/logger/ecu/definition/EcuParameterImpl.java similarity index 90% rename from src/enginuity/logger/ecu/definition/EcuParameterImpl.java rename to src/com/romraider/logger/ecu/definition/EcuParameterImpl.java index 017f29ff..6027cd16 100644 --- a/src/enginuity/logger/ecu/definition/EcuParameterImpl.java +++ b/src/com/romraider/logger/ecu/definition/EcuParameterImpl.java @@ -19,11 +19,11 @@ * */ -package enginuity.logger.ecu.definition; +package com.romraider.logger.ecu.definition; -import static enginuity.logger.ecu.definition.EcuDataType.PARAMETER; -import static enginuity.util.ParamChecker.checkNotNull; -import static enginuity.util.ParamChecker.checkNotNullOrEmpty; +import static com.romraider.logger.ecu.definition.EcuDataType.PARAMETER; +import static com.romraider.util.ParamChecker.checkNotNull; +import static com.romraider.util.ParamChecker.checkNotNullOrEmpty; import java.util.HashSet; import java.util.Set; diff --git a/src/enginuity/logger/ecu/definition/EcuSwitch.java b/src/com/romraider/logger/ecu/definition/EcuSwitch.java similarity index 92% rename from src/enginuity/logger/ecu/definition/EcuSwitch.java rename to src/com/romraider/logger/ecu/definition/EcuSwitch.java index 7cf6db34..c0afa602 100644 --- a/src/enginuity/logger/ecu/definition/EcuSwitch.java +++ b/src/com/romraider/logger/ecu/definition/EcuSwitch.java @@ -19,7 +19,7 @@ * */ -package enginuity.logger.ecu.definition; +package com.romraider.logger.ecu.definition; public interface EcuSwitch extends EcuData { diff --git a/src/enginuity/logger/ecu/definition/EcuSwitchConvertorImpl.java b/src/com/romraider/logger/ecu/definition/EcuSwitchConvertorImpl.java similarity index 90% rename from src/enginuity/logger/ecu/definition/EcuSwitchConvertorImpl.java rename to src/com/romraider/logger/ecu/definition/EcuSwitchConvertorImpl.java index 697bd144..cdd588a0 100644 --- a/src/enginuity/logger/ecu/definition/EcuSwitchConvertorImpl.java +++ b/src/com/romraider/logger/ecu/definition/EcuSwitchConvertorImpl.java @@ -19,9 +19,9 @@ * */ -package enginuity.logger.ecu.definition; +package com.romraider.logger.ecu.definition; -import static enginuity.util.ParamChecker.checkBit; +import static com.romraider.util.ParamChecker.checkBit; public final class EcuSwitchConvertorImpl implements EcuDataConvertor { private final int bit; diff --git a/src/enginuity/logger/ecu/definition/EcuSwitchImpl.java b/src/com/romraider/logger/ecu/definition/EcuSwitchImpl.java similarity index 89% rename from src/enginuity/logger/ecu/definition/EcuSwitchImpl.java rename to src/com/romraider/logger/ecu/definition/EcuSwitchImpl.java index 3123b50f..5738f9ac 100644 --- a/src/enginuity/logger/ecu/definition/EcuSwitchImpl.java +++ b/src/com/romraider/logger/ecu/definition/EcuSwitchImpl.java @@ -19,11 +19,11 @@ * */ -package enginuity.logger.ecu.definition; +package com.romraider.logger.ecu.definition; -import static enginuity.logger.ecu.definition.EcuDataType.SWITCH; -import static enginuity.util.ParamChecker.checkNotNull; -import static enginuity.util.ParamChecker.checkNotNullOrEmpty; +import static com.romraider.logger.ecu.definition.EcuDataType.SWITCH; +import static com.romraider.util.ParamChecker.checkNotNull; +import static com.romraider.util.ParamChecker.checkNotNullOrEmpty; public final class EcuSwitchImpl implements EcuSwitch { private final String id; diff --git a/src/enginuity/logger/ecu/definition/ExternalData.java b/src/com/romraider/logger/ecu/definition/ExternalData.java similarity index 52% rename from src/enginuity/logger/ecu/definition/ExternalData.java rename to src/com/romraider/logger/ecu/definition/ExternalData.java index bbc64d90..89223d9a 100644 --- a/src/enginuity/logger/ecu/definition/ExternalData.java +++ b/src/com/romraider/logger/ecu/definition/ExternalData.java @@ -1,4 +1,4 @@ -package enginuity.logger.ecu.definition; +package com.romraider.logger.ecu.definition; public interface ExternalData extends LoggerData { diff --git a/src/enginuity/logger/ecu/definition/ExternalDataImpl.java b/src/com/romraider/logger/ecu/definition/ExternalDataImpl.java similarity index 84% rename from src/enginuity/logger/ecu/definition/ExternalDataImpl.java rename to src/com/romraider/logger/ecu/definition/ExternalDataImpl.java index 503a5f32..47b80e37 100644 --- a/src/enginuity/logger/ecu/definition/ExternalDataImpl.java +++ b/src/com/romraider/logger/ecu/definition/ExternalDataImpl.java @@ -1,9 +1,9 @@ -package enginuity.logger.ecu.definition; +package com.romraider.logger.ecu.definition; -import static enginuity.logger.ecu.definition.EcuDataType.EXTERNAL; -import enginuity.logger.ecu.external.ExternalDataItem; -import enginuity.logger.ecu.external.ExternalDataSource; -import static enginuity.util.ParamChecker.checkNotNull; +import static com.romraider.logger.ecu.definition.EcuDataType.EXTERNAL; +import com.romraider.logger.ecu.external.ExternalDataItem; +import com.romraider.logger.ecu.external.ExternalDataSource; +import static com.romraider.util.ParamChecker.checkNotNull; import java.text.DecimalFormat; import java.text.Format; diff --git a/src/enginuity/logger/ecu/definition/LoggerData.java b/src/com/romraider/logger/ecu/definition/LoggerData.java similarity index 83% rename from src/enginuity/logger/ecu/definition/LoggerData.java rename to src/com/romraider/logger/ecu/definition/LoggerData.java index 9db807bf..8c9fb426 100644 --- a/src/enginuity/logger/ecu/definition/LoggerData.java +++ b/src/com/romraider/logger/ecu/definition/LoggerData.java @@ -1,4 +1,4 @@ -package enginuity.logger.ecu.definition; +package com.romraider.logger.ecu.definition; public interface LoggerData { diff --git a/src/enginuity/logger/ecu/definition/plugin/PluginFilenameFilter.java b/src/com/romraider/logger/ecu/definition/plugin/PluginFilenameFilter.java similarity index 78% rename from src/enginuity/logger/ecu/definition/plugin/PluginFilenameFilter.java rename to src/com/romraider/logger/ecu/definition/plugin/PluginFilenameFilter.java index 79779b97..69abe769 100644 --- a/src/enginuity/logger/ecu/definition/plugin/PluginFilenameFilter.java +++ b/src/com/romraider/logger/ecu/definition/plugin/PluginFilenameFilter.java @@ -1,4 +1,4 @@ -package enginuity.logger.ecu.definition.plugin; +package com.romraider.logger.ecu.definition.plugin; import java.io.File; import java.io.FilenameFilter; diff --git a/src/enginuity/logger/ecu/definition/xml/EcuDefinitionHandler.java b/src/com/romraider/logger/ecu/definition/xml/EcuDefinitionHandler.java similarity index 88% rename from src/enginuity/logger/ecu/definition/xml/EcuDefinitionHandler.java rename to src/com/romraider/logger/ecu/definition/xml/EcuDefinitionHandler.java index be1fe53a..447773ea 100644 --- a/src/enginuity/logger/ecu/definition/xml/EcuDefinitionHandler.java +++ b/src/com/romraider/logger/ecu/definition/xml/EcuDefinitionHandler.java @@ -1,8 +1,8 @@ -package enginuity.logger.ecu.definition.xml; +package com.romraider.logger.ecu.definition.xml; -import enginuity.logger.ecu.definition.EcuDefinition; -import enginuity.logger.ecu.definition.EcuDefinitionImpl; -import static enginuity.util.ParamChecker.isNullOrEmpty; +import com.romraider.logger.ecu.definition.EcuDefinition; +import com.romraider.logger.ecu.definition.EcuDefinitionImpl; +import static com.romraider.util.ParamChecker.isNullOrEmpty; import org.xml.sax.Attributes; import org.xml.sax.helpers.DefaultHandler; import java.util.HashMap; diff --git a/src/enginuity/logger/ecu/definition/xml/LoggerDefinitionHandler.java b/src/com/romraider/logger/ecu/definition/xml/LoggerDefinitionHandler.java similarity index 90% rename from src/enginuity/logger/ecu/definition/xml/LoggerDefinitionHandler.java rename to src/com/romraider/logger/ecu/definition/xml/LoggerDefinitionHandler.java index e2fcf9cb..356db708 100644 --- a/src/enginuity/logger/ecu/definition/xml/LoggerDefinitionHandler.java +++ b/src/com/romraider/logger/ecu/definition/xml/LoggerDefinitionHandler.java @@ -19,25 +19,25 @@ * */ -package enginuity.logger.ecu.definition.xml; +package com.romraider.logger.ecu.definition.xml; -import enginuity.io.connection.ConnectionProperties; -import enginuity.io.connection.ConnectionPropertiesImpl; -import enginuity.logger.ecu.comms.query.EcuInit; -import enginuity.logger.ecu.definition.EcuAddress; -import enginuity.logger.ecu.definition.EcuAddressImpl; -import enginuity.logger.ecu.definition.EcuData; -import enginuity.logger.ecu.definition.EcuDataConvertor; -import enginuity.logger.ecu.definition.EcuDerivedParameterConvertor; -import enginuity.logger.ecu.definition.EcuDerivedParameterConvertorImpl; -import enginuity.logger.ecu.definition.EcuDerivedParameterImpl; -import enginuity.logger.ecu.definition.EcuParameter; -import enginuity.logger.ecu.definition.EcuParameterConvertorImpl; -import enginuity.logger.ecu.definition.EcuParameterImpl; -import enginuity.logger.ecu.definition.EcuSwitch; -import enginuity.logger.ecu.definition.EcuSwitchConvertorImpl; -import enginuity.logger.ecu.definition.EcuSwitchImpl; -import static enginuity.util.ParamChecker.checkNotNullOrEmpty; +import com.romraider.io.connection.ConnectionProperties; +import com.romraider.io.connection.ConnectionPropertiesImpl; +import com.romraider.logger.ecu.comms.query.EcuInit; +import com.romraider.logger.ecu.definition.EcuAddress; +import com.romraider.logger.ecu.definition.EcuAddressImpl; +import com.romraider.logger.ecu.definition.EcuData; +import com.romraider.logger.ecu.definition.EcuDataConvertor; +import com.romraider.logger.ecu.definition.EcuDerivedParameterConvertor; +import com.romraider.logger.ecu.definition.EcuDerivedParameterConvertorImpl; +import com.romraider.logger.ecu.definition.EcuDerivedParameterImpl; +import com.romraider.logger.ecu.definition.EcuParameter; +import com.romraider.logger.ecu.definition.EcuParameterConvertorImpl; +import com.romraider.logger.ecu.definition.EcuParameterImpl; +import com.romraider.logger.ecu.definition.EcuSwitch; +import com.romraider.logger.ecu.definition.EcuSwitchConvertorImpl; +import com.romraider.logger.ecu.definition.EcuSwitchImpl; +import static com.romraider.util.ParamChecker.checkNotNullOrEmpty; import org.xml.sax.Attributes; import org.xml.sax.helpers.DefaultHandler; import java.util.ArrayList; diff --git a/src/enginuity/logger/ecu/exception/ConfigurationException.java b/src/com/romraider/logger/ecu/exception/ConfigurationException.java similarity index 93% rename from src/enginuity/logger/ecu/exception/ConfigurationException.java rename to src/com/romraider/logger/ecu/exception/ConfigurationException.java index 7b78e1bd..d953acd1 100644 --- a/src/enginuity/logger/ecu/exception/ConfigurationException.java +++ b/src/com/romraider/logger/ecu/exception/ConfigurationException.java @@ -19,7 +19,7 @@ * */ -package enginuity.logger.ecu.exception; +package com.romraider.logger.ecu.exception; public final class ConfigurationException extends RuntimeException { diff --git a/src/enginuity/logger/ecu/exception/FileLoggerException.java b/src/com/romraider/logger/ecu/exception/FileLoggerException.java similarity index 93% rename from src/enginuity/logger/ecu/exception/FileLoggerException.java rename to src/com/romraider/logger/ecu/exception/FileLoggerException.java index 55eac052..2f7aaaf5 100644 --- a/src/enginuity/logger/ecu/exception/FileLoggerException.java +++ b/src/com/romraider/logger/ecu/exception/FileLoggerException.java @@ -19,7 +19,7 @@ * */ -package enginuity.logger.ecu.exception; +package com.romraider.logger.ecu.exception; public final class FileLoggerException extends RuntimeException { diff --git a/src/enginuity/logger/ecu/exception/InvalidResponseException.java b/src/com/romraider/logger/ecu/exception/InvalidResponseException.java similarity index 93% rename from src/enginuity/logger/ecu/exception/InvalidResponseException.java rename to src/com/romraider/logger/ecu/exception/InvalidResponseException.java index 9a5c1d33..84974f1c 100644 --- a/src/enginuity/logger/ecu/exception/InvalidResponseException.java +++ b/src/com/romraider/logger/ecu/exception/InvalidResponseException.java @@ -19,7 +19,7 @@ * */ -package enginuity.logger.ecu.exception; +package com.romraider.logger.ecu.exception; public final class InvalidResponseException extends RuntimeException { diff --git a/src/enginuity/logger/ecu/exception/NotConnectedException.java b/src/com/romraider/logger/ecu/exception/NotConnectedException.java similarity index 93% rename from src/enginuity/logger/ecu/exception/NotConnectedException.java rename to src/com/romraider/logger/ecu/exception/NotConnectedException.java index 3f4aaefa..c9cc1279 100644 --- a/src/enginuity/logger/ecu/exception/NotConnectedException.java +++ b/src/com/romraider/logger/ecu/exception/NotConnectedException.java @@ -19,7 +19,7 @@ * */ -package enginuity.logger.ecu.exception; +package com.romraider.logger.ecu.exception; public final class NotConnectedException extends RuntimeException { public NotConnectedException() { diff --git a/src/enginuity/logger/ecu/exception/PortNotFoundException.java b/src/com/romraider/logger/ecu/exception/PortNotFoundException.java similarity index 93% rename from src/enginuity/logger/ecu/exception/PortNotFoundException.java rename to src/com/romraider/logger/ecu/exception/PortNotFoundException.java index de018e57..12092dcd 100644 --- a/src/enginuity/logger/ecu/exception/PortNotFoundException.java +++ b/src/com/romraider/logger/ecu/exception/PortNotFoundException.java @@ -19,7 +19,7 @@ * */ -package enginuity.logger.ecu.exception; +package com.romraider.logger.ecu.exception; public final class PortNotFoundException extends RuntimeException { diff --git a/src/enginuity/logger/ecu/exception/SerialCommunicationException.java b/src/com/romraider/logger/ecu/exception/SerialCommunicationException.java similarity index 93% rename from src/enginuity/logger/ecu/exception/SerialCommunicationException.java rename to src/com/romraider/logger/ecu/exception/SerialCommunicationException.java index ae61e414..9e1b26ef 100644 --- a/src/enginuity/logger/ecu/exception/SerialCommunicationException.java +++ b/src/com/romraider/logger/ecu/exception/SerialCommunicationException.java @@ -19,7 +19,7 @@ * */ -package enginuity.logger.ecu.exception; +package com.romraider.logger.ecu.exception; public final class SerialCommunicationException extends RuntimeException { diff --git a/src/enginuity/logger/ecu/exception/UnsupportedPortTypeException.java b/src/com/romraider/logger/ecu/exception/UnsupportedPortTypeException.java similarity index 93% rename from src/enginuity/logger/ecu/exception/UnsupportedPortTypeException.java rename to src/com/romraider/logger/ecu/exception/UnsupportedPortTypeException.java index f27276eb..d6ba5b0e 100644 --- a/src/enginuity/logger/ecu/exception/UnsupportedPortTypeException.java +++ b/src/com/romraider/logger/ecu/exception/UnsupportedPortTypeException.java @@ -19,7 +19,7 @@ * */ -package enginuity.logger.ecu.exception; +package com.romraider.logger.ecu.exception; public final class UnsupportedPortTypeException extends RuntimeException { diff --git a/src/enginuity/logger/ecu/exception/UnsupportedProtocolException.java b/src/com/romraider/logger/ecu/exception/UnsupportedProtocolException.java similarity index 93% rename from src/enginuity/logger/ecu/exception/UnsupportedProtocolException.java rename to src/com/romraider/logger/ecu/exception/UnsupportedProtocolException.java index 3528832b..795c8286 100644 --- a/src/enginuity/logger/ecu/exception/UnsupportedProtocolException.java +++ b/src/com/romraider/logger/ecu/exception/UnsupportedProtocolException.java @@ -19,7 +19,7 @@ * */ -package enginuity.logger.ecu.exception; +package com.romraider.logger.ecu.exception; public final class UnsupportedProtocolException extends RuntimeException { diff --git a/src/enginuity/logger/ecu/external/ExternalDataItem.java b/src/com/romraider/logger/ecu/external/ExternalDataItem.java similarity index 71% rename from src/enginuity/logger/ecu/external/ExternalDataItem.java rename to src/com/romraider/logger/ecu/external/ExternalDataItem.java index bc31d305..74c09251 100644 --- a/src/enginuity/logger/ecu/external/ExternalDataItem.java +++ b/src/com/romraider/logger/ecu/external/ExternalDataItem.java @@ -1,4 +1,4 @@ -package enginuity.logger.ecu.external; +package com.romraider.logger.ecu.external; public interface ExternalDataItem { diff --git a/src/enginuity/logger/ecu/external/ExternalDataSource.java b/src/com/romraider/logger/ecu/external/ExternalDataSource.java similarity index 76% rename from src/enginuity/logger/ecu/external/ExternalDataSource.java rename to src/com/romraider/logger/ecu/external/ExternalDataSource.java index ccb11cb0..29fc281d 100644 --- a/src/enginuity/logger/ecu/external/ExternalDataSource.java +++ b/src/com/romraider/logger/ecu/external/ExternalDataSource.java @@ -1,6 +1,6 @@ -package enginuity.logger.ecu.external; +package com.romraider.logger.ecu.external; -import enginuity.logger.ecu.EcuLogger; +import com.romraider.logger.ecu.EcuLogger; import javax.swing.Action; import java.util.List; diff --git a/src/enginuity/logger/ecu/external/ExternalDataSourceLoader.java b/src/com/romraider/logger/ecu/external/ExternalDataSourceLoader.java similarity index 75% rename from src/enginuity/logger/ecu/external/ExternalDataSourceLoader.java rename to src/com/romraider/logger/ecu/external/ExternalDataSourceLoader.java index 39a881a5..6571c4c8 100644 --- a/src/enginuity/logger/ecu/external/ExternalDataSourceLoader.java +++ b/src/com/romraider/logger/ecu/external/ExternalDataSourceLoader.java @@ -1,4 +1,4 @@ -package enginuity.logger.ecu.external; +package com.romraider.logger.ecu.external; import java.util.List; diff --git a/src/enginuity/logger/ecu/external/ExternalDataSourceLoaderImpl.java b/src/com/romraider/logger/ecu/external/ExternalDataSourceLoaderImpl.java similarity index 89% rename from src/enginuity/logger/ecu/external/ExternalDataSourceLoaderImpl.java rename to src/com/romraider/logger/ecu/external/ExternalDataSourceLoaderImpl.java index 72cb0ced..c2985bcb 100644 --- a/src/enginuity/logger/ecu/external/ExternalDataSourceLoaderImpl.java +++ b/src/com/romraider/logger/ecu/external/ExternalDataSourceLoaderImpl.java @@ -1,8 +1,8 @@ -package enginuity.logger.ecu.external; +package com.romraider.logger.ecu.external; -import enginuity.logger.ecu.definition.plugin.PluginFilenameFilter; -import enginuity.logger.ecu.exception.ConfigurationException; -import static enginuity.util.ParamChecker.isNullOrEmpty; +import com.romraider.logger.ecu.definition.plugin.PluginFilenameFilter; +import com.romraider.logger.ecu.exception.ConfigurationException; +import static com.romraider.util.ParamChecker.isNullOrEmpty; import org.apache.log4j.Logger; import java.io.File; import java.io.FileInputStream; diff --git a/src/enginuity/logger/ecu/external/GenericDataSourceManager.java b/src/com/romraider/logger/ecu/external/GenericDataSourceManager.java similarity index 90% rename from src/enginuity/logger/ecu/external/GenericDataSourceManager.java rename to src/com/romraider/logger/ecu/external/GenericDataSourceManager.java index 72eb0b02..c7f0b1c6 100644 --- a/src/enginuity/logger/ecu/external/GenericDataSourceManager.java +++ b/src/com/romraider/logger/ecu/external/GenericDataSourceManager.java @@ -1,7 +1,7 @@ -package enginuity.logger.ecu.external; +package com.romraider.logger.ecu.external; -import enginuity.logger.ecu.EcuLogger; -import static enginuity.util.ParamChecker.checkNotNull; +import com.romraider.logger.ecu.EcuLogger; +import static com.romraider.util.ParamChecker.checkNotNull; import org.apache.log4j.Logger; import javax.swing.Action; import java.util.List; diff --git a/src/enginuity/logger/ecu/profile/UserProfile.java b/src/com/romraider/logger/ecu/profile/UserProfile.java similarity index 85% rename from src/enginuity/logger/ecu/profile/UserProfile.java rename to src/com/romraider/logger/ecu/profile/UserProfile.java index 7135cee5..80a88d79 100644 --- a/src/enginuity/logger/ecu/profile/UserProfile.java +++ b/src/com/romraider/logger/ecu/profile/UserProfile.java @@ -19,10 +19,10 @@ * */ -package enginuity.logger.ecu.profile; +package com.romraider.logger.ecu.profile; -import enginuity.logger.ecu.definition.EcuDataConvertor; -import enginuity.logger.ecu.definition.LoggerData; +import com.romraider.logger.ecu.definition.EcuDataConvertor; +import com.romraider.logger.ecu.definition.LoggerData; public interface UserProfile { diff --git a/src/enginuity/logger/ecu/profile/UserProfileFileFilter.java b/src/com/romraider/logger/ecu/profile/UserProfileFileFilter.java similarity index 90% rename from src/enginuity/logger/ecu/profile/UserProfileFileFilter.java rename to src/com/romraider/logger/ecu/profile/UserProfileFileFilter.java index 23aa68f9..a9a87af7 100644 --- a/src/enginuity/logger/ecu/profile/UserProfileFileFilter.java +++ b/src/com/romraider/logger/ecu/profile/UserProfileFileFilter.java @@ -19,9 +19,9 @@ * */ -package enginuity.logger.ecu.profile; +package com.romraider.logger.ecu.profile; -import enginuity.swing.GenericFileFilter; +import com.romraider.swing.GenericFileFilter; import javax.swing.filechooser.FileFilter; import java.io.File; diff --git a/src/enginuity/logger/ecu/profile/UserProfileImpl.java b/src/com/romraider/logger/ecu/profile/UserProfileImpl.java similarity index 90% rename from src/enginuity/logger/ecu/profile/UserProfileImpl.java rename to src/com/romraider/logger/ecu/profile/UserProfileImpl.java index daea3557..e75c2302 100644 --- a/src/enginuity/logger/ecu/profile/UserProfileImpl.java +++ b/src/com/romraider/logger/ecu/profile/UserProfileImpl.java @@ -19,16 +19,16 @@ * */ -package enginuity.logger.ecu.profile; +package com.romraider.logger.ecu.profile; -import enginuity.logger.ecu.definition.EcuDataConvertor; -import enginuity.logger.ecu.definition.EcuParameter; -import enginuity.logger.ecu.definition.EcuSwitch; -import enginuity.logger.ecu.definition.ExternalData; -import enginuity.logger.ecu.definition.LoggerData; -import enginuity.logger.ecu.exception.ConfigurationException; -import static enginuity.util.ParamChecker.checkNotNull; -import static enginuity.util.ParamChecker.isNullOrEmpty; +import com.romraider.logger.ecu.definition.EcuDataConvertor; +import com.romraider.logger.ecu.definition.EcuParameter; +import com.romraider.logger.ecu.definition.EcuSwitch; +import com.romraider.logger.ecu.definition.ExternalData; +import com.romraider.logger.ecu.definition.LoggerData; +import com.romraider.logger.ecu.exception.ConfigurationException; +import static com.romraider.util.ParamChecker.checkNotNull; +import static com.romraider.util.ParamChecker.isNullOrEmpty; import java.util.Map; public final class UserProfileImpl implements UserProfile { diff --git a/src/enginuity/logger/ecu/profile/UserProfileItem.java b/src/com/romraider/logger/ecu/profile/UserProfileItem.java similarity index 92% rename from src/enginuity/logger/ecu/profile/UserProfileItem.java rename to src/com/romraider/logger/ecu/profile/UserProfileItem.java index 8929950e..e3b96ba0 100644 --- a/src/enginuity/logger/ecu/profile/UserProfileItem.java +++ b/src/com/romraider/logger/ecu/profile/UserProfileItem.java @@ -19,7 +19,7 @@ * */ -package enginuity.logger.ecu.profile; +package com.romraider.logger.ecu.profile; public interface UserProfileItem { diff --git a/src/enginuity/logger/ecu/profile/UserProfileItemImpl.java b/src/com/romraider/logger/ecu/profile/UserProfileItemImpl.java similarity index 94% rename from src/enginuity/logger/ecu/profile/UserProfileItemImpl.java rename to src/com/romraider/logger/ecu/profile/UserProfileItemImpl.java index 5febd8f3..03d3d14f 100644 --- a/src/enginuity/logger/ecu/profile/UserProfileItemImpl.java +++ b/src/com/romraider/logger/ecu/profile/UserProfileItemImpl.java @@ -19,7 +19,7 @@ * */ -package enginuity.logger.ecu.profile; +package com.romraider.logger.ecu.profile; public final class UserProfileItemImpl implements UserProfileItem { private final String units; diff --git a/src/enginuity/logger/ecu/profile/UserProfileLoader.java b/src/com/romraider/logger/ecu/profile/UserProfileLoader.java similarity index 93% rename from src/enginuity/logger/ecu/profile/UserProfileLoader.java rename to src/com/romraider/logger/ecu/profile/UserProfileLoader.java index a19a1e09..e1781181 100644 --- a/src/enginuity/logger/ecu/profile/UserProfileLoader.java +++ b/src/com/romraider/logger/ecu/profile/UserProfileLoader.java @@ -19,7 +19,7 @@ * */ -package enginuity.logger.ecu.profile; +package com.romraider.logger.ecu.profile; public interface UserProfileLoader { UserProfile loadProfile(String filePath); diff --git a/src/enginuity/logger/ecu/profile/UserProfileLoaderImpl.java b/src/com/romraider/logger/ecu/profile/UserProfileLoaderImpl.java similarity index 86% rename from src/enginuity/logger/ecu/profile/UserProfileLoaderImpl.java rename to src/com/romraider/logger/ecu/profile/UserProfileLoaderImpl.java index a931d336..fb21caa5 100644 --- a/src/enginuity/logger/ecu/profile/UserProfileLoaderImpl.java +++ b/src/com/romraider/logger/ecu/profile/UserProfileLoaderImpl.java @@ -19,11 +19,11 @@ * */ -package enginuity.logger.ecu.profile; +package com.romraider.logger.ecu.profile; -import enginuity.logger.ecu.profile.xml.UserProfileHandler; -import static enginuity.util.ParamChecker.checkNotNullOrEmpty; -import static enginuity.util.SaxParserFactory.getSaxParser; +import com.romraider.logger.ecu.profile.xml.UserProfileHandler; +import static com.romraider.util.ParamChecker.checkNotNullOrEmpty; +import static com.romraider.util.SaxParserFactory.getSaxParser; import org.apache.log4j.Logger; import java.io.BufferedInputStream; import java.io.File; diff --git a/src/enginuity/logger/ecu/profile/xml/UserProfileHandler.java b/src/com/romraider/logger/ecu/profile/xml/UserProfileHandler.java similarity index 89% rename from src/enginuity/logger/ecu/profile/xml/UserProfileHandler.java rename to src/com/romraider/logger/ecu/profile/xml/UserProfileHandler.java index 1d5eab42..cd49df52 100644 --- a/src/enginuity/logger/ecu/profile/xml/UserProfileHandler.java +++ b/src/com/romraider/logger/ecu/profile/xml/UserProfileHandler.java @@ -19,12 +19,12 @@ * */ -package enginuity.logger.ecu.profile.xml; +package com.romraider.logger.ecu.profile.xml; -import enginuity.logger.ecu.profile.UserProfile; -import enginuity.logger.ecu.profile.UserProfileImpl; -import enginuity.logger.ecu.profile.UserProfileItem; -import enginuity.logger.ecu.profile.UserProfileItemImpl; +import com.romraider.logger.ecu.profile.UserProfile; +import com.romraider.logger.ecu.profile.UserProfileImpl; +import com.romraider.logger.ecu.profile.UserProfileItem; +import com.romraider.logger.ecu.profile.UserProfileItemImpl; import org.xml.sax.Attributes; import org.xml.sax.helpers.DefaultHandler; import java.util.HashMap; diff --git a/src/enginuity/logger/ecu/ui/DataRegistrationBroker.java b/src/com/romraider/logger/ecu/ui/DataRegistrationBroker.java similarity index 89% rename from src/enginuity/logger/ecu/ui/DataRegistrationBroker.java rename to src/com/romraider/logger/ecu/ui/DataRegistrationBroker.java index c14b0ecd..f6e8b311 100644 --- a/src/enginuity/logger/ecu/ui/DataRegistrationBroker.java +++ b/src/com/romraider/logger/ecu/ui/DataRegistrationBroker.java @@ -19,9 +19,9 @@ * */ -package enginuity.logger.ecu.ui; +package com.romraider.logger.ecu.ui; -import enginuity.logger.ecu.definition.LoggerData; +import com.romraider.logger.ecu.definition.LoggerData; public interface DataRegistrationBroker extends StatusChangeListener { diff --git a/src/enginuity/logger/ecu/ui/DataRegistrationBrokerImpl.java b/src/com/romraider/logger/ecu/ui/DataRegistrationBrokerImpl.java similarity index 88% rename from src/enginuity/logger/ecu/ui/DataRegistrationBrokerImpl.java rename to src/com/romraider/logger/ecu/ui/DataRegistrationBrokerImpl.java index a9a7dfde..c1a47ef4 100644 --- a/src/enginuity/logger/ecu/ui/DataRegistrationBrokerImpl.java +++ b/src/com/romraider/logger/ecu/ui/DataRegistrationBrokerImpl.java @@ -19,12 +19,12 @@ * */ -package enginuity.logger.ecu.ui; +package com.romraider.logger.ecu.ui; -import enginuity.logger.ecu.comms.controller.LoggerController; -import enginuity.logger.ecu.definition.LoggerData; -import enginuity.logger.ecu.ui.handler.DataUpdateHandlerManager; -import static enginuity.util.ParamChecker.checkNotNull; +import com.romraider.logger.ecu.comms.controller.LoggerController; +import com.romraider.logger.ecu.definition.LoggerData; +import com.romraider.logger.ecu.ui.handler.DataUpdateHandlerManager; +import static com.romraider.util.ParamChecker.checkNotNull; import java.util.ArrayList; import static java.util.Collections.synchronizedList; import java.util.List; diff --git a/src/enginuity/logger/ecu/ui/EcuDataComparator.java b/src/com/romraider/logger/ecu/ui/EcuDataComparator.java similarity index 89% rename from src/enginuity/logger/ecu/ui/EcuDataComparator.java rename to src/com/romraider/logger/ecu/ui/EcuDataComparator.java index f57f38ff..8c403984 100644 --- a/src/enginuity/logger/ecu/ui/EcuDataComparator.java +++ b/src/com/romraider/logger/ecu/ui/EcuDataComparator.java @@ -19,9 +19,9 @@ * */ -package enginuity.logger.ecu.ui; +package com.romraider.logger.ecu.ui; -import enginuity.logger.ecu.definition.LoggerData; +import com.romraider.logger.ecu.definition.LoggerData; import java.util.Comparator; public final class EcuDataComparator implements Comparator { diff --git a/src/enginuity/logger/ecu/ui/MessageListener.java b/src/com/romraider/logger/ecu/ui/MessageListener.java similarity index 93% rename from src/enginuity/logger/ecu/ui/MessageListener.java rename to src/com/romraider/logger/ecu/ui/MessageListener.java index b6c84230..e7d083e1 100644 --- a/src/enginuity/logger/ecu/ui/MessageListener.java +++ b/src/com/romraider/logger/ecu/ui/MessageListener.java @@ -19,7 +19,7 @@ * */ -package enginuity.logger.ecu.ui; +package com.romraider.logger.ecu.ui; public interface MessageListener { diff --git a/src/enginuity/logger/ecu/ui/SerialPortComboBox.java b/src/com/romraider/logger/ecu/ui/SerialPortComboBox.java similarity index 92% rename from src/enginuity/logger/ecu/ui/SerialPortComboBox.java rename to src/com/romraider/logger/ecu/ui/SerialPortComboBox.java index cf5bc984..7638c493 100644 --- a/src/enginuity/logger/ecu/ui/SerialPortComboBox.java +++ b/src/com/romraider/logger/ecu/ui/SerialPortComboBox.java @@ -19,11 +19,11 @@ * */ -package enginuity.logger.ecu.ui; +package com.romraider.logger.ecu.ui; -import enginuity.Settings; -import enginuity.io.port.SerialPortRefreshListener; -import static enginuity.util.ParamChecker.checkNotNull; +import com.romraider.Settings; +import com.romraider.io.port.SerialPortRefreshListener; +import static com.romraider.util.ParamChecker.checkNotNull; import javax.swing.JComboBox; import java.util.Set; import java.util.TreeSet; diff --git a/src/enginuity/logger/ecu/ui/StatusChangeListener.java b/src/com/romraider/logger/ecu/ui/StatusChangeListener.java similarity index 93% rename from src/enginuity/logger/ecu/ui/StatusChangeListener.java rename to src/com/romraider/logger/ecu/ui/StatusChangeListener.java index 1519d444..643f8d2d 100644 --- a/src/enginuity/logger/ecu/ui/StatusChangeListener.java +++ b/src/com/romraider/logger/ecu/ui/StatusChangeListener.java @@ -19,7 +19,7 @@ * */ -package enginuity.logger.ecu.ui; +package com.romraider.logger.ecu.ui; public interface StatusChangeListener { diff --git a/src/enginuity/logger/ecu/ui/StatusIndicator.java b/src/com/romraider/logger/ecu/ui/StatusIndicator.java similarity index 96% rename from src/enginuity/logger/ecu/ui/StatusIndicator.java rename to src/com/romraider/logger/ecu/ui/StatusIndicator.java index ca34653e..ba664055 100644 --- a/src/enginuity/logger/ecu/ui/StatusIndicator.java +++ b/src/com/romraider/logger/ecu/ui/StatusIndicator.java @@ -19,7 +19,7 @@ * */ -package enginuity.logger.ecu.ui; +package com.romraider.logger.ecu.ui; import javax.swing.ImageIcon; import javax.swing.JLabel; diff --git a/src/enginuity/logger/ecu/ui/handler/DataUpdateHandler.java b/src/com/romraider/logger/ecu/ui/handler/DataUpdateHandler.java similarity index 84% rename from src/enginuity/logger/ecu/ui/handler/DataUpdateHandler.java rename to src/com/romraider/logger/ecu/ui/handler/DataUpdateHandler.java index 37b4a522..3dfc96b5 100644 --- a/src/enginuity/logger/ecu/ui/handler/DataUpdateHandler.java +++ b/src/com/romraider/logger/ecu/ui/handler/DataUpdateHandler.java @@ -19,10 +19,10 @@ * */ -package enginuity.logger.ecu.ui.handler; +package com.romraider.logger.ecu.ui.handler; -import enginuity.logger.ecu.comms.query.Response; -import enginuity.logger.ecu.definition.LoggerData; +import com.romraider.logger.ecu.comms.query.Response; +import com.romraider.logger.ecu.definition.LoggerData; public interface DataUpdateHandler { diff --git a/src/enginuity/logger/ecu/ui/handler/DataUpdateHandlerManager.java b/src/com/romraider/logger/ecu/ui/handler/DataUpdateHandlerManager.java similarity index 88% rename from src/enginuity/logger/ecu/ui/handler/DataUpdateHandlerManager.java rename to src/com/romraider/logger/ecu/ui/handler/DataUpdateHandlerManager.java index 97c7d36a..e0015b14 100644 --- a/src/enginuity/logger/ecu/ui/handler/DataUpdateHandlerManager.java +++ b/src/com/romraider/logger/ecu/ui/handler/DataUpdateHandlerManager.java @@ -19,9 +19,9 @@ * */ -package enginuity.logger.ecu.ui.handler; +package com.romraider.logger.ecu.ui.handler; -import enginuity.logger.ecu.definition.LoggerData; +import com.romraider.logger.ecu.definition.LoggerData; public interface DataUpdateHandlerManager { diff --git a/src/enginuity/logger/ecu/ui/handler/DataUpdateHandlerManagerImpl.java b/src/com/romraider/logger/ecu/ui/handler/DataUpdateHandlerManagerImpl.java similarity index 91% rename from src/enginuity/logger/ecu/ui/handler/DataUpdateHandlerManagerImpl.java rename to src/com/romraider/logger/ecu/ui/handler/DataUpdateHandlerManagerImpl.java index b05a386c..cba0189f 100644 --- a/src/enginuity/logger/ecu/ui/handler/DataUpdateHandlerManagerImpl.java +++ b/src/com/romraider/logger/ecu/ui/handler/DataUpdateHandlerManagerImpl.java @@ -19,9 +19,9 @@ * */ -package enginuity.logger.ecu.ui.handler; +package com.romraider.logger.ecu.ui.handler; -import enginuity.logger.ecu.definition.LoggerData; +import com.romraider.logger.ecu.definition.LoggerData; import java.util.ArrayList; import java.util.List; diff --git a/src/enginuity/logger/ecu/ui/handler/dash/DashboardUpdateHandler.java b/src/com/romraider/logger/ecu/ui/handler/dash/DashboardUpdateHandler.java similarity index 87% rename from src/enginuity/logger/ecu/ui/handler/dash/DashboardUpdateHandler.java rename to src/com/romraider/logger/ecu/ui/handler/dash/DashboardUpdateHandler.java index 43ec3a1e..ce3b97e3 100644 --- a/src/enginuity/logger/ecu/ui/handler/dash/DashboardUpdateHandler.java +++ b/src/com/romraider/logger/ecu/ui/handler/dash/DashboardUpdateHandler.java @@ -19,13 +19,13 @@ * */ -package enginuity.logger.ecu.ui.handler.dash; +package com.romraider.logger.ecu.ui.handler.dash; -import enginuity.logger.ecu.comms.query.Response; -import enginuity.logger.ecu.definition.ConvertorUpdateListener; -import enginuity.logger.ecu.definition.LoggerData; -import enginuity.logger.ecu.ui.handler.DataUpdateHandler; -import static enginuity.util.ThreadUtil.run; +import com.romraider.logger.ecu.comms.query.Response; +import com.romraider.logger.ecu.definition.ConvertorUpdateListener; +import com.romraider.logger.ecu.definition.LoggerData; +import com.romraider.logger.ecu.ui.handler.DataUpdateHandler; +import static com.romraider.util.ThreadUtil.run; import javax.swing.JPanel; import javax.swing.SwingUtilities; import static java.util.Collections.synchronizedMap; diff --git a/src/enginuity/logger/ecu/ui/handler/dash/Gauge.java b/src/com/romraider/logger/ecu/ui/handler/dash/Gauge.java similarity index 92% rename from src/enginuity/logger/ecu/ui/handler/dash/Gauge.java rename to src/com/romraider/logger/ecu/ui/handler/dash/Gauge.java index 20dc22ce..61950459 100644 --- a/src/enginuity/logger/ecu/ui/handler/dash/Gauge.java +++ b/src/com/romraider/logger/ecu/ui/handler/dash/Gauge.java @@ -19,7 +19,7 @@ * */ -package enginuity.logger.ecu.ui.handler.dash; +package com.romraider.logger.ecu.ui.handler.dash; import javax.swing.JPanel; diff --git a/src/enginuity/logger/ecu/ui/handler/dash/PlainGauge.java b/src/com/romraider/logger/ecu/ui/handler/dash/PlainGauge.java similarity index 95% rename from src/enginuity/logger/ecu/ui/handler/dash/PlainGauge.java rename to src/com/romraider/logger/ecu/ui/handler/dash/PlainGauge.java index 18adc4b1..9382af51 100644 --- a/src/enginuity/logger/ecu/ui/handler/dash/PlainGauge.java +++ b/src/com/romraider/logger/ecu/ui/handler/dash/PlainGauge.java @@ -19,11 +19,11 @@ * */ -package enginuity.logger.ecu.ui.handler.dash; +package com.romraider.logger.ecu.ui.handler.dash; -import enginuity.logger.ecu.definition.LoggerData; -import enginuity.tts.Speaker; -import static enginuity.util.ParamChecker.checkNotNull; +import com.romraider.logger.ecu.definition.LoggerData; +import com.romraider.tts.Speaker; +import static com.romraider.util.ParamChecker.checkNotNull; import static javax.swing.BorderFactory.createLineBorder; import javax.swing.JCheckBox; import javax.swing.JComboBox; diff --git a/src/enginuity/logger/ecu/ui/handler/file/FileLogger.java b/src/com/romraider/logger/ecu/ui/handler/file/FileLogger.java similarity index 92% rename from src/enginuity/logger/ecu/ui/handler/file/FileLogger.java rename to src/com/romraider/logger/ecu/ui/handler/file/FileLogger.java index bd45b64b..89e679ec 100644 --- a/src/enginuity/logger/ecu/ui/handler/file/FileLogger.java +++ b/src/com/romraider/logger/ecu/ui/handler/file/FileLogger.java @@ -19,7 +19,7 @@ * */ -package enginuity.logger.ecu.ui.handler.file; +package com.romraider.logger.ecu.ui.handler.file; public interface FileLogger { void start(); diff --git a/src/enginuity/logger/ecu/ui/handler/file/FileLoggerControllerSwitchHandler.java b/src/com/romraider/logger/ecu/ui/handler/file/FileLoggerControllerSwitchHandler.java similarity index 64% rename from src/enginuity/logger/ecu/ui/handler/file/FileLoggerControllerSwitchHandler.java rename to src/com/romraider/logger/ecu/ui/handler/file/FileLoggerControllerSwitchHandler.java index 95409fe4..0e7b10aa 100644 --- a/src/enginuity/logger/ecu/ui/handler/file/FileLoggerControllerSwitchHandler.java +++ b/src/com/romraider/logger/ecu/ui/handler/file/FileLoggerControllerSwitchHandler.java @@ -1,4 +1,4 @@ -package enginuity.logger.ecu.ui.handler.file; +package com.romraider.logger.ecu.ui.handler.file; public interface FileLoggerControllerSwitchHandler { diff --git a/src/enginuity/logger/ecu/ui/handler/file/FileLoggerControllerSwitchMonitor.java b/src/com/romraider/logger/ecu/ui/handler/file/FileLoggerControllerSwitchMonitor.java similarity index 55% rename from src/enginuity/logger/ecu/ui/handler/file/FileLoggerControllerSwitchMonitor.java rename to src/com/romraider/logger/ecu/ui/handler/file/FileLoggerControllerSwitchMonitor.java index f489ab56..a73ea7b6 100644 --- a/src/enginuity/logger/ecu/ui/handler/file/FileLoggerControllerSwitchMonitor.java +++ b/src/com/romraider/logger/ecu/ui/handler/file/FileLoggerControllerSwitchMonitor.java @@ -1,6 +1,6 @@ -package enginuity.logger.ecu.ui.handler.file; +package com.romraider.logger.ecu.ui.handler.file; -import enginuity.logger.ecu.definition.EcuSwitch; +import com.romraider.logger.ecu.definition.EcuSwitch; public interface FileLoggerControllerSwitchMonitor { diff --git a/src/enginuity/logger/ecu/ui/handler/file/FileLoggerControllerSwitchMonitorImpl.java b/src/com/romraider/logger/ecu/ui/handler/file/FileLoggerControllerSwitchMonitorImpl.java similarity index 78% rename from src/enginuity/logger/ecu/ui/handler/file/FileLoggerControllerSwitchMonitorImpl.java rename to src/com/romraider/logger/ecu/ui/handler/file/FileLoggerControllerSwitchMonitorImpl.java index 1d5a0181..31539fdd 100644 --- a/src/enginuity/logger/ecu/ui/handler/file/FileLoggerControllerSwitchMonitorImpl.java +++ b/src/com/romraider/logger/ecu/ui/handler/file/FileLoggerControllerSwitchMonitorImpl.java @@ -1,7 +1,7 @@ -package enginuity.logger.ecu.ui.handler.file; +package com.romraider.logger.ecu.ui.handler.file; -import enginuity.logger.ecu.definition.EcuSwitch; -import static enginuity.util.ParamChecker.checkNotNull; +import com.romraider.logger.ecu.definition.EcuSwitch; +import static com.romraider.util.ParamChecker.checkNotNull; public final class FileLoggerControllerSwitchMonitorImpl implements FileLoggerControllerSwitchMonitor { private final EcuSwitch fileLoggingSwitch; diff --git a/src/enginuity/logger/ecu/ui/handler/file/FileLoggerImpl.java b/src/com/romraider/logger/ecu/ui/handler/file/FileLoggerImpl.java similarity index 91% rename from src/enginuity/logger/ecu/ui/handler/file/FileLoggerImpl.java rename to src/com/romraider/logger/ecu/ui/handler/file/FileLoggerImpl.java index 1bdce8a4..4b06f1bf 100644 --- a/src/enginuity/logger/ecu/ui/handler/file/FileLoggerImpl.java +++ b/src/com/romraider/logger/ecu/ui/handler/file/FileLoggerImpl.java @@ -19,12 +19,12 @@ * */ -package enginuity.logger.ecu.ui.handler.file; +package com.romraider.logger.ecu.ui.handler.file; -import enginuity.Settings; -import enginuity.logger.ecu.exception.FileLoggerException; -import enginuity.logger.ecu.ui.MessageListener; -import static enginuity.util.ParamChecker.checkNotNull; +import com.romraider.Settings; +import com.romraider.logger.ecu.exception.FileLoggerException; +import com.romraider.logger.ecu.ui.MessageListener; +import static com.romraider.util.ParamChecker.checkNotNull; import java.io.BufferedOutputStream; import java.io.File; import java.io.FileOutputStream; diff --git a/src/com/romraider/logger/ecu/ui/handler/file/FileUpdateHandler.java b/src/com/romraider/logger/ecu/ui/handler/file/FileUpdateHandler.java new file mode 100644 index 00000000..b69ebcf4 --- /dev/null +++ b/src/com/romraider/logger/ecu/ui/handler/file/FileUpdateHandler.java @@ -0,0 +1,13 @@ +package com.romraider.logger.ecu.ui.handler.file; + +import com.romraider.logger.ecu.ui.StatusChangeListener; +import com.romraider.logger.ecu.ui.handler.DataUpdateHandler; + +public interface FileUpdateHandler extends DataUpdateHandler { + + void addListener(StatusChangeListener listener); + + void start(); + + void stop(); +} diff --git a/src/enginuity/logger/ecu/ui/handler/file/FileUpdateHandlerImpl.java b/src/com/romraider/logger/ecu/ui/handler/file/FileUpdateHandlerImpl.java similarity index 90% rename from src/enginuity/logger/ecu/ui/handler/file/FileUpdateHandlerImpl.java rename to src/com/romraider/logger/ecu/ui/handler/file/FileUpdateHandlerImpl.java index ac037375..d34c3384 100644 --- a/src/enginuity/logger/ecu/ui/handler/file/FileUpdateHandlerImpl.java +++ b/src/com/romraider/logger/ecu/ui/handler/file/FileUpdateHandlerImpl.java @@ -19,15 +19,15 @@ * */ -package enginuity.logger.ecu.ui.handler.file; +package com.romraider.logger.ecu.ui.handler.file; -import enginuity.Settings; -import enginuity.logger.ecu.comms.query.Response; -import enginuity.logger.ecu.definition.ConvertorUpdateListener; -import enginuity.logger.ecu.definition.LoggerData; -import enginuity.logger.ecu.ui.MessageListener; -import enginuity.logger.ecu.ui.StatusChangeListener; -import static enginuity.util.ParamChecker.checkNotNull; +import com.romraider.Settings; +import com.romraider.logger.ecu.comms.query.Response; +import com.romraider.logger.ecu.definition.ConvertorUpdateListener; +import com.romraider.logger.ecu.definition.LoggerData; +import com.romraider.logger.ecu.ui.MessageListener; +import com.romraider.logger.ecu.ui.StatusChangeListener; +import static com.romraider.util.ParamChecker.checkNotNull; import java.util.ArrayList; import static java.util.Collections.synchronizedList; import static java.util.Collections.synchronizedMap; diff --git a/src/enginuity/logger/ecu/ui/handler/graph/GraphUpdateHandler.java b/src/com/romraider/logger/ecu/ui/handler/graph/GraphUpdateHandler.java similarity index 93% rename from src/enginuity/logger/ecu/ui/handler/graph/GraphUpdateHandler.java rename to src/com/romraider/logger/ecu/ui/handler/graph/GraphUpdateHandler.java index 33395e44..31ee86c7 100644 --- a/src/enginuity/logger/ecu/ui/handler/graph/GraphUpdateHandler.java +++ b/src/com/romraider/logger/ecu/ui/handler/graph/GraphUpdateHandler.java @@ -1,10 +1,10 @@ -package enginuity.logger.ecu.ui.handler.graph; +package com.romraider.logger.ecu.ui.handler.graph; -import enginuity.logger.ecu.comms.query.Response; -import enginuity.logger.ecu.definition.ConvertorUpdateListener; -import enginuity.logger.ecu.definition.LoggerData; -import enginuity.logger.ecu.ui.handler.DataUpdateHandler; -import static enginuity.logger.ecu.ui.handler.graph.SpringUtilities.makeCompactGrid; +import com.romraider.logger.ecu.comms.query.Response; +import com.romraider.logger.ecu.definition.ConvertorUpdateListener; +import com.romraider.logger.ecu.definition.LoggerData; +import com.romraider.logger.ecu.ui.handler.DataUpdateHandler; +import static com.romraider.logger.ecu.ui.handler.graph.SpringUtilities.makeCompactGrid; import org.jfree.chart.ChartFactory; import org.jfree.chart.ChartPanel; import org.jfree.chart.JFreeChart; diff --git a/src/enginuity/logger/ecu/ui/handler/graph/SpringUtilities.java b/src/com/romraider/logger/ecu/ui/handler/graph/SpringUtilities.java similarity index 96% rename from src/enginuity/logger/ecu/ui/handler/graph/SpringUtilities.java rename to src/com/romraider/logger/ecu/ui/handler/graph/SpringUtilities.java index 2c21f05a..befd29c8 100644 --- a/src/enginuity/logger/ecu/ui/handler/graph/SpringUtilities.java +++ b/src/com/romraider/logger/ecu/ui/handler/graph/SpringUtilities.java @@ -1,4 +1,4 @@ -package enginuity.logger.ecu.ui.handler.graph; +package com.romraider.logger.ecu.ui.handler.graph; import org.apache.log4j.Logger; import javax.swing.Spring; diff --git a/src/enginuity/logger/ecu/ui/handler/injector/InjectorUpdateHandler.java b/src/com/romraider/logger/ecu/ui/handler/injector/InjectorUpdateHandler.java similarity index 93% rename from src/enginuity/logger/ecu/ui/handler/injector/InjectorUpdateHandler.java rename to src/com/romraider/logger/ecu/ui/handler/injector/InjectorUpdateHandler.java index 0c93e2da..79bd5dff 100644 --- a/src/enginuity/logger/ecu/ui/handler/injector/InjectorUpdateHandler.java +++ b/src/com/romraider/logger/ecu/ui/handler/injector/InjectorUpdateHandler.java @@ -1,9 +1,9 @@ -package enginuity.logger.ecu.ui.handler.injector; +package com.romraider.logger.ecu.ui.handler.injector; -import enginuity.logger.ecu.comms.query.Response; -import enginuity.logger.ecu.definition.LoggerData; -import enginuity.logger.ecu.ui.handler.DataUpdateHandler; -import enginuity.logger.ecu.ui.tab.injector.InjectorTab; +import com.romraider.logger.ecu.comms.query.Response; +import com.romraider.logger.ecu.definition.LoggerData; +import com.romraider.logger.ecu.ui.handler.DataUpdateHandler; +import com.romraider.logger.ecu.ui.tab.injector.InjectorTab; import org.apache.log4j.Logger; import javax.swing.SwingUtilities; import static java.lang.Math.abs; diff --git a/src/enginuity/logger/ecu/ui/handler/livedata/LiveDataRow.java b/src/com/romraider/logger/ecu/ui/handler/livedata/LiveDataRow.java similarity index 89% rename from src/enginuity/logger/ecu/ui/handler/livedata/LiveDataRow.java rename to src/com/romraider/logger/ecu/ui/handler/livedata/LiveDataRow.java index ed4dd7fd..4d1c9810 100644 --- a/src/enginuity/logger/ecu/ui/handler/livedata/LiveDataRow.java +++ b/src/com/romraider/logger/ecu/ui/handler/livedata/LiveDataRow.java @@ -19,10 +19,10 @@ * */ -package enginuity.logger.ecu.ui.handler.livedata; +package com.romraider.logger.ecu.ui.handler.livedata; -import enginuity.logger.ecu.definition.LoggerData; -import static enginuity.util.ParamChecker.checkNotNull; +import com.romraider.logger.ecu.definition.LoggerData; +import static com.romraider.util.ParamChecker.checkNotNull; public final class LiveDataRow { private static final double ZERO = 0.0; diff --git a/src/enginuity/logger/ecu/ui/handler/livedata/LiveDataTableModel.java b/src/com/romraider/logger/ecu/ui/handler/livedata/LiveDataTableModel.java similarity index 94% rename from src/enginuity/logger/ecu/ui/handler/livedata/LiveDataTableModel.java rename to src/com/romraider/logger/ecu/ui/handler/livedata/LiveDataTableModel.java index e5329a0d..89f3a316 100644 --- a/src/enginuity/logger/ecu/ui/handler/livedata/LiveDataTableModel.java +++ b/src/com/romraider/logger/ecu/ui/handler/livedata/LiveDataTableModel.java @@ -19,9 +19,9 @@ * */ -package enginuity.logger.ecu.ui.handler.livedata; +package com.romraider.logger.ecu.ui.handler.livedata; -import enginuity.logger.ecu.definition.LoggerData; +import com.romraider.logger.ecu.definition.LoggerData; import javax.swing.table.AbstractTableModel; import static java.util.Collections.synchronizedList; import static java.util.Collections.synchronizedMap; diff --git a/src/enginuity/logger/ecu/ui/handler/livedata/LiveDataUpdateHandler.java b/src/com/romraider/logger/ecu/ui/handler/livedata/LiveDataUpdateHandler.java similarity index 85% rename from src/enginuity/logger/ecu/ui/handler/livedata/LiveDataUpdateHandler.java rename to src/com/romraider/logger/ecu/ui/handler/livedata/LiveDataUpdateHandler.java index 167fe862..2e70379c 100644 --- a/src/enginuity/logger/ecu/ui/handler/livedata/LiveDataUpdateHandler.java +++ b/src/com/romraider/logger/ecu/ui/handler/livedata/LiveDataUpdateHandler.java @@ -19,12 +19,12 @@ * */ -package enginuity.logger.ecu.ui.handler.livedata; +package com.romraider.logger.ecu.ui.handler.livedata; -import enginuity.logger.ecu.comms.query.Response; -import enginuity.logger.ecu.definition.ConvertorUpdateListener; -import enginuity.logger.ecu.definition.LoggerData; -import enginuity.logger.ecu.ui.handler.DataUpdateHandler; +import com.romraider.logger.ecu.comms.query.Response; +import com.romraider.logger.ecu.definition.ConvertorUpdateListener; +import com.romraider.logger.ecu.definition.LoggerData; +import com.romraider.logger.ecu.ui.handler.DataUpdateHandler; import javax.swing.SwingUtilities; public final class LiveDataUpdateHandler implements DataUpdateHandler, ConvertorUpdateListener { diff --git a/src/enginuity/logger/ecu/ui/handler/maf/MafUpdateHandler.java b/src/com/romraider/logger/ecu/ui/handler/maf/MafUpdateHandler.java similarity index 93% rename from src/enginuity/logger/ecu/ui/handler/maf/MafUpdateHandler.java rename to src/com/romraider/logger/ecu/ui/handler/maf/MafUpdateHandler.java index cefbccab..a4816d45 100644 --- a/src/enginuity/logger/ecu/ui/handler/maf/MafUpdateHandler.java +++ b/src/com/romraider/logger/ecu/ui/handler/maf/MafUpdateHandler.java @@ -1,9 +1,9 @@ -package enginuity.logger.ecu.ui.handler.maf; +package com.romraider.logger.ecu.ui.handler.maf; -import enginuity.logger.ecu.comms.query.Response; -import enginuity.logger.ecu.definition.LoggerData; -import enginuity.logger.ecu.ui.handler.DataUpdateHandler; -import enginuity.logger.ecu.ui.tab.maf.MafTab; +import com.romraider.logger.ecu.comms.query.Response; +import com.romraider.logger.ecu.definition.LoggerData; +import com.romraider.logger.ecu.ui.handler.DataUpdateHandler; +import com.romraider.logger.ecu.ui.tab.maf.MafTab; import org.apache.log4j.Logger; import javax.swing.SwingUtilities; import static java.lang.Math.abs; diff --git a/src/enginuity/logger/ecu/ui/handler/table/TableUpdateHandler.java b/src/com/romraider/logger/ecu/ui/handler/table/TableUpdateHandler.java similarity index 87% rename from src/enginuity/logger/ecu/ui/handler/table/TableUpdateHandler.java rename to src/com/romraider/logger/ecu/ui/handler/table/TableUpdateHandler.java index a610c455..b0287580 100644 --- a/src/enginuity/logger/ecu/ui/handler/table/TableUpdateHandler.java +++ b/src/com/romraider/logger/ecu/ui/handler/table/TableUpdateHandler.java @@ -19,15 +19,15 @@ * */ -package enginuity.logger.ecu.ui.handler.table; +package com.romraider.logger.ecu.ui.handler.table; -import enginuity.logger.ecu.comms.query.Response; -import enginuity.logger.ecu.definition.LoggerData; -import enginuity.logger.ecu.ui.handler.DataUpdateHandler; -import enginuity.maps.Table; -import enginuity.maps.Table2D; -import enginuity.maps.Table3D; -import static enginuity.util.ParamChecker.isNullOrEmpty; +import com.romraider.logger.ecu.comms.query.Response; +import com.romraider.logger.ecu.definition.LoggerData; +import com.romraider.logger.ecu.ui.handler.DataUpdateHandler; +import com.romraider.maps.Table; +import com.romraider.maps.Table2D; +import com.romraider.maps.Table3D; +import static com.romraider.util.ParamChecker.isNullOrEmpty; import java.util.ArrayList; import static java.util.Collections.synchronizedMap; import java.util.HashMap; diff --git a/src/enginuity/logger/ecu/ui/paramlist/ParameterListTable.java b/src/com/romraider/logger/ecu/ui/paramlist/ParameterListTable.java similarity index 91% rename from src/enginuity/logger/ecu/ui/paramlist/ParameterListTable.java rename to src/com/romraider/logger/ecu/ui/paramlist/ParameterListTable.java index e25d35a4..a96d5fc7 100644 --- a/src/enginuity/logger/ecu/ui/paramlist/ParameterListTable.java +++ b/src/com/romraider/logger/ecu/ui/paramlist/ParameterListTable.java @@ -19,10 +19,10 @@ * */ -package enginuity.logger.ecu.ui.paramlist; +package com.romraider.logger.ecu.ui.paramlist; -import enginuity.logger.ecu.definition.EcuData; -import static enginuity.util.ParamChecker.isNullOrEmpty; +import com.romraider.logger.ecu.definition.EcuData; +import static com.romraider.util.ParamChecker.isNullOrEmpty; import javax.swing.JTable; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; diff --git a/src/enginuity/logger/ecu/ui/paramlist/ParameterListTableModel.java b/src/com/romraider/logger/ecu/ui/paramlist/ParameterListTableModel.java similarity index 93% rename from src/enginuity/logger/ecu/ui/paramlist/ParameterListTableModel.java rename to src/com/romraider/logger/ecu/ui/paramlist/ParameterListTableModel.java index 5f5db48e..9175e8ff 100644 --- a/src/enginuity/logger/ecu/ui/paramlist/ParameterListTableModel.java +++ b/src/com/romraider/logger/ecu/ui/paramlist/ParameterListTableModel.java @@ -19,10 +19,10 @@ * */ -package enginuity.logger.ecu.ui.paramlist; +package com.romraider.logger.ecu.ui.paramlist; -import enginuity.logger.ecu.definition.LoggerData; -import enginuity.logger.ecu.ui.DataRegistrationBroker; +import com.romraider.logger.ecu.definition.LoggerData; +import com.romraider.logger.ecu.ui.DataRegistrationBroker; import javax.swing.table.AbstractTableModel; import java.util.ArrayList; import static java.util.Collections.synchronizedList; diff --git a/src/enginuity/logger/ecu/ui/paramlist/ParameterRow.java b/src/com/romraider/logger/ecu/ui/paramlist/ParameterRow.java similarity index 86% rename from src/enginuity/logger/ecu/ui/paramlist/ParameterRow.java rename to src/com/romraider/logger/ecu/ui/paramlist/ParameterRow.java index 61d00e64..06d9df56 100644 --- a/src/enginuity/logger/ecu/ui/paramlist/ParameterRow.java +++ b/src/com/romraider/logger/ecu/ui/paramlist/ParameterRow.java @@ -19,10 +19,10 @@ * */ -package enginuity.logger.ecu.ui.paramlist; +package com.romraider.logger.ecu.ui.paramlist; -import enginuity.logger.ecu.definition.LoggerData; -import static enginuity.util.ParamChecker.checkNotNull; +import com.romraider.logger.ecu.definition.LoggerData; +import static com.romraider.util.ParamChecker.checkNotNull; public final class ParameterRow { private final LoggerData loggerData; diff --git a/src/enginuity/logger/ecu/ui/paramlist/UnitsComboBoxEditor.java b/src/com/romraider/logger/ecu/ui/paramlist/UnitsComboBoxEditor.java similarity index 91% rename from src/enginuity/logger/ecu/ui/paramlist/UnitsComboBoxEditor.java rename to src/com/romraider/logger/ecu/ui/paramlist/UnitsComboBoxEditor.java index fdfe1871..d623979b 100644 --- a/src/enginuity/logger/ecu/ui/paramlist/UnitsComboBoxEditor.java +++ b/src/com/romraider/logger/ecu/ui/paramlist/UnitsComboBoxEditor.java @@ -19,10 +19,10 @@ * */ -package enginuity.logger.ecu.ui.paramlist; +package com.romraider.logger.ecu.ui.paramlist; -import enginuity.logger.ecu.definition.EcuData; -import enginuity.logger.ecu.definition.EcuDataConvertor; +import com.romraider.logger.ecu.definition.EcuData; +import com.romraider.logger.ecu.definition.EcuDataConvertor; import javax.swing.AbstractCellEditor; import javax.swing.JComboBox; import javax.swing.JTable; diff --git a/src/enginuity/logger/ecu/ui/paramlist/UnitsComboBoxRenderer.java b/src/com/romraider/logger/ecu/ui/paramlist/UnitsComboBoxRenderer.java similarity index 88% rename from src/enginuity/logger/ecu/ui/paramlist/UnitsComboBoxRenderer.java rename to src/com/romraider/logger/ecu/ui/paramlist/UnitsComboBoxRenderer.java index b17f1294..f497f193 100644 --- a/src/enginuity/logger/ecu/ui/paramlist/UnitsComboBoxRenderer.java +++ b/src/com/romraider/logger/ecu/ui/paramlist/UnitsComboBoxRenderer.java @@ -19,10 +19,10 @@ * */ -package enginuity.logger.ecu.ui.paramlist; +package com.romraider.logger.ecu.ui.paramlist; -import enginuity.logger.ecu.definition.EcuData; -import enginuity.logger.ecu.definition.EcuDataConvertor; +import com.romraider.logger.ecu.definition.EcuData; +import com.romraider.logger.ecu.definition.EcuDataConvertor; import javax.swing.JComboBox; import javax.swing.JTable; import javax.swing.table.TableCellRenderer; diff --git a/src/enginuity/logger/ecu/ui/playback/PlaybackManager.java b/src/com/romraider/logger/ecu/ui/playback/PlaybackManager.java similarity index 77% rename from src/enginuity/logger/ecu/ui/playback/PlaybackManager.java rename to src/com/romraider/logger/ecu/ui/playback/PlaybackManager.java index 8ff70974..9b199d24 100644 --- a/src/enginuity/logger/ecu/ui/playback/PlaybackManager.java +++ b/src/com/romraider/logger/ecu/ui/playback/PlaybackManager.java @@ -1,4 +1,4 @@ -package enginuity.logger.ecu.ui.playback; +package com.romraider.logger.ecu.ui.playback; import java.io.File; diff --git a/src/enginuity/logger/ecu/ui/playback/PlaybackManagerImpl.java b/src/com/romraider/logger/ecu/ui/playback/PlaybackManagerImpl.java similarity index 81% rename from src/enginuity/logger/ecu/ui/playback/PlaybackManagerImpl.java rename to src/com/romraider/logger/ecu/ui/playback/PlaybackManagerImpl.java index fbb0ccbb..a578c199 100644 --- a/src/enginuity/logger/ecu/ui/playback/PlaybackManagerImpl.java +++ b/src/com/romraider/logger/ecu/ui/playback/PlaybackManagerImpl.java @@ -1,10 +1,10 @@ -package enginuity.logger.ecu.ui.playback; +package com.romraider.logger.ecu.ui.playback; -import enginuity.logger.ecu.comms.query.Response; -import enginuity.logger.ecu.comms.query.ResponseImpl; -import enginuity.logger.ecu.definition.LoggerData; -import enginuity.logger.ecu.ui.handler.DataUpdateHandler; -import static enginuity.util.ThreadUtil.sleep; +import com.romraider.logger.ecu.comms.query.Response; +import com.romraider.logger.ecu.comms.query.ResponseImpl; +import com.romraider.logger.ecu.definition.LoggerData; +import com.romraider.logger.ecu.ui.handler.DataUpdateHandler; +import static com.romraider.util.ThreadUtil.sleep; import java.io.File; import java.util.List; diff --git a/src/enginuity/logger/ecu/ui/swing/menubar/EcuLoggerMenu.java b/src/com/romraider/logger/ecu/ui/swing/menubar/EcuLoggerMenu.java similarity index 75% rename from src/enginuity/logger/ecu/ui/swing/menubar/EcuLoggerMenu.java rename to src/com/romraider/logger/ecu/ui/swing/menubar/EcuLoggerMenu.java index f6d695fe..0d49fec2 100644 --- a/src/enginuity/logger/ecu/ui/swing/menubar/EcuLoggerMenu.java +++ b/src/com/romraider/logger/ecu/ui/swing/menubar/EcuLoggerMenu.java @@ -1,4 +1,4 @@ -package enginuity.logger.ecu.ui.swing.menubar; +package com.romraider.logger.ecu.ui.swing.menubar; import javax.swing.JMenu; diff --git a/src/enginuity/logger/ecu/ui/swing/menubar/EcuLoggerMenuBar.java b/src/com/romraider/logger/ecu/ui/swing/menubar/EcuLoggerMenuBar.java similarity index 76% rename from src/enginuity/logger/ecu/ui/swing/menubar/EcuLoggerMenuBar.java rename to src/com/romraider/logger/ecu/ui/swing/menubar/EcuLoggerMenuBar.java index 750dcf99..a82d16c4 100644 --- a/src/enginuity/logger/ecu/ui/swing/menubar/EcuLoggerMenuBar.java +++ b/src/com/romraider/logger/ecu/ui/swing/menubar/EcuLoggerMenuBar.java @@ -1,19 +1,19 @@ -package enginuity.logger.ecu.ui.swing.menubar; +package com.romraider.logger.ecu.ui.swing.menubar; -import enginuity.logger.ecu.EcuLogger; -import enginuity.logger.ecu.external.ExternalDataSource; -import enginuity.logger.ecu.ui.swing.menubar.action.AboutAction; -import enginuity.logger.ecu.ui.swing.menubar.action.DisconnectAction; -import enginuity.logger.ecu.ui.swing.menubar.action.ExitAction; -import enginuity.logger.ecu.ui.swing.menubar.action.LoadProfileAction; -import enginuity.logger.ecu.ui.swing.menubar.action.LogFileAbsoluteTimestampAction; -import enginuity.logger.ecu.ui.swing.menubar.action.LogFileControllerSwitchAction; -import enginuity.logger.ecu.ui.swing.menubar.action.LogFileLocationAction; -import enginuity.logger.ecu.ui.swing.menubar.action.ReloadProfileAction; -import enginuity.logger.ecu.ui.swing.menubar.action.ResetConnectionAction; -import enginuity.logger.ecu.ui.swing.menubar.action.ResetEcuAction; -import enginuity.logger.ecu.ui.swing.menubar.action.SaveProfileAction; -import enginuity.logger.ecu.ui.swing.menubar.action.SaveProfileAsAction; +import com.romraider.logger.ecu.EcuLogger; +import com.romraider.logger.ecu.external.ExternalDataSource; +import com.romraider.logger.ecu.ui.swing.menubar.action.AboutAction; +import com.romraider.logger.ecu.ui.swing.menubar.action.DisconnectAction; +import com.romraider.logger.ecu.ui.swing.menubar.action.ExitAction; +import com.romraider.logger.ecu.ui.swing.menubar.action.LoadProfileAction; +import com.romraider.logger.ecu.ui.swing.menubar.action.LogFileAbsoluteTimestampAction; +import com.romraider.logger.ecu.ui.swing.menubar.action.LogFileControllerSwitchAction; +import com.romraider.logger.ecu.ui.swing.menubar.action.LogFileLocationAction; +import com.romraider.logger.ecu.ui.swing.menubar.action.ReloadProfileAction; +import com.romraider.logger.ecu.ui.swing.menubar.action.ResetConnectionAction; +import com.romraider.logger.ecu.ui.swing.menubar.action.ResetEcuAction; +import com.romraider.logger.ecu.ui.swing.menubar.action.SaveProfileAction; +import com.romraider.logger.ecu.ui.swing.menubar.action.SaveProfileAsAction; import javax.swing.Action; import javax.swing.JMenu; import javax.swing.JMenuBar; diff --git a/src/enginuity/logger/ecu/ui/swing/menubar/EcuLoggerMenuItem.java b/src/com/romraider/logger/ecu/ui/swing/menubar/EcuLoggerMenuItem.java similarity index 88% rename from src/enginuity/logger/ecu/ui/swing/menubar/EcuLoggerMenuItem.java rename to src/com/romraider/logger/ecu/ui/swing/menubar/EcuLoggerMenuItem.java index a18e5fce..e541fd33 100644 --- a/src/enginuity/logger/ecu/ui/swing/menubar/EcuLoggerMenuItem.java +++ b/src/com/romraider/logger/ecu/ui/swing/menubar/EcuLoggerMenuItem.java @@ -1,4 +1,4 @@ -package enginuity.logger.ecu.ui.swing.menubar; +package com.romraider.logger.ecu.ui.swing.menubar; import javax.swing.Action; import javax.swing.JMenuItem; diff --git a/src/enginuity/logger/ecu/ui/swing/menubar/EcuLoggerRadioButtonMenuItem.java b/src/com/romraider/logger/ecu/ui/swing/menubar/EcuLoggerRadioButtonMenuItem.java similarity index 80% rename from src/enginuity/logger/ecu/ui/swing/menubar/EcuLoggerRadioButtonMenuItem.java rename to src/com/romraider/logger/ecu/ui/swing/menubar/EcuLoggerRadioButtonMenuItem.java index 7bf80919..fade9918 100644 --- a/src/enginuity/logger/ecu/ui/swing/menubar/EcuLoggerRadioButtonMenuItem.java +++ b/src/com/romraider/logger/ecu/ui/swing/menubar/EcuLoggerRadioButtonMenuItem.java @@ -1,6 +1,6 @@ -package enginuity.logger.ecu.ui.swing.menubar; +package com.romraider.logger.ecu.ui.swing.menubar; -import enginuity.logger.ecu.ui.swing.menubar.util.SelectionStateAdaptor; +import com.romraider.logger.ecu.ui.swing.menubar.util.SelectionStateAdaptor; import javax.swing.Action; import javax.swing.JRadioButtonMenuItem; import javax.swing.KeyStroke; diff --git a/src/enginuity/logger/ecu/ui/swing/menubar/action/AboutAction.java b/src/com/romraider/logger/ecu/ui/swing/menubar/action/AboutAction.java similarity index 79% rename from src/enginuity/logger/ecu/ui/swing/menubar/action/AboutAction.java rename to src/com/romraider/logger/ecu/ui/swing/menubar/action/AboutAction.java index bdb7e663..1dda5674 100644 --- a/src/enginuity/logger/ecu/ui/swing/menubar/action/AboutAction.java +++ b/src/com/romraider/logger/ecu/ui/swing/menubar/action/AboutAction.java @@ -1,6 +1,6 @@ -package enginuity.logger.ecu.ui.swing.menubar.action; +package com.romraider.logger.ecu.ui.swing.menubar.action; -import enginuity.logger.ecu.EcuLogger; +import com.romraider.logger.ecu.EcuLogger; import static javax.swing.JOptionPane.INFORMATION_MESSAGE; import static javax.swing.JOptionPane.showMessageDialog; import java.awt.event.ActionEvent; diff --git a/src/enginuity/logger/ecu/ui/swing/menubar/action/AbstractAction.java b/src/com/romraider/logger/ecu/ui/swing/menubar/action/AbstractAction.java similarity index 87% rename from src/enginuity/logger/ecu/ui/swing/menubar/action/AbstractAction.java rename to src/com/romraider/logger/ecu/ui/swing/menubar/action/AbstractAction.java index db3625f6..8d04bcc1 100644 --- a/src/enginuity/logger/ecu/ui/swing/menubar/action/AbstractAction.java +++ b/src/com/romraider/logger/ecu/ui/swing/menubar/action/AbstractAction.java @@ -1,6 +1,6 @@ -package enginuity.logger.ecu.ui.swing.menubar.action; +package com.romraider.logger.ecu.ui.swing.menubar.action; -import enginuity.logger.ecu.EcuLogger; +import com.romraider.logger.ecu.EcuLogger; import javax.swing.Action; import java.beans.PropertyChangeListener; import java.util.HashMap; diff --git a/src/enginuity/logger/ecu/ui/swing/menubar/action/DisconnectAction.java b/src/com/romraider/logger/ecu/ui/swing/menubar/action/DisconnectAction.java similarity index 75% rename from src/enginuity/logger/ecu/ui/swing/menubar/action/DisconnectAction.java rename to src/com/romraider/logger/ecu/ui/swing/menubar/action/DisconnectAction.java index 47202ea7..c2fa5682 100644 --- a/src/enginuity/logger/ecu/ui/swing/menubar/action/DisconnectAction.java +++ b/src/com/romraider/logger/ecu/ui/swing/menubar/action/DisconnectAction.java @@ -1,6 +1,6 @@ -package enginuity.logger.ecu.ui.swing.menubar.action; +package com.romraider.logger.ecu.ui.swing.menubar.action; -import enginuity.logger.ecu.EcuLogger; +import com.romraider.logger.ecu.EcuLogger; import java.awt.event.ActionEvent; public final class DisconnectAction extends AbstractAction { diff --git a/src/enginuity/logger/ecu/ui/swing/menubar/action/ExitAction.java b/src/com/romraider/logger/ecu/ui/swing/menubar/action/ExitAction.java similarity index 73% rename from src/enginuity/logger/ecu/ui/swing/menubar/action/ExitAction.java rename to src/com/romraider/logger/ecu/ui/swing/menubar/action/ExitAction.java index 246bc4c1..89f4a51c 100644 --- a/src/enginuity/logger/ecu/ui/swing/menubar/action/ExitAction.java +++ b/src/com/romraider/logger/ecu/ui/swing/menubar/action/ExitAction.java @@ -1,6 +1,6 @@ -package enginuity.logger.ecu.ui.swing.menubar.action; +package com.romraider.logger.ecu.ui.swing.menubar.action; -import enginuity.logger.ecu.EcuLogger; +import com.romraider.logger.ecu.EcuLogger; import java.awt.event.ActionEvent; public final class ExitAction extends AbstractAction { diff --git a/src/enginuity/logger/ecu/ui/swing/menubar/action/GenericPluginMenuAction.java b/src/com/romraider/logger/ecu/ui/swing/menubar/action/GenericPluginMenuAction.java similarity index 80% rename from src/enginuity/logger/ecu/ui/swing/menubar/action/GenericPluginMenuAction.java rename to src/com/romraider/logger/ecu/ui/swing/menubar/action/GenericPluginMenuAction.java index c57b4586..e6cac188 100644 --- a/src/enginuity/logger/ecu/ui/swing/menubar/action/GenericPluginMenuAction.java +++ b/src/com/romraider/logger/ecu/ui/swing/menubar/action/GenericPluginMenuAction.java @@ -1,9 +1,9 @@ -package enginuity.logger.ecu.ui.swing.menubar.action; +package com.romraider.logger.ecu.ui.swing.menubar.action; -import enginuity.io.port.SerialPortDiscoverer; -import enginuity.io.port.SerialPortDiscovererImpl; -import enginuity.logger.ecu.EcuLogger; -import enginuity.logger.ecu.external.ExternalDataSource; +import com.romraider.io.port.SerialPortDiscoverer; +import com.romraider.io.port.SerialPortDiscovererImpl; +import com.romraider.logger.ecu.EcuLogger; +import com.romraider.logger.ecu.external.ExternalDataSource; import gnu.io.CommPortIdentifier; import static javax.swing.JOptionPane.QUESTION_MESSAGE; import static javax.swing.JOptionPane.showInputDialog; diff --git a/src/enginuity/logger/ecu/ui/swing/menubar/action/LoadProfileAction.java b/src/com/romraider/logger/ecu/ui/swing/menubar/action/LoadProfileAction.java similarity index 77% rename from src/enginuity/logger/ecu/ui/swing/menubar/action/LoadProfileAction.java rename to src/com/romraider/logger/ecu/ui/swing/menubar/action/LoadProfileAction.java index abf9c213..0b767591 100644 --- a/src/enginuity/logger/ecu/ui/swing/menubar/action/LoadProfileAction.java +++ b/src/com/romraider/logger/ecu/ui/swing/menubar/action/LoadProfileAction.java @@ -1,8 +1,8 @@ -package enginuity.logger.ecu.ui.swing.menubar.action; +package com.romraider.logger.ecu.ui.swing.menubar.action; -import enginuity.logger.ecu.EcuLogger; -import static enginuity.logger.ecu.ui.swing.menubar.util.FileHelper.getFile; -import static enginuity.logger.ecu.ui.swing.menubar.util.FileHelper.getProfileFileChooser; +import com.romraider.logger.ecu.EcuLogger; +import static com.romraider.logger.ecu.ui.swing.menubar.util.FileHelper.getFile; +import static com.romraider.logger.ecu.ui.swing.menubar.util.FileHelper.getProfileFileChooser; import javax.swing.JFileChooser; import java.awt.event.ActionEvent; import java.io.File; diff --git a/src/enginuity/logger/ecu/ui/swing/menubar/action/LogFileAbsoluteTimestampAction.java b/src/com/romraider/logger/ecu/ui/swing/menubar/action/LogFileAbsoluteTimestampAction.java similarity index 79% rename from src/enginuity/logger/ecu/ui/swing/menubar/action/LogFileAbsoluteTimestampAction.java rename to src/com/romraider/logger/ecu/ui/swing/menubar/action/LogFileAbsoluteTimestampAction.java index cfd56080..afcb2f34 100644 --- a/src/enginuity/logger/ecu/ui/swing/menubar/action/LogFileAbsoluteTimestampAction.java +++ b/src/com/romraider/logger/ecu/ui/swing/menubar/action/LogFileAbsoluteTimestampAction.java @@ -1,6 +1,6 @@ -package enginuity.logger.ecu.ui.swing.menubar.action; +package com.romraider.logger.ecu.ui.swing.menubar.action; -import enginuity.logger.ecu.EcuLogger; +import com.romraider.logger.ecu.EcuLogger; import java.awt.event.ActionEvent; public final class LogFileAbsoluteTimestampAction extends AbstractAction { diff --git a/src/enginuity/logger/ecu/ui/swing/menubar/action/LogFileControllerSwitchAction.java b/src/com/romraider/logger/ecu/ui/swing/menubar/action/LogFileControllerSwitchAction.java similarity index 79% rename from src/enginuity/logger/ecu/ui/swing/menubar/action/LogFileControllerSwitchAction.java rename to src/com/romraider/logger/ecu/ui/swing/menubar/action/LogFileControllerSwitchAction.java index e9436329..e0475048 100644 --- a/src/enginuity/logger/ecu/ui/swing/menubar/action/LogFileControllerSwitchAction.java +++ b/src/com/romraider/logger/ecu/ui/swing/menubar/action/LogFileControllerSwitchAction.java @@ -1,6 +1,6 @@ -package enginuity.logger.ecu.ui.swing.menubar.action; +package com.romraider.logger.ecu.ui.swing.menubar.action; -import enginuity.logger.ecu.EcuLogger; +import com.romraider.logger.ecu.EcuLogger; import java.awt.event.ActionEvent; public final class LogFileControllerSwitchAction extends AbstractAction { diff --git a/src/enginuity/logger/ecu/ui/swing/menubar/action/LogFileLocationAction.java b/src/com/romraider/logger/ecu/ui/swing/menubar/action/LogFileLocationAction.java similarity index 77% rename from src/enginuity/logger/ecu/ui/swing/menubar/action/LogFileLocationAction.java rename to src/com/romraider/logger/ecu/ui/swing/menubar/action/LogFileLocationAction.java index 5af8fbed..c2eefed0 100644 --- a/src/enginuity/logger/ecu/ui/swing/menubar/action/LogFileLocationAction.java +++ b/src/com/romraider/logger/ecu/ui/swing/menubar/action/LogFileLocationAction.java @@ -1,8 +1,8 @@ -package enginuity.logger.ecu.ui.swing.menubar.action; +package com.romraider.logger.ecu.ui.swing.menubar.action; -import enginuity.logger.ecu.EcuLogger; -import static enginuity.logger.ecu.ui.swing.menubar.util.FileHelper.getFile; -import static enginuity.logger.ecu.ui.swing.menubar.util.FileHelper.getLoggerOutputDirFileChooser; +import com.romraider.logger.ecu.EcuLogger; +import static com.romraider.logger.ecu.ui.swing.menubar.util.FileHelper.getFile; +import static com.romraider.logger.ecu.ui.swing.menubar.util.FileHelper.getLoggerOutputDirFileChooser; import javax.swing.JFileChooser; import static javax.swing.JFileChooser.APPROVE_OPTION; import java.awt.event.ActionEvent; diff --git a/src/enginuity/logger/ecu/ui/swing/menubar/action/ReloadProfileAction.java b/src/com/romraider/logger/ecu/ui/swing/menubar/action/ReloadProfileAction.java similarity index 78% rename from src/enginuity/logger/ecu/ui/swing/menubar/action/ReloadProfileAction.java rename to src/com/romraider/logger/ecu/ui/swing/menubar/action/ReloadProfileAction.java index f098d06b..199d1ca6 100644 --- a/src/enginuity/logger/ecu/ui/swing/menubar/action/ReloadProfileAction.java +++ b/src/com/romraider/logger/ecu/ui/swing/menubar/action/ReloadProfileAction.java @@ -1,6 +1,6 @@ -package enginuity.logger.ecu.ui.swing.menubar.action; +package com.romraider.logger.ecu.ui.swing.menubar.action; -import enginuity.logger.ecu.EcuLogger; +import com.romraider.logger.ecu.EcuLogger; import java.awt.event.ActionEvent; public final class ReloadProfileAction extends AbstractAction { diff --git a/src/enginuity/logger/ecu/ui/swing/menubar/action/ResetConnectionAction.java b/src/com/romraider/logger/ecu/ui/swing/menubar/action/ResetConnectionAction.java similarity index 76% rename from src/enginuity/logger/ecu/ui/swing/menubar/action/ResetConnectionAction.java rename to src/com/romraider/logger/ecu/ui/swing/menubar/action/ResetConnectionAction.java index 49f6fe63..d65cdf72 100644 --- a/src/enginuity/logger/ecu/ui/swing/menubar/action/ResetConnectionAction.java +++ b/src/com/romraider/logger/ecu/ui/swing/menubar/action/ResetConnectionAction.java @@ -1,6 +1,6 @@ -package enginuity.logger.ecu.ui.swing.menubar.action; +package com.romraider.logger.ecu.ui.swing.menubar.action; -import enginuity.logger.ecu.EcuLogger; +import com.romraider.logger.ecu.EcuLogger; import java.awt.event.ActionEvent; public final class ResetConnectionAction extends AbstractAction { diff --git a/src/enginuity/logger/ecu/ui/swing/menubar/action/ResetEcuAction.java b/src/com/romraider/logger/ecu/ui/swing/menubar/action/ResetEcuAction.java similarity index 92% rename from src/enginuity/logger/ecu/ui/swing/menubar/action/ResetEcuAction.java rename to src/com/romraider/logger/ecu/ui/swing/menubar/action/ResetEcuAction.java index 36b34800..ccf1291b 100644 --- a/src/enginuity/logger/ecu/ui/swing/menubar/action/ResetEcuAction.java +++ b/src/com/romraider/logger/ecu/ui/swing/menubar/action/ResetEcuAction.java @@ -1,6 +1,6 @@ -package enginuity.logger.ecu.ui.swing.menubar.action; +package com.romraider.logger.ecu.ui.swing.menubar.action; -import enginuity.logger.ecu.EcuLogger; +import com.romraider.logger.ecu.EcuLogger; import static javax.swing.JOptionPane.ERROR_MESSAGE; import static javax.swing.JOptionPane.INFORMATION_MESSAGE; import static javax.swing.JOptionPane.OK_OPTION; diff --git a/src/enginuity/logger/ecu/ui/swing/menubar/action/SaveProfileAction.java b/src/com/romraider/logger/ecu/ui/swing/menubar/action/SaveProfileAction.java similarity index 79% rename from src/enginuity/logger/ecu/ui/swing/menubar/action/SaveProfileAction.java rename to src/com/romraider/logger/ecu/ui/swing/menubar/action/SaveProfileAction.java index b1c9272c..bda9ab79 100644 --- a/src/enginuity/logger/ecu/ui/swing/menubar/action/SaveProfileAction.java +++ b/src/com/romraider/logger/ecu/ui/swing/menubar/action/SaveProfileAction.java @@ -1,7 +1,7 @@ -package enginuity.logger.ecu.ui.swing.menubar.action; +package com.romraider.logger.ecu.ui.swing.menubar.action; -import enginuity.logger.ecu.EcuLogger; -import static enginuity.logger.ecu.ui.swing.menubar.util.FileHelper.saveProfileToFile; +import com.romraider.logger.ecu.EcuLogger; +import static com.romraider.logger.ecu.ui.swing.menubar.util.FileHelper.saveProfileToFile; import java.awt.event.ActionEvent; import java.io.File; diff --git a/src/enginuity/logger/ecu/ui/swing/menubar/action/SaveProfileAsAction.java b/src/com/romraider/logger/ecu/ui/swing/menubar/action/SaveProfileAsAction.java similarity index 77% rename from src/enginuity/logger/ecu/ui/swing/menubar/action/SaveProfileAsAction.java rename to src/com/romraider/logger/ecu/ui/swing/menubar/action/SaveProfileAsAction.java index e9cc7083..151cee59 100644 --- a/src/enginuity/logger/ecu/ui/swing/menubar/action/SaveProfileAsAction.java +++ b/src/com/romraider/logger/ecu/ui/swing/menubar/action/SaveProfileAsAction.java @@ -1,9 +1,9 @@ -package enginuity.logger.ecu.ui.swing.menubar.action; +package com.romraider.logger.ecu.ui.swing.menubar.action; -import enginuity.logger.ecu.EcuLogger; -import static enginuity.logger.ecu.ui.swing.menubar.util.FileHelper.getFile; -import static enginuity.logger.ecu.ui.swing.menubar.util.FileHelper.getProfileFileChooser; -import static enginuity.logger.ecu.ui.swing.menubar.util.FileHelper.saveProfileToFile; +import com.romraider.logger.ecu.EcuLogger; +import static com.romraider.logger.ecu.ui.swing.menubar.util.FileHelper.getFile; +import static com.romraider.logger.ecu.ui.swing.menubar.util.FileHelper.getProfileFileChooser; +import static com.romraider.logger.ecu.ui.swing.menubar.util.FileHelper.saveProfileToFile; import javax.swing.JFileChooser; import static javax.swing.JFileChooser.APPROVE_OPTION; import static javax.swing.JOptionPane.OK_OPTION; diff --git a/src/enginuity/logger/ecu/ui/swing/menubar/action/ToggleButtonAction.java b/src/com/romraider/logger/ecu/ui/swing/menubar/action/ToggleButtonAction.java similarity index 86% rename from src/enginuity/logger/ecu/ui/swing/menubar/action/ToggleButtonAction.java rename to src/com/romraider/logger/ecu/ui/swing/menubar/action/ToggleButtonAction.java index 6fdbe62c..1fb3684c 100644 --- a/src/enginuity/logger/ecu/ui/swing/menubar/action/ToggleButtonAction.java +++ b/src/com/romraider/logger/ecu/ui/swing/menubar/action/ToggleButtonAction.java @@ -1,6 +1,6 @@ -package enginuity.logger.ecu.ui.swing.menubar.action; +package com.romraider.logger.ecu.ui.swing.menubar.action; -import enginuity.logger.ecu.EcuLogger; +import com.romraider.logger.ecu.EcuLogger; import javax.swing.JToggleButton; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; diff --git a/src/enginuity/logger/ecu/ui/swing/menubar/util/FileHelper.java b/src/com/romraider/logger/ecu/ui/swing/menubar/util/FileHelper.java similarity index 92% rename from src/enginuity/logger/ecu/ui/swing/menubar/util/FileHelper.java rename to src/com/romraider/logger/ecu/ui/swing/menubar/util/FileHelper.java index 53586928..985ce50b 100644 --- a/src/enginuity/logger/ecu/ui/swing/menubar/util/FileHelper.java +++ b/src/com/romraider/logger/ecu/ui/swing/menubar/util/FileHelper.java @@ -1,6 +1,6 @@ -package enginuity.logger.ecu.ui.swing.menubar.util; +package com.romraider.logger.ecu.ui.swing.menubar.util; -import enginuity.logger.ecu.profile.UserProfile; +import com.romraider.logger.ecu.profile.UserProfile; import javax.swing.JFileChooser; import static javax.swing.JFileChooser.DIRECTORIES_ONLY; import java.io.File; diff --git a/src/enginuity/logger/ecu/ui/swing/menubar/util/SelectionStateAdaptor.java b/src/com/romraider/logger/ecu/ui/swing/menubar/util/SelectionStateAdaptor.java similarity index 84% rename from src/enginuity/logger/ecu/ui/swing/menubar/util/SelectionStateAdaptor.java rename to src/com/romraider/logger/ecu/ui/swing/menubar/util/SelectionStateAdaptor.java index 13376801..f0c67d64 100644 --- a/src/enginuity/logger/ecu/ui/swing/menubar/util/SelectionStateAdaptor.java +++ b/src/com/romraider/logger/ecu/ui/swing/menubar/util/SelectionStateAdaptor.java @@ -1,6 +1,6 @@ -package enginuity.logger.ecu.ui.swing.menubar.util; +package com.romraider.logger.ecu.ui.swing.menubar.util; -import static enginuity.logger.ecu.ui.swing.menubar.action.AbstractAction.SELECTED_KEY; +import static com.romraider.logger.ecu.ui.swing.menubar.action.AbstractAction.SELECTED_KEY; import javax.swing.AbstractButton; import javax.swing.Action; import java.awt.event.ItemEvent; diff --git a/src/enginuity/logger/ecu/ui/swing/menubar/util/UserProfileFileFilter.java b/src/com/romraider/logger/ecu/ui/swing/menubar/util/UserProfileFileFilter.java similarity index 76% rename from src/enginuity/logger/ecu/ui/swing/menubar/util/UserProfileFileFilter.java rename to src/com/romraider/logger/ecu/ui/swing/menubar/util/UserProfileFileFilter.java index 31d613ca..ca26d212 100644 --- a/src/enginuity/logger/ecu/ui/swing/menubar/util/UserProfileFileFilter.java +++ b/src/com/romraider/logger/ecu/ui/swing/menubar/util/UserProfileFileFilter.java @@ -1,6 +1,6 @@ -package enginuity.logger.ecu.ui.swing.menubar.util; +package com.romraider.logger.ecu.ui.swing.menubar.util; -import enginuity.swing.GenericFileFilter; +import com.romraider.swing.GenericFileFilter; import javax.swing.filechooser.FileFilter; import java.io.File; diff --git a/src/enginuity/logger/ecu/ui/tab/LoggerChartPanel.java b/src/com/romraider/logger/ecu/ui/tab/LoggerChartPanel.java similarity index 92% rename from src/enginuity/logger/ecu/ui/tab/LoggerChartPanel.java rename to src/com/romraider/logger/ecu/ui/tab/LoggerChartPanel.java index f5d77078..d1ab683e 100644 --- a/src/enginuity/logger/ecu/ui/tab/LoggerChartPanel.java +++ b/src/com/romraider/logger/ecu/ui/tab/LoggerChartPanel.java @@ -1,7 +1,7 @@ -package enginuity.logger.ecu.ui.tab; +package com.romraider.logger.ecu.ui.tab; -import enginuity.logger.ecu.ui.handler.graph.SpringUtilities; -import static enginuity.util.ParamChecker.checkNotNull; +import com.romraider.logger.ecu.ui.handler.graph.SpringUtilities; +import static com.romraider.util.ParamChecker.checkNotNull; import org.jfree.chart.ChartFactory; import org.jfree.chart.ChartPanel; import org.jfree.chart.JFreeChart; diff --git a/src/enginuity/logger/ecu/ui/tab/Tab.java b/src/com/romraider/logger/ecu/ui/tab/Tab.java similarity index 71% rename from src/enginuity/logger/ecu/ui/tab/Tab.java rename to src/com/romraider/logger/ecu/ui/tab/Tab.java index 8c6b4602..a7ecf7fe 100644 --- a/src/enginuity/logger/ecu/ui/tab/Tab.java +++ b/src/com/romraider/logger/ecu/ui/tab/Tab.java @@ -1,4 +1,4 @@ -package enginuity.logger.ecu.ui.tab; +package com.romraider.logger.ecu.ui.tab; import javax.swing.JPanel; diff --git a/src/enginuity/logger/ecu/ui/tab/TableFinder.java b/src/com/romraider/logger/ecu/ui/tab/TableFinder.java similarity index 79% rename from src/enginuity/logger/ecu/ui/tab/TableFinder.java rename to src/com/romraider/logger/ecu/ui/tab/TableFinder.java index fa55131e..49175b21 100644 --- a/src/enginuity/logger/ecu/ui/tab/TableFinder.java +++ b/src/com/romraider/logger/ecu/ui/tab/TableFinder.java @@ -1,7 +1,7 @@ -package enginuity.logger.ecu.ui.tab; +package com.romraider.logger.ecu.ui.tab; -import enginuity.maps.Rom; -import enginuity.maps.Table; +import com.romraider.maps.Rom; +import com.romraider.maps.Table; import java.util.List; public final class TableFinder { diff --git a/src/enginuity/logger/ecu/ui/tab/XYTrendline.java b/src/com/romraider/logger/ecu/ui/tab/XYTrendline.java similarity index 95% rename from src/enginuity/logger/ecu/ui/tab/XYTrendline.java rename to src/com/romraider/logger/ecu/ui/tab/XYTrendline.java index 67ab21cf..88c701f3 100644 --- a/src/enginuity/logger/ecu/ui/tab/XYTrendline.java +++ b/src/com/romraider/logger/ecu/ui/tab/XYTrendline.java @@ -1,4 +1,4 @@ -package enginuity.logger.ecu.ui.tab; +package com.romraider.logger.ecu.ui.tab; import jamlab.Polyfit; import jamlab.Polyval; diff --git a/src/enginuity/logger/ecu/ui/tab/injector/InjectorControlPanel.java b/src/com/romraider/logger/ecu/ui/tab/injector/InjectorControlPanel.java similarity index 94% rename from src/enginuity/logger/ecu/ui/tab/injector/InjectorControlPanel.java rename to src/com/romraider/logger/ecu/ui/tab/injector/InjectorControlPanel.java index d0a4e518..93f6ded7 100644 --- a/src/enginuity/logger/ecu/ui/tab/injector/InjectorControlPanel.java +++ b/src/com/romraider/logger/ecu/ui/tab/injector/InjectorControlPanel.java @@ -1,18 +1,18 @@ -package enginuity.logger.ecu.ui.tab.injector; +package com.romraider.logger.ecu.ui.tab.injector; -import enginuity.ECUEditor; -import enginuity.logger.ecu.definition.EcuParameter; -import enginuity.logger.ecu.definition.EcuSwitch; -import enginuity.logger.ecu.definition.ExternalData; -import enginuity.logger.ecu.definition.LoggerData; -import enginuity.logger.ecu.ui.DataRegistrationBroker; -import static enginuity.logger.ecu.ui.tab.TableFinder.findTableStartsWith; -import enginuity.logger.ecu.ui.tab.XYTrendline; -import enginuity.maps.DataCell; -import enginuity.maps.Rom; -import enginuity.maps.Table; -import enginuity.maps.Table2D; -import static enginuity.util.ParamChecker.checkNotNull; +import com.romraider.ECUEditor; +import com.romraider.logger.ecu.definition.EcuParameter; +import com.romraider.logger.ecu.definition.EcuSwitch; +import com.romraider.logger.ecu.definition.ExternalData; +import com.romraider.logger.ecu.definition.LoggerData; +import com.romraider.logger.ecu.ui.DataRegistrationBroker; +import static com.romraider.logger.ecu.ui.tab.TableFinder.findTableStartsWith; +import com.romraider.logger.ecu.ui.tab.XYTrendline; +import com.romraider.maps.DataCell; +import com.romraider.maps.Rom; +import com.romraider.maps.Table; +import com.romraider.maps.Table2D; +import static com.romraider.util.ParamChecker.checkNotNull; import jamlab.Polyfit; import org.apache.log4j.Logger; import org.jfree.data.xy.XYSeries; diff --git a/src/enginuity/logger/ecu/ui/tab/injector/InjectorTab.java b/src/com/romraider/logger/ecu/ui/tab/injector/InjectorTab.java similarity index 69% rename from src/enginuity/logger/ecu/ui/tab/injector/InjectorTab.java rename to src/com/romraider/logger/ecu/ui/tab/injector/InjectorTab.java index 47338bda..3728abe9 100644 --- a/src/enginuity/logger/ecu/ui/tab/injector/InjectorTab.java +++ b/src/com/romraider/logger/ecu/ui/tab/injector/InjectorTab.java @@ -1,9 +1,9 @@ -package enginuity.logger.ecu.ui.tab.injector; +package com.romraider.logger.ecu.ui.tab.injector; -import enginuity.logger.ecu.definition.EcuParameter; -import enginuity.logger.ecu.definition.EcuSwitch; -import enginuity.logger.ecu.definition.ExternalData; -import enginuity.logger.ecu.ui.tab.Tab; +import com.romraider.logger.ecu.definition.EcuParameter; +import com.romraider.logger.ecu.definition.EcuSwitch; +import com.romraider.logger.ecu.definition.ExternalData; +import com.romraider.logger.ecu.ui.tab.Tab; import java.util.List; public interface InjectorTab extends Tab { diff --git a/src/enginuity/logger/ecu/ui/tab/injector/InjectorTabImpl.java b/src/com/romraider/logger/ecu/ui/tab/injector/InjectorTabImpl.java similarity index 85% rename from src/enginuity/logger/ecu/ui/tab/injector/InjectorTabImpl.java rename to src/com/romraider/logger/ecu/ui/tab/injector/InjectorTabImpl.java index 6a499606..b71aa676 100644 --- a/src/enginuity/logger/ecu/ui/tab/injector/InjectorTabImpl.java +++ b/src/com/romraider/logger/ecu/ui/tab/injector/InjectorTabImpl.java @@ -1,12 +1,12 @@ -package enginuity.logger.ecu.ui.tab.injector; +package com.romraider.logger.ecu.ui.tab.injector; -import enginuity.ECUEditor; -import enginuity.logger.ecu.definition.EcuParameter; -import enginuity.logger.ecu.definition.EcuSwitch; -import enginuity.logger.ecu.definition.ExternalData; -import enginuity.logger.ecu.ui.DataRegistrationBroker; -import enginuity.logger.ecu.ui.tab.LoggerChartPanel; -import enginuity.logger.ecu.ui.tab.XYTrendline; +import com.romraider.ECUEditor; +import com.romraider.logger.ecu.definition.EcuParameter; +import com.romraider.logger.ecu.definition.EcuSwitch; +import com.romraider.logger.ecu.definition.ExternalData; +import com.romraider.logger.ecu.ui.DataRegistrationBroker; +import com.romraider.logger.ecu.ui.tab.LoggerChartPanel; +import com.romraider.logger.ecu.ui.tab.XYTrendline; import org.jfree.data.xy.XYSeries; import javax.swing.JPanel; import javax.swing.JScrollPane; diff --git a/src/enginuity/logger/ecu/ui/tab/maf/MafControlPanel.java b/src/com/romraider/logger/ecu/ui/tab/maf/MafControlPanel.java similarity index 93% rename from src/enginuity/logger/ecu/ui/tab/maf/MafControlPanel.java rename to src/com/romraider/logger/ecu/ui/tab/maf/MafControlPanel.java index d3cb4c59..79380ec5 100644 --- a/src/enginuity/logger/ecu/ui/tab/maf/MafControlPanel.java +++ b/src/com/romraider/logger/ecu/ui/tab/maf/MafControlPanel.java @@ -1,18 +1,18 @@ -package enginuity.logger.ecu.ui.tab.maf; +package com.romraider.logger.ecu.ui.tab.maf; -import enginuity.ECUEditor; -import enginuity.logger.ecu.definition.EcuParameter; -import enginuity.logger.ecu.definition.EcuSwitch; -import enginuity.logger.ecu.definition.ExternalData; -import enginuity.logger.ecu.definition.LoggerData; -import enginuity.logger.ecu.ui.DataRegistrationBroker; -import static enginuity.logger.ecu.ui.tab.TableFinder.findTableStartsWith; -import enginuity.logger.ecu.ui.tab.XYTrendline; -import enginuity.maps.DataCell; -import enginuity.maps.Rom; -import enginuity.maps.Table; -import enginuity.maps.Table2D; -import static enginuity.util.ParamChecker.checkNotNull; +import com.romraider.ECUEditor; +import com.romraider.logger.ecu.definition.EcuParameter; +import com.romraider.logger.ecu.definition.EcuSwitch; +import com.romraider.logger.ecu.definition.ExternalData; +import com.romraider.logger.ecu.definition.LoggerData; +import com.romraider.logger.ecu.ui.DataRegistrationBroker; +import static com.romraider.logger.ecu.ui.tab.TableFinder.findTableStartsWith; +import com.romraider.logger.ecu.ui.tab.XYTrendline; +import com.romraider.maps.DataCell; +import com.romraider.maps.Rom; +import com.romraider.maps.Table; +import com.romraider.maps.Table2D; +import static com.romraider.util.ParamChecker.checkNotNull; import org.apache.log4j.Logger; import org.jfree.data.xy.XYSeries; import javax.swing.JButton; diff --git a/src/enginuity/logger/ecu/ui/tab/maf/MafTab.java b/src/com/romraider/logger/ecu/ui/tab/maf/MafTab.java similarity index 67% rename from src/enginuity/logger/ecu/ui/tab/maf/MafTab.java rename to src/com/romraider/logger/ecu/ui/tab/maf/MafTab.java index eb99a53b..8213440f 100644 --- a/src/enginuity/logger/ecu/ui/tab/maf/MafTab.java +++ b/src/com/romraider/logger/ecu/ui/tab/maf/MafTab.java @@ -1,9 +1,9 @@ -package enginuity.logger.ecu.ui.tab.maf; +package com.romraider.logger.ecu.ui.tab.maf; -import enginuity.logger.ecu.definition.EcuParameter; -import enginuity.logger.ecu.definition.EcuSwitch; -import enginuity.logger.ecu.definition.ExternalData; -import enginuity.logger.ecu.ui.tab.Tab; +import com.romraider.logger.ecu.definition.EcuParameter; +import com.romraider.logger.ecu.definition.EcuSwitch; +import com.romraider.logger.ecu.definition.ExternalData; +import com.romraider.logger.ecu.ui.tab.Tab; import java.util.List; public interface MafTab extends Tab { diff --git a/src/enginuity/logger/ecu/ui/tab/maf/MafTabImpl.java b/src/com/romraider/logger/ecu/ui/tab/maf/MafTabImpl.java similarity index 84% rename from src/enginuity/logger/ecu/ui/tab/maf/MafTabImpl.java rename to src/com/romraider/logger/ecu/ui/tab/maf/MafTabImpl.java index 0a460099..8e027d0b 100644 --- a/src/enginuity/logger/ecu/ui/tab/maf/MafTabImpl.java +++ b/src/com/romraider/logger/ecu/ui/tab/maf/MafTabImpl.java @@ -1,12 +1,12 @@ -package enginuity.logger.ecu.ui.tab.maf; +package com.romraider.logger.ecu.ui.tab.maf; -import enginuity.ECUEditor; -import enginuity.logger.ecu.definition.EcuParameter; -import enginuity.logger.ecu.definition.EcuSwitch; -import enginuity.logger.ecu.definition.ExternalData; -import enginuity.logger.ecu.ui.DataRegistrationBroker; -import enginuity.logger.ecu.ui.tab.LoggerChartPanel; -import enginuity.logger.ecu.ui.tab.XYTrendline; +import com.romraider.ECUEditor; +import com.romraider.logger.ecu.definition.EcuParameter; +import com.romraider.logger.ecu.definition.EcuSwitch; +import com.romraider.logger.ecu.definition.ExternalData; +import com.romraider.logger.ecu.ui.DataRegistrationBroker; +import com.romraider.logger.ecu.ui.tab.LoggerChartPanel; +import com.romraider.logger.ecu.ui.tab.XYTrendline; import org.jfree.data.xy.XYSeries; import javax.swing.JPanel; import javax.swing.JScrollPane; diff --git a/src/enginuity/logger/innovate/generic/io/InnovateConnection.java b/src/com/romraider/logger/innovate/generic/io/InnovateConnection.java similarity index 58% rename from src/enginuity/logger/innovate/generic/io/InnovateConnection.java rename to src/com/romraider/logger/innovate/generic/io/InnovateConnection.java index e40803a5..cf9322c6 100644 --- a/src/enginuity/logger/innovate/generic/io/InnovateConnection.java +++ b/src/com/romraider/logger/innovate/generic/io/InnovateConnection.java @@ -1,4 +1,4 @@ -package enginuity.logger.innovate.generic.io; +package com.romraider.logger.innovate.generic.io; public interface InnovateConnection { byte[] read(); diff --git a/src/enginuity/logger/innovate/generic/io/InnovateConnectionImpl.java b/src/com/romraider/logger/innovate/generic/io/InnovateConnectionImpl.java similarity index 83% rename from src/enginuity/logger/innovate/generic/io/InnovateConnectionImpl.java rename to src/com/romraider/logger/innovate/generic/io/InnovateConnectionImpl.java index 412f6425..e98b7c2b 100644 --- a/src/enginuity/logger/innovate/generic/io/InnovateConnectionImpl.java +++ b/src/com/romraider/logger/innovate/generic/io/InnovateConnectionImpl.java @@ -1,17 +1,17 @@ -package enginuity.logger.innovate.generic.io; +package com.romraider.logger.innovate.generic.io; -import enginuity.io.connection.ConnectionProperties; -import enginuity.io.connection.SerialConnection; -import enginuity.io.connection.SerialConnectionImpl; -import enginuity.logger.ecu.exception.SerialCommunicationException; -import static enginuity.util.ByteUtil.matchOnes; -import static enginuity.util.ByteUtil.matchZeroes; -import static enginuity.util.HexUtil.asBytes; -import static enginuity.util.HexUtil.asHex; -import static enginuity.util.ParamChecker.checkGreaterThanZero; -import static enginuity.util.ParamChecker.checkNotNull; -import static enginuity.util.ParamChecker.checkNotNullOrEmpty; -import static enginuity.util.ThreadUtil.sleep; +import com.romraider.io.connection.ConnectionProperties; +import com.romraider.io.connection.SerialConnection; +import com.romraider.io.connection.SerialConnectionImpl; +import com.romraider.logger.ecu.exception.SerialCommunicationException; +import static com.romraider.util.ByteUtil.matchOnes; +import static com.romraider.util.ByteUtil.matchZeroes; +import static com.romraider.util.HexUtil.asBytes; +import static com.romraider.util.HexUtil.asHex; +import static com.romraider.util.ParamChecker.checkGreaterThanZero; +import static com.romraider.util.ParamChecker.checkNotNull; +import static com.romraider.util.ParamChecker.checkNotNullOrEmpty; +import static com.romraider.util.ThreadUtil.sleep; import org.apache.log4j.Logger; import java.io.IOException; import static java.lang.Math.min; diff --git a/src/enginuity/logger/innovate/generic/io/InnovateConnectionProperties.java b/src/com/romraider/logger/innovate/generic/io/InnovateConnectionProperties.java similarity index 78% rename from src/enginuity/logger/innovate/generic/io/InnovateConnectionProperties.java rename to src/com/romraider/logger/innovate/generic/io/InnovateConnectionProperties.java index 70b6d730..f30b9593 100644 --- a/src/enginuity/logger/innovate/generic/io/InnovateConnectionProperties.java +++ b/src/com/romraider/logger/innovate/generic/io/InnovateConnectionProperties.java @@ -1,6 +1,6 @@ -package enginuity.logger.innovate.generic.io; +package com.romraider.logger.innovate.generic.io; -import enginuity.io.connection.ConnectionProperties; +import com.romraider.io.connection.ConnectionProperties; public final class InnovateConnectionProperties implements ConnectionProperties { public int getBaudRate() { diff --git a/src/enginuity/logger/innovate/generic/io/InnovateRunner.java b/src/com/romraider/logger/innovate/generic/io/InnovateRunner.java similarity index 56% rename from src/enginuity/logger/innovate/generic/io/InnovateRunner.java rename to src/com/romraider/logger/innovate/generic/io/InnovateRunner.java index 0aa404ee..098fa58a 100644 --- a/src/enginuity/logger/innovate/generic/io/InnovateRunner.java +++ b/src/com/romraider/logger/innovate/generic/io/InnovateRunner.java @@ -1,4 +1,4 @@ -package enginuity.logger.innovate.generic.io; +package com.romraider.logger.innovate.generic.io; public interface InnovateRunner extends Runnable { void stop(); diff --git a/src/enginuity/logger/innovate/generic/io/InnovateRunnerImpl.java b/src/com/romraider/logger/innovate/generic/io/InnovateRunnerImpl.java similarity index 78% rename from src/enginuity/logger/innovate/generic/io/InnovateRunnerImpl.java rename to src/com/romraider/logger/innovate/generic/io/InnovateRunnerImpl.java index a634879b..9a6070f5 100644 --- a/src/enginuity/logger/innovate/generic/io/InnovateRunnerImpl.java +++ b/src/com/romraider/logger/innovate/generic/io/InnovateRunnerImpl.java @@ -1,7 +1,7 @@ -package enginuity.logger.innovate.generic.io; +package com.romraider.logger.innovate.generic.io; -import enginuity.logger.innovate.generic.plugin.DataListener; -import enginuity.logger.innovate.generic.plugin.InnovateSettings; +import com.romraider.logger.innovate.generic.plugin.DataListener; +import com.romraider.logger.innovate.generic.plugin.InnovateSettings; public final class InnovateRunnerImpl implements InnovateRunner { private final InnovateConnection connection; diff --git a/src/enginuity/logger/innovate/generic/plugin/DataConvertor.java b/src/com/romraider/logger/innovate/generic/plugin/DataConvertor.java similarity index 54% rename from src/enginuity/logger/innovate/generic/plugin/DataConvertor.java rename to src/com/romraider/logger/innovate/generic/plugin/DataConvertor.java index 34e44d70..f73a9cb9 100644 --- a/src/enginuity/logger/innovate/generic/plugin/DataConvertor.java +++ b/src/com/romraider/logger/innovate/generic/plugin/DataConvertor.java @@ -1,4 +1,4 @@ -package enginuity.logger.innovate.generic.plugin; +package com.romraider.logger.innovate.generic.plugin; public interface DataConvertor { double convert(byte[] bytes); diff --git a/src/enginuity/logger/innovate/generic/plugin/DataListener.java b/src/com/romraider/logger/innovate/generic/plugin/DataListener.java similarity index 53% rename from src/enginuity/logger/innovate/generic/plugin/DataListener.java rename to src/com/romraider/logger/innovate/generic/plugin/DataListener.java index 2bb33f55..b980a7cd 100644 --- a/src/enginuity/logger/innovate/generic/plugin/DataListener.java +++ b/src/com/romraider/logger/innovate/generic/plugin/DataListener.java @@ -1,4 +1,4 @@ -package enginuity.logger.innovate.generic.plugin; +package com.romraider.logger.innovate.generic.plugin; public interface DataListener { void setBytes(byte[] bytes); diff --git a/src/enginuity/logger/innovate/generic/plugin/InnovateSettings.java b/src/com/romraider/logger/innovate/generic/plugin/InnovateSettings.java similarity index 60% rename from src/enginuity/logger/innovate/generic/plugin/InnovateSettings.java rename to src/com/romraider/logger/innovate/generic/plugin/InnovateSettings.java index 7839e97c..74761f8a 100644 --- a/src/enginuity/logger/innovate/generic/plugin/InnovateSettings.java +++ b/src/com/romraider/logger/innovate/generic/plugin/InnovateSettings.java @@ -1,4 +1,4 @@ -package enginuity.logger.innovate.generic.plugin; +package com.romraider.logger.innovate.generic.plugin; public interface InnovateSettings { void setPort(String port); diff --git a/src/enginuity/logger/innovate/generic/plugin/InnovateSettingsImpl.java b/src/com/romraider/logger/innovate/generic/plugin/InnovateSettingsImpl.java similarity index 77% rename from src/enginuity/logger/innovate/generic/plugin/InnovateSettingsImpl.java rename to src/com/romraider/logger/innovate/generic/plugin/InnovateSettingsImpl.java index 5a59587a..8bba704a 100644 --- a/src/enginuity/logger/innovate/generic/plugin/InnovateSettingsImpl.java +++ b/src/com/romraider/logger/innovate/generic/plugin/InnovateSettingsImpl.java @@ -1,4 +1,4 @@ -package enginuity.logger.innovate.generic.plugin; +package com.romraider.logger.innovate.generic.plugin; public final class InnovateSettingsImpl implements InnovateSettings { private String port; diff --git a/src/enginuity/logger/innovate/lc1/plugin/Lc1DataConvertor.java b/src/com/romraider/logger/innovate/lc1/plugin/Lc1DataConvertor.java similarity index 85% rename from src/enginuity/logger/innovate/lc1/plugin/Lc1DataConvertor.java rename to src/com/romraider/logger/innovate/lc1/plugin/Lc1DataConvertor.java index cf9c2d89..3d2e740c 100644 --- a/src/enginuity/logger/innovate/lc1/plugin/Lc1DataConvertor.java +++ b/src/com/romraider/logger/innovate/lc1/plugin/Lc1DataConvertor.java @@ -1,9 +1,9 @@ -package enginuity.logger.innovate.lc1.plugin; +package com.romraider.logger.innovate.lc1.plugin; -import enginuity.logger.innovate.generic.plugin.DataConvertor; -import static enginuity.util.ByteUtil.matchOnes; -import static enginuity.util.ByteUtil.matchZeroes; -import static enginuity.util.HexUtil.asHex; +import com.romraider.logger.innovate.generic.plugin.DataConvertor; +import static com.romraider.util.ByteUtil.matchOnes; +import static com.romraider.util.ByteUtil.matchZeroes; +import static com.romraider.util.HexUtil.asHex; import org.apache.log4j.Logger; public final class Lc1DataConvertor implements DataConvertor { diff --git a/src/enginuity/logger/innovate/lc1/plugin/Lc1DataItem.java b/src/com/romraider/logger/innovate/lc1/plugin/Lc1DataItem.java similarity index 69% rename from src/enginuity/logger/innovate/lc1/plugin/Lc1DataItem.java rename to src/com/romraider/logger/innovate/lc1/plugin/Lc1DataItem.java index 3e5278fc..71a13675 100644 --- a/src/enginuity/logger/innovate/lc1/plugin/Lc1DataItem.java +++ b/src/com/romraider/logger/innovate/lc1/plugin/Lc1DataItem.java @@ -1,8 +1,8 @@ -package enginuity.logger.innovate.lc1.plugin; +package com.romraider.logger.innovate.lc1.plugin; -import enginuity.logger.ecu.external.ExternalDataItem; -import enginuity.logger.innovate.generic.plugin.DataConvertor; -import enginuity.logger.innovate.generic.plugin.DataListener; +import com.romraider.logger.ecu.external.ExternalDataItem; +import com.romraider.logger.innovate.generic.plugin.DataConvertor; +import com.romraider.logger.innovate.generic.plugin.DataListener; public final class Lc1DataItem implements ExternalDataItem, DataListener { private final DataConvertor convertor = new Lc1DataConvertor(); diff --git a/src/enginuity/logger/innovate/lc1/plugin/Lc1DataSource.java b/src/com/romraider/logger/innovate/lc1/plugin/Lc1DataSource.java similarity index 63% rename from src/enginuity/logger/innovate/lc1/plugin/Lc1DataSource.java rename to src/com/romraider/logger/innovate/lc1/plugin/Lc1DataSource.java index c8bffe19..effe24cf 100644 --- a/src/enginuity/logger/innovate/lc1/plugin/Lc1DataSource.java +++ b/src/com/romraider/logger/innovate/lc1/plugin/Lc1DataSource.java @@ -1,13 +1,13 @@ -package enginuity.logger.innovate.lc1.plugin; +package com.romraider.logger.innovate.lc1.plugin; -import enginuity.logger.ecu.EcuLogger; -import enginuity.logger.ecu.external.ExternalDataItem; -import enginuity.logger.ecu.external.ExternalDataSource; -import enginuity.logger.ecu.ui.swing.menubar.action.GenericPluginMenuAction; -import enginuity.logger.innovate.generic.io.InnovateRunnerImpl; -import enginuity.logger.innovate.generic.plugin.InnovateSettings; -import enginuity.logger.innovate.generic.plugin.InnovateSettingsImpl; -import static enginuity.util.ThreadUtil.runAsDaemon; +import com.romraider.logger.ecu.EcuLogger; +import com.romraider.logger.ecu.external.ExternalDataItem; +import com.romraider.logger.ecu.external.ExternalDataSource; +import com.romraider.logger.ecu.ui.swing.menubar.action.GenericPluginMenuAction; +import com.romraider.logger.innovate.generic.io.InnovateRunnerImpl; +import com.romraider.logger.innovate.generic.plugin.InnovateSettings; +import com.romraider.logger.innovate.generic.plugin.InnovateSettingsImpl; +import static com.romraider.util.ThreadUtil.runAsDaemon; import javax.swing.Action; import static java.util.Arrays.asList; import java.util.List; diff --git a/src/enginuity/logger/innovate/lm1/plugin/Lm1DataConvertor.java b/src/com/romraider/logger/innovate/lm1/plugin/Lm1DataConvertor.java similarity index 85% rename from src/enginuity/logger/innovate/lm1/plugin/Lm1DataConvertor.java rename to src/com/romraider/logger/innovate/lm1/plugin/Lm1DataConvertor.java index 3da90e47..1e1ab242 100644 --- a/src/enginuity/logger/innovate/lm1/plugin/Lm1DataConvertor.java +++ b/src/com/romraider/logger/innovate/lm1/plugin/Lm1DataConvertor.java @@ -1,10 +1,10 @@ -package enginuity.logger.innovate.lm1.plugin; +package com.romraider.logger.innovate.lm1.plugin; -import enginuity.logger.innovate.generic.plugin.DataConvertor; -import static enginuity.util.ByteUtil.matchOnes; -import static enginuity.util.ByteUtil.matchZeroes; -import static enginuity.util.HexUtil.asBytes; -import static enginuity.util.HexUtil.asHex; +import com.romraider.logger.innovate.generic.plugin.DataConvertor; +import static com.romraider.util.ByteUtil.matchOnes; +import static com.romraider.util.ByteUtil.matchZeroes; +import static com.romraider.util.HexUtil.asBytes; +import static com.romraider.util.HexUtil.asHex; import org.apache.log4j.Logger; //TODO: Remove dupe with Lc1DataConvertor diff --git a/src/enginuity/logger/innovate/lm1/plugin/Lm1DataItem.java b/src/com/romraider/logger/innovate/lm1/plugin/Lm1DataItem.java similarity index 69% rename from src/enginuity/logger/innovate/lm1/plugin/Lm1DataItem.java rename to src/com/romraider/logger/innovate/lm1/plugin/Lm1DataItem.java index daa94ee6..2eae033e 100644 --- a/src/enginuity/logger/innovate/lm1/plugin/Lm1DataItem.java +++ b/src/com/romraider/logger/innovate/lm1/plugin/Lm1DataItem.java @@ -1,8 +1,8 @@ -package enginuity.logger.innovate.lm1.plugin; +package com.romraider.logger.innovate.lm1.plugin; -import enginuity.logger.ecu.external.ExternalDataItem; -import enginuity.logger.innovate.generic.plugin.DataConvertor; -import enginuity.logger.innovate.generic.plugin.DataListener; +import com.romraider.logger.ecu.external.ExternalDataItem; +import com.romraider.logger.innovate.generic.plugin.DataConvertor; +import com.romraider.logger.innovate.generic.plugin.DataListener; public final class Lm1DataItem implements ExternalDataItem, DataListener { private final DataConvertor convertor = new Lm1DataConvertor(); diff --git a/src/enginuity/logger/innovate/lm1/plugin/Lm1DataSource.java b/src/com/romraider/logger/innovate/lm1/plugin/Lm1DataSource.java similarity index 63% rename from src/enginuity/logger/innovate/lm1/plugin/Lm1DataSource.java rename to src/com/romraider/logger/innovate/lm1/plugin/Lm1DataSource.java index 4a814d54..28cebc9a 100644 --- a/src/enginuity/logger/innovate/lm1/plugin/Lm1DataSource.java +++ b/src/com/romraider/logger/innovate/lm1/plugin/Lm1DataSource.java @@ -1,13 +1,13 @@ -package enginuity.logger.innovate.lm1.plugin; +package com.romraider.logger.innovate.lm1.plugin; -import enginuity.logger.ecu.EcuLogger; -import enginuity.logger.ecu.external.ExternalDataItem; -import enginuity.logger.ecu.external.ExternalDataSource; -import enginuity.logger.ecu.ui.swing.menubar.action.GenericPluginMenuAction; -import enginuity.logger.innovate.generic.io.InnovateRunnerImpl; -import enginuity.logger.innovate.generic.plugin.InnovateSettings; -import enginuity.logger.innovate.generic.plugin.InnovateSettingsImpl; -import static enginuity.util.ThreadUtil.runAsDaemon; +import com.romraider.logger.ecu.EcuLogger; +import com.romraider.logger.ecu.external.ExternalDataItem; +import com.romraider.logger.ecu.external.ExternalDataSource; +import com.romraider.logger.ecu.ui.swing.menubar.action.GenericPluginMenuAction; +import com.romraider.logger.innovate.generic.io.InnovateRunnerImpl; +import com.romraider.logger.innovate.generic.plugin.InnovateSettings; +import com.romraider.logger.innovate.generic.plugin.InnovateSettingsImpl; +import static com.romraider.util.ThreadUtil.runAsDaemon; import javax.swing.Action; import static java.util.Arrays.asList; import java.util.List; diff --git a/src/enginuity/logger/utec/comm/PortRequestedDialog.java b/src/com/romraider/logger/utec/comm/PortRequestedDialog.java similarity index 96% rename from src/enginuity/logger/utec/comm/PortRequestedDialog.java rename to src/com/romraider/logger/utec/comm/PortRequestedDialog.java index 9ea8984b..95783b54 100644 --- a/src/enginuity/logger/utec/comm/PortRequestedDialog.java +++ b/src/com/romraider/logger/utec/comm/PortRequestedDialog.java @@ -1,7 +1,7 @@ -package enginuity.logger.utec.comm; +package com.romraider.logger.utec.comm; -import enginuity.logger.utec.gui.JutecGUI; +import com.romraider.logger.utec.gui.JutecGUI; import java.awt.Button; import java.awt.Dialog; import java.awt.FontMetrics; diff --git a/src/enginuity/logger/utec/comm/SerialConnectionException.java b/src/com/romraider/logger/utec/comm/SerialConnectionException.java similarity index 93% rename from src/enginuity/logger/utec/comm/SerialConnectionException.java rename to src/com/romraider/logger/utec/comm/SerialConnectionException.java index 59212b5c..876c9695 100644 --- a/src/enginuity/logger/utec/comm/SerialConnectionException.java +++ b/src/com/romraider/logger/utec/comm/SerialConnectionException.java @@ -3,7 +3,7 @@ * of serial connection troubles */ -package enginuity.logger.utec.comm; +package com.romraider.logger.utec.comm; public class SerialConnectionException extends Exception { diff --git a/src/enginuity/logger/utec/comm/SerialParameters.java b/src/com/romraider/logger/utec/comm/SerialParameters.java similarity index 99% rename from src/enginuity/logger/utec/comm/SerialParameters.java rename to src/com/romraider/logger/utec/comm/SerialParameters.java index faf9ab52..3773b481 100644 --- a/src/enginuity/logger/utec/comm/SerialParameters.java +++ b/src/com/romraider/logger/utec/comm/SerialParameters.java @@ -2,7 +2,7 @@ * Class holds serial port specific data */ -package enginuity.logger.utec.comm; +package com.romraider.logger.utec.comm; //import javax.comm.*; diff --git a/src/enginuity/logger/utec/comm/UtecSerialConnectionManager.java b/src/com/romraider/logger/utec/comm/UtecSerialConnectionManager.java similarity index 98% rename from src/enginuity/logger/utec/comm/UtecSerialConnectionManager.java rename to src/com/romraider/logger/utec/comm/UtecSerialConnectionManager.java index cc3ccffd..970d3bd8 100644 --- a/src/enginuity/logger/utec/comm/UtecSerialConnectionManager.java +++ b/src/com/romraider/logger/utec/comm/UtecSerialConnectionManager.java @@ -1,8 +1,8 @@ -package enginuity.logger.utec.comm; +package com.romraider.logger.utec.comm; //import javax.comm.*; -import enginuity.logger.utec.commInterface.UtecSerialListener; +import com.romraider.logger.utec.commInterface.UtecSerialListener; import gnu.io.CommPortIdentifier; import gnu.io.NoSuchPortException; import gnu.io.PortInUseException; diff --git a/src/enginuity/logger/utec/commEvent/GeneralDataListener.java b/src/com/romraider/logger/utec/commEvent/GeneralDataListener.java similarity index 65% rename from src/enginuity/logger/utec/commEvent/GeneralDataListener.java rename to src/com/romraider/logger/utec/commEvent/GeneralDataListener.java index 3653cb46..8863e6a2 100644 --- a/src/enginuity/logger/utec/commEvent/GeneralDataListener.java +++ b/src/com/romraider/logger/utec/commEvent/GeneralDataListener.java @@ -1,4 +1,4 @@ -package enginuity.logger.utec.commEvent; +package com.romraider.logger.utec.commEvent; public interface GeneralDataListener { public void getCommEvent(double[] doubleData); diff --git a/src/enginuity/logger/utec/commEvent/LoggerDataListener.java b/src/com/romraider/logger/utec/commEvent/LoggerDataListener.java similarity index 90% rename from src/enginuity/logger/utec/commEvent/LoggerDataListener.java rename to src/com/romraider/logger/utec/commEvent/LoggerDataListener.java index 4f327382..172f6e37 100644 --- a/src/enginuity/logger/utec/commEvent/LoggerDataListener.java +++ b/src/com/romraider/logger/utec/commEvent/LoggerDataListener.java @@ -4,7 +4,7 @@ * To change the template for this generated file go to * Window - Preferences - Java - Code Generation - Code and Comments */ -package enginuity.logger.utec.commEvent; +package com.romraider.logger.utec.commEvent; /** * @author emorgan diff --git a/src/enginuity/logger/utec/commEvent/LoggerEvent.java b/src/com/romraider/logger/utec/commEvent/LoggerEvent.java similarity index 94% rename from src/enginuity/logger/utec/commEvent/LoggerEvent.java rename to src/com/romraider/logger/utec/commEvent/LoggerEvent.java index bdef5c17..0aa9305f 100644 --- a/src/enginuity/logger/utec/commEvent/LoggerEvent.java +++ b/src/com/romraider/logger/utec/commEvent/LoggerEvent.java @@ -4,12 +4,12 @@ * To change the template for this generated file go to * Window - Preferences - Java - Code Generation - Code and Comments */ -package enginuity.logger.utec.commEvent; +package com.romraider.logger.utec.commEvent; -import enginuity.logger.utec.gui.mapTabs.UtecDataManager; -import enginuity.logger.utec.mapData.UtecMapData; -import enginuity.logger.utec.properties.UtecProperties; +import com.romraider.logger.utec.gui.mapTabs.UtecDataManager; +import com.romraider.logger.utec.mapData.UtecMapData; +import com.romraider.logger.utec.properties.UtecProperties; /** diff --git a/src/enginuity/logger/utec/commEvent/TestUtecTimer.java b/src/com/romraider/logger/utec/commEvent/TestUtecTimer.java similarity index 87% rename from src/enginuity/logger/utec/commEvent/TestUtecTimer.java rename to src/com/romraider/logger/utec/commEvent/TestUtecTimer.java index c5183bcb..82182816 100644 --- a/src/enginuity/logger/utec/commEvent/TestUtecTimer.java +++ b/src/com/romraider/logger/utec/commEvent/TestUtecTimer.java @@ -1,4 +1,4 @@ -package enginuity.logger.utec.commEvent; +package com.romraider.logger.utec.commEvent; public class TestUtecTimer { diff --git a/src/enginuity/logger/utec/commEvent/UtecAFRListener.java b/src/com/romraider/logger/utec/commEvent/UtecAFRListener.java similarity index 68% rename from src/enginuity/logger/utec/commEvent/UtecAFRListener.java rename to src/com/romraider/logger/utec/commEvent/UtecAFRListener.java index d9f3702d..d501a2f1 100644 --- a/src/enginuity/logger/utec/commEvent/UtecAFRListener.java +++ b/src/com/romraider/logger/utec/commEvent/UtecAFRListener.java @@ -1,4 +1,4 @@ -package enginuity.logger.utec.commEvent; +package com.romraider.logger.utec.commEvent; public interface UtecAFRListener { public void receivedUtecAFRData(double newAFRReading); diff --git a/src/enginuity/logger/utec/commEvent/UtecTimerTask.java b/src/com/romraider/logger/utec/commEvent/UtecTimerTask.java similarity index 91% rename from src/enginuity/logger/utec/commEvent/UtecTimerTask.java rename to src/com/romraider/logger/utec/commEvent/UtecTimerTask.java index 995cc4bc..a9acd787 100644 --- a/src/enginuity/logger/utec/commEvent/UtecTimerTask.java +++ b/src/com/romraider/logger/utec/commEvent/UtecTimerTask.java @@ -1,6 +1,6 @@ -package enginuity.logger.utec.commEvent; +package com.romraider.logger.utec.commEvent; -import enginuity.logger.utec.comm.UtecSerialConnectionManager; +import com.romraider.logger.utec.comm.UtecSerialConnectionManager; import java.util.TimerTask; public class UtecTimerTask extends TimerTask { diff --git a/src/enginuity/logger/utec/commEvent/UtecTimerTaskExecute.java b/src/com/romraider/logger/utec/commEvent/UtecTimerTaskExecute.java similarity index 87% rename from src/enginuity/logger/utec/commEvent/UtecTimerTaskExecute.java rename to src/com/romraider/logger/utec/commEvent/UtecTimerTaskExecute.java index c345d058..38892915 100644 --- a/src/enginuity/logger/utec/commEvent/UtecTimerTaskExecute.java +++ b/src/com/romraider/logger/utec/commEvent/UtecTimerTaskExecute.java @@ -1,6 +1,6 @@ -package enginuity.logger.utec.commEvent; +package com.romraider.logger.utec.commEvent; -import enginuity.logger.utec.properties.UtecProperties; +import com.romraider.logger.utec.properties.UtecProperties; import java.util.Timer; public class UtecTimerTaskExecute implements UtecTimerTaskListener { diff --git a/src/enginuity/logger/utec/commEvent/UtecTimerTaskListener.java b/src/com/romraider/logger/utec/commEvent/UtecTimerTaskListener.java similarity index 65% rename from src/enginuity/logger/utec/commEvent/UtecTimerTaskListener.java rename to src/com/romraider/logger/utec/commEvent/UtecTimerTaskListener.java index b78e5d6a..1890b7b7 100644 --- a/src/enginuity/logger/utec/commEvent/UtecTimerTaskListener.java +++ b/src/com/romraider/logger/utec/commEvent/UtecTimerTaskListener.java @@ -1,4 +1,4 @@ -package enginuity.logger.utec.commEvent; +package com.romraider.logger.utec.commEvent; public interface UtecTimerTaskListener { public void utecCommTimerCompleted(); diff --git a/src/enginuity/logger/utec/commEvent/UtecTimerTaskManager.java b/src/com/romraider/logger/utec/commEvent/UtecTimerTaskManager.java similarity index 97% rename from src/enginuity/logger/utec/commEvent/UtecTimerTaskManager.java rename to src/com/romraider/logger/utec/commEvent/UtecTimerTaskManager.java index ded56abd..7d7b7d89 100644 --- a/src/enginuity/logger/utec/commEvent/UtecTimerTaskManager.java +++ b/src/com/romraider/logger/utec/commEvent/UtecTimerTaskManager.java @@ -1,4 +1,4 @@ -package enginuity.logger.utec.commEvent; +package com.romraider.logger.utec.commEvent; import java.util.LinkedList; import java.util.Queue; diff --git a/src/enginuity/logger/utec/commInterface/UtecInterface.java b/src/com/romraider/logger/utec/commInterface/UtecInterface.java similarity index 95% rename from src/enginuity/logger/utec/commInterface/UtecInterface.java rename to src/com/romraider/logger/utec/commInterface/UtecInterface.java index e98fd307..dee4198e 100644 --- a/src/enginuity/logger/utec/commInterface/UtecInterface.java +++ b/src/com/romraider/logger/utec/commInterface/UtecInterface.java @@ -4,15 +4,15 @@ * TODO To change the template for this generated file go to * Window - Preferences - Java - Code Style - Code Templates */ -package enginuity.logger.utec.commInterface; +package com.romraider.logger.utec.commInterface; -import enginuity.logger.utec.comm.SerialConnectionException; -import enginuity.logger.utec.comm.UtecSerialConnectionManager; -import enginuity.logger.utec.commEvent.UtecTimerTaskManager; -import enginuity.logger.utec.gui.mapTabs.UtecDataManager; -import enginuity.logger.utec.mapData.UtecMapData; -import enginuity.logger.utec.properties.UtecProperties; +import com.romraider.logger.utec.comm.SerialConnectionException; +import com.romraider.logger.utec.comm.UtecSerialConnectionManager; +import com.romraider.logger.utec.commEvent.UtecTimerTaskManager; +import com.romraider.logger.utec.gui.mapTabs.UtecDataManager; +import com.romraider.logger.utec.mapData.UtecMapData; +import com.romraider.logger.utec.properties.UtecProperties; import gnu.io.CommPortIdentifier; import java.util.Enumeration; import java.util.Vector; diff --git a/src/enginuity/logger/utec/commInterface/UtecSerialListener.java b/src/com/romraider/logger/utec/commInterface/UtecSerialListener.java similarity index 93% rename from src/enginuity/logger/utec/commInterface/UtecSerialListener.java rename to src/com/romraider/logger/utec/commInterface/UtecSerialListener.java index 6fa39f0d..5cca64bb 100644 --- a/src/enginuity/logger/utec/commInterface/UtecSerialListener.java +++ b/src/com/romraider/logger/utec/commInterface/UtecSerialListener.java @@ -1,7 +1,7 @@ -package enginuity.logger.utec.commInterface; +package com.romraider.logger.utec.commInterface; -import enginuity.logger.utec.comm.UtecSerialConnectionManager; -import enginuity.logger.utec.gui.mapTabs.UtecDataManager; +import com.romraider.logger.utec.comm.UtecSerialConnectionManager; +import com.romraider.logger.utec.gui.mapTabs.UtecDataManager; import gnu.io.SerialPortEvent; import gnu.io.SerialPortEventListener; import java.io.IOException; diff --git a/src/enginuity/logger/utec/gui/JutecGUI.java b/src/com/romraider/logger/utec/gui/JutecGUI.java similarity index 97% rename from src/enginuity/logger/utec/gui/JutecGUI.java rename to src/com/romraider/logger/utec/gui/JutecGUI.java index f73ca53c..85669b4c 100644 --- a/src/enginuity/logger/utec/gui/JutecGUI.java +++ b/src/com/romraider/logger/utec/gui/JutecGUI.java @@ -4,16 +4,16 @@ * TODO To change the template for this generated file go to * Window - Preferences - Java - Code Style - Code Templates */ -package enginuity.logger.utec.gui; +package com.romraider.logger.utec.gui; -import enginuity.Settings; -import enginuity.logger.utec.commInterface.UtecInterface; -import enginuity.logger.utec.gui.bottomControl.BottomUtecControl; -import enginuity.logger.utec.gui.mapTabs.MapJPanel; -import enginuity.logger.utec.gui.mapTabs.UtecDataManager; -import enginuity.logger.utec.gui.realtimeData.RealTimeData; -import enginuity.logger.utec.mapData.UtecMapData; -import enginuity.logger.utec.tts.UtecSpeaker; +import com.romraider.Settings; +import com.romraider.logger.utec.commInterface.UtecInterface; +import com.romraider.logger.utec.gui.bottomControl.BottomUtecControl; +import com.romraider.logger.utec.gui.mapTabs.MapJPanel; +import com.romraider.logger.utec.gui.mapTabs.UtecDataManager; +import com.romraider.logger.utec.gui.realtimeData.RealTimeData; +import com.romraider.logger.utec.mapData.UtecMapData; +import com.romraider.logger.utec.tts.UtecSpeaker; import javax.swing.JFileChooser; import javax.swing.JFrame; import javax.swing.JLabel; diff --git a/src/enginuity/logger/utec/gui/JutecToolBar.java b/src/com/romraider/logger/utec/gui/JutecToolBar.java similarity index 92% rename from src/enginuity/logger/utec/gui/JutecToolBar.java rename to src/com/romraider/logger/utec/gui/JutecToolBar.java index d5e847d6..63b15d05 100644 --- a/src/enginuity/logger/utec/gui/JutecToolBar.java +++ b/src/com/romraider/logger/utec/gui/JutecToolBar.java @@ -1,10 +1,10 @@ -package enginuity.logger.utec.gui; +package com.romraider.logger.utec.gui; -import enginuity.NewGUI.data.ApplicationStateManager; -import enginuity.NewGUI.interfaces.TuningEntity; -import enginuity.NewGUI.interfaces.TuningEntityListener; -import enginuity.logger.utec.gui.mapTabs.UtecDataManager; -import enginuity.logger.utec.mapData.UtecMapData; +import com.romraider.NewGUI.data.ApplicationStateManager; +import com.romraider.NewGUI.interfaces.TuningEntity; +import com.romraider.NewGUI.interfaces.TuningEntityListener; +import com.romraider.logger.utec.gui.mapTabs.UtecDataManager; +import com.romraider.logger.utec.mapData.UtecMapData; import static javax.swing.BorderFactory.createLineBorder; import javax.swing.ImageIcon; import javax.swing.JButton; diff --git a/src/enginuity/logger/utec/gui/barGraph/BarGraph.java b/src/com/romraider/logger/utec/gui/barGraph/BarGraph.java similarity index 96% rename from src/enginuity/logger/utec/gui/barGraph/BarGraph.java rename to src/com/romraider/logger/utec/gui/barGraph/BarGraph.java index 2ec91015..962b8955 100644 --- a/src/enginuity/logger/utec/gui/barGraph/BarGraph.java +++ b/src/com/romraider/logger/utec/gui/barGraph/BarGraph.java @@ -4,7 +4,7 @@ * To change the template for this generated file go to * Window - Preferences - Java - Code Generation - Code and Comments */ -package enginuity.logger.utec.gui.barGraph; +package com.romraider.logger.utec.gui.barGraph; import javax.swing.JComponent; import java.awt.Color; diff --git a/src/enginuity/logger/utec/gui/bottomControl/BottomUtecControl.java b/src/com/romraider/logger/utec/gui/bottomControl/BottomUtecControl.java similarity index 96% rename from src/enginuity/logger/utec/gui/bottomControl/BottomUtecControl.java rename to src/com/romraider/logger/utec/gui/bottomControl/BottomUtecControl.java index 64ecebe4..3a786dad 100644 --- a/src/enginuity/logger/utec/gui/bottomControl/BottomUtecControl.java +++ b/src/com/romraider/logger/utec/gui/bottomControl/BottomUtecControl.java @@ -4,11 +4,11 @@ * To change the template for this generated file go to * Window - Preferences - Java - Code Generation - Code and Comments */ -package enginuity.logger.utec.gui.bottomControl; +package com.romraider.logger.utec.gui.bottomControl; -import enginuity.logger.utec.commEvent.LoggerDataListener; -import enginuity.logger.utec.commInterface.UtecInterface; -import enginuity.logger.utec.gui.JutecGUI; +import com.romraider.logger.utec.commEvent.LoggerDataListener; +import com.romraider.logger.utec.commInterface.UtecInterface; +import com.romraider.logger.utec.gui.JutecGUI; import javax.swing.JButton; import javax.swing.JPanel; import javax.swing.JScrollPane; diff --git a/src/enginuity/logger/utec/gui/mapTabs/MapJPanel.java b/src/com/romraider/logger/utec/gui/mapTabs/MapJPanel.java similarity index 95% rename from src/enginuity/logger/utec/gui/mapTabs/MapJPanel.java rename to src/com/romraider/logger/utec/gui/mapTabs/MapJPanel.java index 4b08a786..9e8f2a9d 100644 --- a/src/enginuity/logger/utec/gui/mapTabs/MapJPanel.java +++ b/src/com/romraider/logger/utec/gui/mapTabs/MapJPanel.java @@ -1,7 +1,7 @@ -package enginuity.logger.utec.gui.mapTabs; +package com.romraider.logger.utec.gui.mapTabs; -import enginuity.logger.utec.mapData.UtecMapData; -import enginuity.logger.utec.properties.UtecProperties; +import com.romraider.logger.utec.mapData.UtecMapData; +import com.romraider.logger.utec.properties.UtecProperties; import javax.swing.JPanel; import javax.swing.JScrollPane; import java.awt.BorderLayout; diff --git a/src/enginuity/logger/utec/gui/mapTabs/UtecDataManager.java b/src/com/romraider/logger/utec/gui/mapTabs/UtecDataManager.java similarity index 95% rename from src/enginuity/logger/utec/gui/mapTabs/UtecDataManager.java rename to src/com/romraider/logger/utec/gui/mapTabs/UtecDataManager.java index 96cf7631..77f8a8e1 100644 --- a/src/enginuity/logger/utec/gui/mapTabs/UtecDataManager.java +++ b/src/com/romraider/logger/utec/gui/mapTabs/UtecDataManager.java @@ -1,13 +1,13 @@ -package enginuity.logger.utec.gui.mapTabs; +package com.romraider.logger.utec.gui.mapTabs; -import enginuity.NewGUI.data.ApplicationStateManager; -import enginuity.NewGUI.data.TableMetaData; -import enginuity.NewGUI.interfaces.TuningEntity; -import enginuity.NewGUI.tree.ETreeNode; -import enginuity.logger.utec.commEvent.LoggerDataListener; -import enginuity.logger.utec.commEvent.UtecAFRListener; -import enginuity.logger.utec.mapData.UtecMapData; -import enginuity.logger.utec.properties.UtecProperties; +import com.romraider.NewGUI.data.ApplicationStateManager; +import com.romraider.NewGUI.data.TableMetaData; +import com.romraider.NewGUI.interfaces.TuningEntity; +import com.romraider.NewGUI.tree.ETreeNode; +import com.romraider.logger.utec.commEvent.LoggerDataListener; +import com.romraider.logger.utec.commEvent.UtecAFRListener; +import com.romraider.logger.utec.mapData.UtecMapData; +import com.romraider.logger.utec.properties.UtecProperties; import java.util.Iterator; import java.util.Vector; @@ -42,7 +42,7 @@ public class UtecDataManager { allMaps.add(newUtecMap); System.out.println("UtecDataManager:" + ApplicationStateManager.getCurrentTuningEntity().getName()); ETreeNode rootNode = buildMapDataTreeNode(newUtecMap, ApplicationStateManager.getCurrentTuningEntity()); - ApplicationStateManager.getEnginuityInstance().addNewTuningGroup(rootNode); + ApplicationStateManager.getRomRaiderInstance().addNewTuningGroup(rootNode); } public static void setCurrentMap(UtecMapData newUtecMap) { diff --git a/src/enginuity/logger/utec/gui/mapTabs/UtecJTable.java b/src/com/romraider/logger/utec/gui/mapTabs/UtecJTable.java similarity index 98% rename from src/enginuity/logger/utec/gui/mapTabs/UtecJTable.java rename to src/com/romraider/logger/utec/gui/mapTabs/UtecJTable.java index fb35dbcc..30959e36 100644 --- a/src/enginuity/logger/utec/gui/mapTabs/UtecJTable.java +++ b/src/com/romraider/logger/utec/gui/mapTabs/UtecJTable.java @@ -1,4 +1,4 @@ -package enginuity.logger.utec.gui.mapTabs; +package com.romraider.logger.utec.gui.mapTabs; import javax.swing.JTable; diff --git a/src/enginuity/logger/utec/gui/mapTabs/UtecSelectionListener.java b/src/com/romraider/logger/utec/gui/mapTabs/UtecSelectionListener.java similarity index 92% rename from src/enginuity/logger/utec/gui/mapTabs/UtecSelectionListener.java rename to src/com/romraider/logger/utec/gui/mapTabs/UtecSelectionListener.java index 3a7a0453..6cacc291 100644 --- a/src/enginuity/logger/utec/gui/mapTabs/UtecSelectionListener.java +++ b/src/com/romraider/logger/utec/gui/mapTabs/UtecSelectionListener.java @@ -1,4 +1,4 @@ -package enginuity.logger.utec.gui.mapTabs; +package com.romraider.logger.utec.gui.mapTabs; import javax.swing.JTable; import javax.swing.event.ListSelectionEvent; diff --git a/src/enginuity/logger/utec/gui/mapTabs/UtecTableCellRenderer.java b/src/com/romraider/logger/utec/gui/mapTabs/UtecTableCellRenderer.java similarity index 95% rename from src/enginuity/logger/utec/gui/mapTabs/UtecTableCellRenderer.java rename to src/com/romraider/logger/utec/gui/mapTabs/UtecTableCellRenderer.java index 398fd67b..5cba98d9 100644 --- a/src/enginuity/logger/utec/gui/mapTabs/UtecTableCellRenderer.java +++ b/src/com/romraider/logger/utec/gui/mapTabs/UtecTableCellRenderer.java @@ -1,4 +1,4 @@ -package enginuity.logger.utec.gui.mapTabs; +package com.romraider.logger.utec.gui.mapTabs; import com.ecm.graphics.tools.ColorTable; import javax.swing.JTable; diff --git a/src/enginuity/logger/utec/gui/mapTabs/UtecTableModel.java b/src/com/romraider/logger/utec/gui/mapTabs/UtecTableModel.java similarity index 97% rename from src/enginuity/logger/utec/gui/mapTabs/UtecTableModel.java rename to src/com/romraider/logger/utec/gui/mapTabs/UtecTableModel.java index 65c6d31f..6f10c142 100644 --- a/src/enginuity/logger/utec/gui/mapTabs/UtecTableModel.java +++ b/src/com/romraider/logger/utec/gui/mapTabs/UtecTableModel.java @@ -1,4 +1,4 @@ -package enginuity.logger.utec.gui.mapTabs; +package com.romraider.logger.utec.gui.mapTabs; import javax.swing.table.AbstractTableModel; diff --git a/src/enginuity/logger/utec/gui/mapTabs/UtecTableSelectionListener.java b/src/com/romraider/logger/utec/gui/mapTabs/UtecTableSelectionListener.java similarity index 81% rename from src/enginuity/logger/utec/gui/mapTabs/UtecTableSelectionListener.java rename to src/com/romraider/logger/utec/gui/mapTabs/UtecTableSelectionListener.java index 34d70469..a2ca2710 100644 --- a/src/enginuity/logger/utec/gui/mapTabs/UtecTableSelectionListener.java +++ b/src/com/romraider/logger/utec/gui/mapTabs/UtecTableSelectionListener.java @@ -1,4 +1,4 @@ -package enginuity.logger.utec.gui.mapTabs; +package com.romraider.logger.utec.gui.mapTabs; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; diff --git a/src/enginuity/logger/utec/gui/realtimeData/RealTimeData.java b/src/com/romraider/logger/utec/gui/realtimeData/RealTimeData.java similarity index 95% rename from src/enginuity/logger/utec/gui/realtimeData/RealTimeData.java rename to src/com/romraider/logger/utec/gui/realtimeData/RealTimeData.java index 22200861..ea39d5ea 100644 --- a/src/enginuity/logger/utec/gui/realtimeData/RealTimeData.java +++ b/src/com/romraider/logger/utec/gui/realtimeData/RealTimeData.java @@ -1,10 +1,10 @@ -package enginuity.logger.utec.gui.realtimeData; +package com.romraider.logger.utec.gui.realtimeData; -import enginuity.logger.utec.commEvent.LoggerDataListener; -import enginuity.logger.utec.commInterface.UtecInterface; -import enginuity.logger.utec.gui.mapTabs.UtecDataManager; -import enginuity.logger.utec.properties.UtecProperties; -import enginuity.logger.utec.tts.UtecSpeaker; +import com.romraider.logger.utec.commEvent.LoggerDataListener; +import com.romraider.logger.utec.commInterface.UtecInterface; +import com.romraider.logger.utec.gui.mapTabs.UtecDataManager; +import com.romraider.logger.utec.properties.UtecProperties; +import com.romraider.logger.utec.tts.UtecSpeaker; import java.awt.Color; import java.awt.Component; import java.awt.Font; diff --git a/src/enginuity/logger/utec/impl/UtecTuningEntityImpl.java b/src/com/romraider/logger/utec/impl/UtecTuningEntityImpl.java similarity index 95% rename from src/enginuity/logger/utec/impl/UtecTuningEntityImpl.java rename to src/com/romraider/logger/utec/impl/UtecTuningEntityImpl.java index fdec6823..b09efa48 100644 --- a/src/enginuity/logger/utec/impl/UtecTuningEntityImpl.java +++ b/src/com/romraider/logger/utec/impl/UtecTuningEntityImpl.java @@ -1,12 +1,12 @@ -package enginuity.logger.utec.impl; +package com.romraider.logger.utec.impl; -import enginuity.NewGUI.data.ApplicationStateManager; -import enginuity.NewGUI.interfaces.TuningEntity; -import enginuity.NewGUI.interfaces.TuningEntityListener; -import enginuity.logger.utec.commInterface.UtecInterface; -import enginuity.logger.utec.gui.JutecToolBar; -import enginuity.logger.utec.gui.mapTabs.UtecDataManager; -import enginuity.logger.utec.mapData.UtecMapData; +import com.romraider.NewGUI.data.ApplicationStateManager; +import com.romraider.NewGUI.interfaces.TuningEntity; +import com.romraider.NewGUI.interfaces.TuningEntityListener; +import com.romraider.logger.utec.commInterface.UtecInterface; +import com.romraider.logger.utec.gui.JutecToolBar; +import com.romraider.logger.utec.gui.mapTabs.UtecDataManager; +import com.romraider.logger.utec.mapData.UtecMapData; import org.apache.log4j.Logger; import javax.swing.JFileChooser; import javax.swing.JMenu; diff --git a/src/enginuity/logger/utec/mapData/GetMapFromUtecListener.java b/src/com/romraider/logger/utec/mapData/GetMapFromUtecListener.java similarity index 68% rename from src/enginuity/logger/utec/mapData/GetMapFromUtecListener.java rename to src/com/romraider/logger/utec/mapData/GetMapFromUtecListener.java index e231c52e..315ab877 100644 --- a/src/enginuity/logger/utec/mapData/GetMapFromUtecListener.java +++ b/src/com/romraider/logger/utec/mapData/GetMapFromUtecListener.java @@ -1,4 +1,4 @@ -package enginuity.logger.utec.mapData; +package com.romraider.logger.utec.mapData; public interface GetMapFromUtecListener { public void mapRetrieved(UtecMapData theMap); diff --git a/src/enginuity/logger/utec/mapData/SaveMapToUtecListener.java b/src/com/romraider/logger/utec/mapData/SaveMapToUtecListener.java similarity index 66% rename from src/enginuity/logger/utec/mapData/SaveMapToUtecListener.java rename to src/com/romraider/logger/utec/mapData/SaveMapToUtecListener.java index 3d4537fd..e34da58b 100644 --- a/src/enginuity/logger/utec/mapData/SaveMapToUtecListener.java +++ b/src/com/romraider/logger/utec/mapData/SaveMapToUtecListener.java @@ -1,4 +1,4 @@ -package enginuity.logger.utec.mapData; +package com.romraider.logger.utec.mapData; public interface SaveMapToUtecListener { public void mapSaved(boolean isSaved); diff --git a/src/enginuity/logger/utec/mapData/UtecMapData.java b/src/com/romraider/logger/utec/mapData/UtecMapData.java similarity index 99% rename from src/enginuity/logger/utec/mapData/UtecMapData.java rename to src/com/romraider/logger/utec/mapData/UtecMapData.java index 64a31819..ca28b121 100644 --- a/src/enginuity/logger/utec/mapData/UtecMapData.java +++ b/src/com/romraider/logger/utec/mapData/UtecMapData.java @@ -1,4 +1,4 @@ -package enginuity.logger.utec.mapData; +package com.romraider.logger.utec.mapData; import java.io.BufferedReader; import java.io.BufferedWriter; diff --git a/src/enginuity/logger/utec/mapData/testMapChecksum.java b/src/com/romraider/logger/utec/mapData/testMapChecksum.java similarity index 82% rename from src/enginuity/logger/utec/mapData/testMapChecksum.java rename to src/com/romraider/logger/utec/mapData/testMapChecksum.java index b6cc8e42..959e1fd3 100644 --- a/src/enginuity/logger/utec/mapData/testMapChecksum.java +++ b/src/com/romraider/logger/utec/mapData/testMapChecksum.java @@ -1,4 +1,4 @@ -package enginuity.logger.utec.mapData; +package com.romraider.logger.utec.mapData; public class testMapChecksum { public static void main(String[] args) { diff --git a/src/enginuity/logger/utec/plugin/AfrExternalDataItem.java b/src/com/romraider/logger/utec/plugin/AfrExternalDataItem.java similarity index 65% rename from src/enginuity/logger/utec/plugin/AfrExternalDataItem.java rename to src/com/romraider/logger/utec/plugin/AfrExternalDataItem.java index 23dfd678..461bd011 100644 --- a/src/enginuity/logger/utec/plugin/AfrExternalDataItem.java +++ b/src/com/romraider/logger/utec/plugin/AfrExternalDataItem.java @@ -1,7 +1,7 @@ -package enginuity.logger.utec.plugin; +package com.romraider.logger.utec.plugin; -import enginuity.logger.ecu.external.ExternalDataItem; -import enginuity.logger.utec.gui.mapTabs.UtecDataManager; +import com.romraider.logger.ecu.external.ExternalDataItem; +import com.romraider.logger.utec.gui.mapTabs.UtecDataManager; public class AfrExternalDataItem implements ExternalDataItem { diff --git a/src/enginuity/logger/utec/plugin/KnockExternalDataItem.java b/src/com/romraider/logger/utec/plugin/KnockExternalDataItem.java similarity index 65% rename from src/enginuity/logger/utec/plugin/KnockExternalDataItem.java rename to src/com/romraider/logger/utec/plugin/KnockExternalDataItem.java index f2a63043..5168704e 100644 --- a/src/enginuity/logger/utec/plugin/KnockExternalDataItem.java +++ b/src/com/romraider/logger/utec/plugin/KnockExternalDataItem.java @@ -1,8 +1,8 @@ -package enginuity.logger.utec.plugin; +package com.romraider.logger.utec.plugin; -import enginuity.logger.ecu.external.ExternalDataItem; -import enginuity.logger.utec.gui.mapTabs.UtecDataManager; +import com.romraider.logger.ecu.external.ExternalDataItem; +import com.romraider.logger.utec.gui.mapTabs.UtecDataManager; public class KnockExternalDataItem implements ExternalDataItem { diff --git a/src/enginuity/logger/utec/plugin/LoadExternalDataItem.java b/src/com/romraider/logger/utec/plugin/LoadExternalDataItem.java similarity index 65% rename from src/enginuity/logger/utec/plugin/LoadExternalDataItem.java rename to src/com/romraider/logger/utec/plugin/LoadExternalDataItem.java index 7cac96d0..39fae155 100644 --- a/src/enginuity/logger/utec/plugin/LoadExternalDataItem.java +++ b/src/com/romraider/logger/utec/plugin/LoadExternalDataItem.java @@ -1,7 +1,7 @@ -package enginuity.logger.utec.plugin; +package com.romraider.logger.utec.plugin; -import enginuity.logger.ecu.external.ExternalDataItem; -import enginuity.logger.utec.gui.mapTabs.UtecDataManager; +import com.romraider.logger.ecu.external.ExternalDataItem; +import com.romraider.logger.utec.gui.mapTabs.UtecDataManager; public class LoadExternalDataItem implements ExternalDataItem { diff --git a/src/enginuity/logger/utec/plugin/PsiExternalDataItem.java b/src/com/romraider/logger/utec/plugin/PsiExternalDataItem.java similarity index 65% rename from src/enginuity/logger/utec/plugin/PsiExternalDataItem.java rename to src/com/romraider/logger/utec/plugin/PsiExternalDataItem.java index 2add2f9c..6b4b113f 100644 --- a/src/enginuity/logger/utec/plugin/PsiExternalDataItem.java +++ b/src/com/romraider/logger/utec/plugin/PsiExternalDataItem.java @@ -1,8 +1,8 @@ -package enginuity.logger.utec.plugin; +package com.romraider.logger.utec.plugin; -import enginuity.logger.ecu.external.ExternalDataItem; -import enginuity.logger.utec.gui.mapTabs.UtecDataManager; +import com.romraider.logger.ecu.external.ExternalDataItem; +import com.romraider.logger.utec.gui.mapTabs.UtecDataManager; public class PsiExternalDataItem implements ExternalDataItem { diff --git a/src/enginuity/logger/utec/plugin/UtecDataSource.java b/src/com/romraider/logger/utec/plugin/UtecDataSource.java similarity index 60% rename from src/enginuity/logger/utec/plugin/UtecDataSource.java rename to src/com/romraider/logger/utec/plugin/UtecDataSource.java index c94c5b5f..bd1a1a2b 100644 --- a/src/enginuity/logger/utec/plugin/UtecDataSource.java +++ b/src/com/romraider/logger/utec/plugin/UtecDataSource.java @@ -1,15 +1,15 @@ -package enginuity.logger.utec.plugin; +package com.romraider.logger.utec.plugin; -import enginuity.logger.ecu.EcuLogger; -import enginuity.logger.ecu.external.ExternalDataItem; -import enginuity.logger.ecu.external.ExternalDataSource; -import enginuity.logger.ecu.ui.swing.menubar.action.GenericPluginMenuAction; -import static enginuity.logger.utec.commInterface.UtecInterface.closeConnection; -import static enginuity.logger.utec.commInterface.UtecInterface.getPortChoiceUsed; -import static enginuity.logger.utec.commInterface.UtecInterface.openConnection; -import static enginuity.logger.utec.commInterface.UtecInterface.resetUtec; -import static enginuity.logger.utec.commInterface.UtecInterface.setPortChoice; -import static enginuity.logger.utec.commInterface.UtecInterface.startLoggerDataFlow; +import com.romraider.logger.ecu.EcuLogger; +import com.romraider.logger.ecu.external.ExternalDataItem; +import com.romraider.logger.ecu.external.ExternalDataSource; +import com.romraider.logger.ecu.ui.swing.menubar.action.GenericPluginMenuAction; +import static com.romraider.logger.utec.commInterface.UtecInterface.closeConnection; +import static com.romraider.logger.utec.commInterface.UtecInterface.getPortChoiceUsed; +import static com.romraider.logger.utec.commInterface.UtecInterface.openConnection; +import static com.romraider.logger.utec.commInterface.UtecInterface.resetUtec; +import static com.romraider.logger.utec.commInterface.UtecInterface.setPortChoice; +import static com.romraider.logger.utec.commInterface.UtecInterface.startLoggerDataFlow; import javax.swing.Action; import java.util.ArrayList; import java.util.List; diff --git a/src/enginuity/logger/utec/properties/UtecProperties.java b/src/com/romraider/logger/utec/properties/UtecProperties.java similarity index 95% rename from src/enginuity/logger/utec/properties/UtecProperties.java rename to src/com/romraider/logger/utec/properties/UtecProperties.java index 8cd237af..4d332a61 100644 --- a/src/enginuity/logger/utec/properties/UtecProperties.java +++ b/src/com/romraider/logger/utec/properties/UtecProperties.java @@ -1,4 +1,4 @@ -package enginuity.logger.utec.properties; +package com.romraider.logger.utec.properties; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/src/enginuity/logger/utec/test/TestUtecMap.java b/src/com/romraider/logger/utec/test/TestUtecMap.java similarity index 69% rename from src/enginuity/logger/utec/test/TestUtecMap.java rename to src/com/romraider/logger/utec/test/TestUtecMap.java index 403e59b4..49a82dde 100644 --- a/src/enginuity/logger/utec/test/TestUtecMap.java +++ b/src/com/romraider/logger/utec/test/TestUtecMap.java @@ -1,6 +1,6 @@ -package enginuity.logger.utec.test; +package com.romraider.logger.utec.test; -import enginuity.logger.utec.mapData.UtecMapData; +import com.romraider.logger.utec.mapData.UtecMapData; public class TestUtecMap { diff --git a/src/enginuity/logger/utec/tts/UtecSpeaker.java b/src/com/romraider/logger/utec/tts/UtecSpeaker.java similarity index 80% rename from src/enginuity/logger/utec/tts/UtecSpeaker.java rename to src/com/romraider/logger/utec/tts/UtecSpeaker.java index 15872703..3e636726 100644 --- a/src/enginuity/logger/utec/tts/UtecSpeaker.java +++ b/src/com/romraider/logger/utec/tts/UtecSpeaker.java @@ -4,10 +4,10 @@ * TODO To change the template for this generated file go to * Window - Preferences - Java - Code Style - Code Templates */ -package enginuity.logger.utec.tts; +package com.romraider.logger.utec.tts; -import enginuity.logger.utec.properties.UtecProperties; -import enginuity.tts.Speaker; +import com.romraider.logger.utec.properties.UtecProperties; +import com.romraider.tts.Speaker; public final class UtecSpeaker { private UtecSpeaker() { diff --git a/src/enginuity/maps/DataCell.java b/src/com/romraider/maps/DataCell.java similarity index 96% rename from src/enginuity/maps/DataCell.java rename to src/com/romraider/maps/DataCell.java index c56ec099..7ac15575 100644 --- a/src/enginuity/maps/DataCell.java +++ b/src/com/romraider/maps/DataCell.java @@ -19,9 +19,9 @@ * */ -package enginuity.maps; +package com.romraider.maps; -import enginuity.util.JEPUtil; +import com.romraider.util.JEPUtil; import org.apache.log4j.Logger; import static javax.swing.BorderFactory.createLineBorder; import javax.swing.JLabel; diff --git a/src/enginuity/maps/Rom.java b/src/com/romraider/maps/Rom.java similarity index 93% rename from src/enginuity/maps/Rom.java rename to src/com/romraider/maps/Rom.java index f59ac988..8f9c201e 100644 --- a/src/enginuity/maps/Rom.java +++ b/src/com/romraider/maps/Rom.java @@ -19,12 +19,12 @@ * */ -package enginuity.maps; +package com.romraider.maps; -import enginuity.ECUEditor; -import enginuity.logger.ecu.ui.handler.table.TableUpdateHandler; -import enginuity.swing.JProgressPane; -import enginuity.xml.TableNotFoundException; +import com.romraider.ECUEditor; +import com.romraider.logger.ecu.ui.handler.table.TableUpdateHandler; +import com.romraider.swing.JProgressPane; +import com.romraider.xml.TableNotFoundException; import org.apache.log4j.Logger; import javax.swing.JOptionPane; import java.io.File; diff --git a/src/enginuity/maps/RomID.java b/src/com/romraider/maps/RomID.java similarity index 95% rename from src/enginuity/maps/RomID.java rename to src/com/romraider/maps/RomID.java index 8c3c7eba..68388a55 100644 --- a/src/enginuity/maps/RomID.java +++ b/src/com/romraider/maps/RomID.java @@ -21,7 +21,7 @@ //ECU version definition -package enginuity.maps; +package com.romraider.maps; import java.io.Serializable; diff --git a/src/enginuity/maps/Scale.java b/src/com/romraider/maps/Scale.java similarity index 95% rename from src/enginuity/maps/Scale.java rename to src/com/romraider/maps/Scale.java index 39928eb8..ff84f489 100644 --- a/src/enginuity/maps/Scale.java +++ b/src/com/romraider/maps/Scale.java @@ -21,7 +21,7 @@ //This object defines the scaling factor and offset for calculating real values -package enginuity.maps; +package com.romraider.maps; import java.io.Serializable; diff --git a/src/enginuity/maps/Table.java b/src/com/romraider/maps/Table.java similarity index 96% rename from src/enginuity/maps/Table.java rename to src/com/romraider/maps/Table.java index 42bae780..465d0f1d 100644 --- a/src/enginuity/maps/Table.java +++ b/src/com/romraider/maps/Table.java @@ -19,13 +19,13 @@ * */ -package enginuity.maps; +package com.romraider.maps; -import enginuity.Settings; -import enginuity.swing.TableFrame; -import static enginuity.util.ColorScaler.getScaledColor; -import enginuity.util.JEPUtil; -import enginuity.xml.RomAttributeParser; +import com.romraider.Settings; +import com.romraider.swing.TableFrame; +import static com.romraider.util.ColorScaler.getScaledColor; +import com.romraider.util.JEPUtil; +import com.romraider.xml.RomAttributeParser; import javax.swing.AbstractAction; import javax.swing.Action; import static javax.swing.BorderFactory.createLineBorder; diff --git a/src/enginuity/maps/Table1D.java b/src/com/romraider/maps/Table1D.java similarity index 95% rename from src/enginuity/maps/Table1D.java rename to src/com/romraider/maps/Table1D.java index 1f07e6ab..32e19ff8 100644 --- a/src/enginuity/maps/Table1D.java +++ b/src/com/romraider/maps/Table1D.java @@ -19,9 +19,9 @@ * */ -package enginuity.maps; +package com.romraider.maps; -import enginuity.Settings; +import com.romraider.Settings; import javax.swing.JLabel; import java.awt.BorderLayout; import java.awt.Color; diff --git a/src/enginuity/maps/Table2D.java b/src/com/romraider/maps/Table2D.java similarity index 94% rename from src/enginuity/maps/Table2D.java rename to src/com/romraider/maps/Table2D.java index 26cb27df..c1e1e767 100644 --- a/src/enginuity/maps/Table2D.java +++ b/src/com/romraider/maps/Table2D.java @@ -19,13 +19,13 @@ * */ -package enginuity.maps; +package com.romraider.maps; -import enginuity.Settings; -import enginuity.swing.TableFrame; -import enginuity.util.AxisRange; -import static enginuity.util.ParamChecker.isNullOrEmpty; -import static enginuity.util.TableAxisUtil.getLiveDataRangeForAxis; +import com.romraider.Settings; +import com.romraider.swing.TableFrame; +import com.romraider.util.AxisRange; +import static com.romraider.util.ParamChecker.isNullOrEmpty; +import static com.romraider.util.TableAxisUtil.getLiveDataRangeForAxis; import javax.swing.JLabel; import java.awt.BorderLayout; import java.awt.Color; diff --git a/src/enginuity/maps/Table3D.java b/src/com/romraider/maps/Table3D.java similarity index 96% rename from src/enginuity/maps/Table3D.java rename to src/com/romraider/maps/Table3D.java index 26db84da..fa2a7c65 100644 --- a/src/enginuity/maps/Table3D.java +++ b/src/com/romraider/maps/Table3D.java @@ -19,16 +19,16 @@ * */ -package enginuity.maps; +package com.romraider.maps; -import enginuity.Settings; -import enginuity.swing.TableFrame; -import enginuity.swing.VTextIcon; -import enginuity.util.AxisRange; -import static enginuity.util.ColorScaler.getScaledColor; -import static enginuity.util.ParamChecker.isNullOrEmpty; -import static enginuity.util.TableAxisUtil.getLiveDataRangeForAxis; -import enginuity.xml.RomAttributeParser; +import com.romraider.Settings; +import com.romraider.swing.TableFrame; +import com.romraider.swing.VTextIcon; +import com.romraider.util.AxisRange; +import static com.romraider.util.ColorScaler.getScaledColor; +import static com.romraider.util.ParamChecker.isNullOrEmpty; +import static com.romraider.util.TableAxisUtil.getLiveDataRangeForAxis; +import com.romraider.xml.RomAttributeParser; import static javax.swing.BorderFactory.createLineBorder; import javax.swing.JLabel; import javax.swing.JPanel; diff --git a/src/enginuity/maps/TableSwitch.java b/src/com/romraider/maps/TableSwitch.java similarity index 94% rename from src/enginuity/maps/TableSwitch.java rename to src/com/romraider/maps/TableSwitch.java index 76cc958a..359ab1cf 100644 --- a/src/enginuity/maps/TableSwitch.java +++ b/src/com/romraider/maps/TableSwitch.java @@ -19,10 +19,10 @@ * */ -package enginuity.maps; +package com.romraider.maps; -import enginuity.Settings; -import enginuity.xml.RomAttributeParser; +import com.romraider.Settings; +import com.romraider.xml.RomAttributeParser; import javax.swing.JCheckBox; import javax.swing.JTextArea; import java.awt.BorderLayout; diff --git a/src/enginuity/net/BrowserControl.java b/src/com/romraider/net/BrowserControl.java similarity index 96% rename from src/enginuity/net/BrowserControl.java rename to src/com/romraider/net/BrowserControl.java index e0652a8e..0e7fe4ae 100644 --- a/src/enginuity/net/BrowserControl.java +++ b/src/com/romraider/net/BrowserControl.java @@ -19,7 +19,7 @@ * */ -package enginuity.net; +package com.romraider.net; import org.apache.log4j.Logger; import java.io.IOException; diff --git a/src/enginuity/net/URL.java b/src/com/romraider/net/URL.java similarity index 95% rename from src/enginuity/net/URL.java rename to src/com/romraider/net/URL.java index b20e7dd4..9b702d5c 100644 --- a/src/enginuity/net/URL.java +++ b/src/com/romraider/net/URL.java @@ -19,7 +19,7 @@ * */ -package enginuity.net; +package com.romraider.net; import javax.swing.JLabel; import java.awt.Font; diff --git a/src/enginuity/newmaps/definition/AttributeParser.java b/src/com/romraider/newmaps/definition/AttributeParser.java similarity index 92% rename from src/enginuity/newmaps/definition/AttributeParser.java rename to src/com/romraider/newmaps/definition/AttributeParser.java index a316299c..42908064 100644 --- a/src/enginuity/newmaps/definition/AttributeParser.java +++ b/src/com/romraider/newmaps/definition/AttributeParser.java @@ -19,10 +19,10 @@ * */ -package enginuity.newmaps.definition; +package com.romraider.newmaps.definition; -import enginuity.newmaps.ecumetadata.Scale; -import enginuity.newmaps.ecumetadata.Unit; +import com.romraider.newmaps.ecumetadata.Scale; +import com.romraider.newmaps.ecumetadata.Unit; import java.util.StringTokenizer; import java.util.Vector; diff --git a/src/enginuity/newmaps/definition/RomDefinitionHandler.java b/src/com/romraider/newmaps/definition/RomDefinitionHandler.java similarity index 92% rename from src/enginuity/newmaps/definition/RomDefinitionHandler.java rename to src/com/romraider/newmaps/definition/RomDefinitionHandler.java index 6bbcd1d7..212477b5 100644 --- a/src/enginuity/newmaps/definition/RomDefinitionHandler.java +++ b/src/com/romraider/newmaps/definition/RomDefinitionHandler.java @@ -18,29 +18,29 @@ * */ -package enginuity.newmaps.definition; +package com.romraider.newmaps.definition; -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.definition.index.IndexItem; -import enginuity.newmaps.ecumetadata.AxisMetadata; -import enginuity.newmaps.ecumetadata.Category; -import enginuity.newmaps.ecumetadata.ParameterMetadata; -import enginuity.newmaps.ecumetadata.RomMetadata; -import enginuity.newmaps.ecumetadata.Scale; -import enginuity.newmaps.ecumetadata.SourceDefAxisMetadata; -import enginuity.newmaps.ecumetadata.SwitchGroupMetadata; -import enginuity.newmaps.ecumetadata.SwitchMetadata; -import enginuity.newmaps.ecumetadata.Table2DMetadata; -import enginuity.newmaps.ecumetadata.Table3DMetadata; -import enginuity.newmaps.ecumetadata.TableMetadata; -import enginuity.newmaps.ecumetadata.Unit; -import enginuity.newmaps.xml.SaxParserFactory; -import static enginuity.util.HexUtil.hexToInt; -import enginuity.util.NamedSet; -import enginuity.util.exception.NameableNotFoundException; +import static com.romraider.newmaps.definition.AttributeParser.parseEndian; +import static com.romraider.newmaps.definition.AttributeParser.parseStorageType; +import static com.romraider.newmaps.definition.AttributeParser.parseUnitSystem; +import com.romraider.newmaps.definition.index.Index; +import com.romraider.newmaps.definition.index.IndexItem; +import com.romraider.newmaps.ecumetadata.AxisMetadata; +import com.romraider.newmaps.ecumetadata.Category; +import com.romraider.newmaps.ecumetadata.ParameterMetadata; +import com.romraider.newmaps.ecumetadata.RomMetadata; +import com.romraider.newmaps.ecumetadata.Scale; +import com.romraider.newmaps.ecumetadata.SourceDefAxisMetadata; +import com.romraider.newmaps.ecumetadata.SwitchGroupMetadata; +import com.romraider.newmaps.ecumetadata.SwitchMetadata; +import com.romraider.newmaps.ecumetadata.Table2DMetadata; +import com.romraider.newmaps.ecumetadata.Table3DMetadata; +import com.romraider.newmaps.ecumetadata.TableMetadata; +import com.romraider.newmaps.ecumetadata.Unit; +import com.romraider.newmaps.xml.SaxParserFactory; +import static com.romraider.util.HexUtil.hexToInt; +import com.romraider.util.NamedSet; +import com.romraider.util.exception.NameableNotFoundException; import org.apache.log4j.Logger; import org.xml.sax.Attributes; import org.xml.sax.helpers.DefaultHandler; diff --git a/src/enginuity/newmaps/definition/editor/DefinitionEditorFrame.form b/src/com/romraider/newmaps/definition/editor/DefinitionEditorFrame.form similarity index 100% rename from src/enginuity/newmaps/definition/editor/DefinitionEditorFrame.form rename to src/com/romraider/newmaps/definition/editor/DefinitionEditorFrame.form diff --git a/src/enginuity/newmaps/definition/editor/DefinitionEditorFrame.java b/src/com/romraider/newmaps/definition/editor/DefinitionEditorFrame.java similarity index 95% rename from src/enginuity/newmaps/definition/editor/DefinitionEditorFrame.java rename to src/com/romraider/newmaps/definition/editor/DefinitionEditorFrame.java index 5a623965..b0813102 100644 --- a/src/enginuity/newmaps/definition/editor/DefinitionEditorFrame.java +++ b/src/com/romraider/newmaps/definition/editor/DefinitionEditorFrame.java @@ -4,7 +4,7 @@ * Created on January 11, 2007, 8:12 AM */ -package enginuity.newmaps.definition.editor; +package com.romraider.newmaps.definition.editor; /** * @author GOULDJ diff --git a/src/enginuity/newmaps/definition/editor/DefinitionPanel.form b/src/com/romraider/newmaps/definition/editor/DefinitionPanel.form similarity index 100% rename from src/enginuity/newmaps/definition/editor/DefinitionPanel.form rename to src/com/romraider/newmaps/definition/editor/DefinitionPanel.form diff --git a/src/enginuity/newmaps/definition/editor/DefinitionPanel.java b/src/com/romraider/newmaps/definition/editor/DefinitionPanel.java similarity index 98% rename from src/enginuity/newmaps/definition/editor/DefinitionPanel.java rename to src/com/romraider/newmaps/definition/editor/DefinitionPanel.java index 9c251ed8..b8311df2 100644 --- a/src/enginuity/newmaps/definition/editor/DefinitionPanel.java +++ b/src/com/romraider/newmaps/definition/editor/DefinitionPanel.java @@ -4,7 +4,7 @@ * Created on January 11, 2007, 9:02 AM */ -package enginuity.newmaps.definition.editor; +package com.romraider.newmaps.definition.editor; /** * @author GOULDJ diff --git a/src/enginuity/newmaps/definition/editor/RomParameterPanel.form b/src/com/romraider/newmaps/definition/editor/RomParameterPanel.form similarity index 100% rename from src/enginuity/newmaps/definition/editor/RomParameterPanel.form rename to src/com/romraider/newmaps/definition/editor/RomParameterPanel.form diff --git a/src/enginuity/newmaps/definition/editor/RomParameterPanel.java b/src/com/romraider/newmaps/definition/editor/RomParameterPanel.java similarity index 98% rename from src/enginuity/newmaps/definition/editor/RomParameterPanel.java rename to src/com/romraider/newmaps/definition/editor/RomParameterPanel.java index 87c2fca1..9ead573e 100644 --- a/src/enginuity/newmaps/definition/editor/RomParameterPanel.java +++ b/src/com/romraider/newmaps/definition/editor/RomParameterPanel.java @@ -4,7 +4,7 @@ * Created on January 11, 2007, 9:04 AM */ -package enginuity.newmaps.definition.editor; +package com.romraider.newmaps.definition.editor; /** * @author GOULDJ diff --git a/src/enginuity/newmaps/definition/index/Index.java b/src/com/romraider/newmaps/definition/index/Index.java similarity index 90% rename from src/enginuity/newmaps/definition/index/Index.java rename to src/com/romraider/newmaps/definition/index/Index.java index 2811c118..b0c43c48 100644 --- a/src/enginuity/newmaps/definition/index/Index.java +++ b/src/com/romraider/newmaps/definition/index/Index.java @@ -19,12 +19,12 @@ * */ -package enginuity.newmaps.definition.index; +package com.romraider.newmaps.definition.index; -import static enginuity.util.MD5Checksum.getMD5Checksum; -import enginuity.util.Nameable; -import enginuity.util.NamedSet; -import enginuity.util.exception.NameableNotFoundException; +import static com.romraider.util.MD5Checksum.getMD5Checksum; +import com.romraider.util.Nameable; +import com.romraider.util.NamedSet; +import com.romraider.util.exception.NameableNotFoundException; import java.io.File; import java.io.Serializable; import java.util.Iterator; diff --git a/src/enginuity/newmaps/definition/index/IndexBuilder.java b/src/com/romraider/newmaps/definition/index/IndexBuilder.java similarity index 91% rename from src/enginuity/newmaps/definition/index/IndexBuilder.java rename to src/com/romraider/newmaps/definition/index/IndexBuilder.java index 0ff1baac..34294d60 100644 --- a/src/enginuity/newmaps/definition/index/IndexBuilder.java +++ b/src/com/romraider/newmaps/definition/index/IndexBuilder.java @@ -19,14 +19,14 @@ * */ -package enginuity.newmaps.definition.index; +package com.romraider.newmaps.definition.index; -import enginuity.newmaps.definition.RomDefinitionHandler; -import enginuity.newmaps.ecumetadata.RomMetadata; -import enginuity.newmaps.xml.SaxParserFactory; -import enginuity.util.LogManager; -import static enginuity.util.MD5Checksum.getMD5Checksum; -import enginuity.util.exception.NameableNotFoundException; +import com.romraider.newmaps.definition.RomDefinitionHandler; +import com.romraider.newmaps.ecumetadata.RomMetadata; +import com.romraider.newmaps.xml.SaxParserFactory; +import com.romraider.util.LogManager; +import static com.romraider.util.MD5Checksum.getMD5Checksum; +import com.romraider.util.exception.NameableNotFoundException; import org.apache.log4j.Logger; import org.xml.sax.SAXParseException; import java.io.BufferedInputStream; diff --git a/src/enginuity/newmaps/definition/index/IndexHandler.java b/src/com/romraider/newmaps/definition/index/IndexHandler.java similarity index 93% rename from src/enginuity/newmaps/definition/index/IndexHandler.java rename to src/com/romraider/newmaps/definition/index/IndexHandler.java index 167f4bbf..45761013 100644 --- a/src/enginuity/newmaps/definition/index/IndexHandler.java +++ b/src/com/romraider/newmaps/definition/index/IndexHandler.java @@ -19,9 +19,9 @@ * */ -package enginuity.newmaps.definition.index; +package com.romraider.newmaps.definition.index; -import enginuity.util.HexUtil; +import com.romraider.util.HexUtil; import org.xml.sax.Attributes; import org.xml.sax.helpers.DefaultHandler; diff --git a/src/enginuity/newmaps/definition/index/IndexItem.java b/src/com/romraider/newmaps/definition/index/IndexItem.java similarity index 91% rename from src/enginuity/newmaps/definition/index/IndexItem.java rename to src/com/romraider/newmaps/definition/index/IndexItem.java index 82bf5fab..68d6c0c2 100644 --- a/src/enginuity/newmaps/definition/index/IndexItem.java +++ b/src/com/romraider/newmaps/definition/index/IndexItem.java @@ -19,10 +19,10 @@ * */ -package enginuity.newmaps.definition.index; +package com.romraider.newmaps.definition.index; -import static enginuity.util.MD5Checksum.getMD5Checksum; -import enginuity.util.Nameable; +import static com.romraider.util.MD5Checksum.getMD5Checksum; +import com.romraider.util.Nameable; import java.io.File; import java.io.Serializable; diff --git a/src/enginuity/newmaps/definition/memmodel/MemModel.java b/src/com/romraider/newmaps/definition/memmodel/MemModel.java similarity index 89% rename from src/enginuity/newmaps/definition/memmodel/MemModel.java rename to src/com/romraider/newmaps/definition/memmodel/MemModel.java index e9507cc3..2f1293ea 100644 --- a/src/enginuity/newmaps/definition/memmodel/MemModel.java +++ b/src/com/romraider/newmaps/definition/memmodel/MemModel.java @@ -19,9 +19,9 @@ * */ -package enginuity.newmaps.definition.memmodel; +package com.romraider.newmaps.definition.memmodel; -import enginuity.util.NamedSet; +import com.romraider.util.NamedSet; public class MemModel extends NamedSet { diff --git a/src/enginuity/newmaps/definition/memmodel/Segment.java b/src/com/romraider/newmaps/definition/memmodel/Segment.java similarity index 93% rename from src/enginuity/newmaps/definition/memmodel/Segment.java rename to src/com/romraider/newmaps/definition/memmodel/Segment.java index 8c799edc..b037409e 100644 --- a/src/enginuity/newmaps/definition/memmodel/Segment.java +++ b/src/com/romraider/newmaps/definition/memmodel/Segment.java @@ -19,7 +19,7 @@ * */ -package enginuity.newmaps.definition.memmodel; +package com.romraider.newmaps.definition.memmodel; public class Segment { diff --git a/src/enginuity/newmaps/definition/memmodel/definition/MemModelDefinitionHandler.java b/src/com/romraider/newmaps/definition/memmodel/definition/MemModelDefinitionHandler.java similarity index 91% rename from src/enginuity/newmaps/definition/memmodel/definition/MemModelDefinitionHandler.java rename to src/com/romraider/newmaps/definition/memmodel/definition/MemModelDefinitionHandler.java index 30c3ccfd..bbbb6132 100644 --- a/src/enginuity/newmaps/definition/memmodel/definition/MemModelDefinitionHandler.java +++ b/src/com/romraider/newmaps/definition/memmodel/definition/MemModelDefinitionHandler.java @@ -19,7 +19,7 @@ * */ -package enginuity.newmaps.definition.memmodel.definition; +package com.romraider.newmaps.definition.memmodel.definition; import org.xml.sax.helpers.DefaultHandler; diff --git a/src/enginuity/newmaps/definition/translate/DefinitionBuilder.java b/src/com/romraider/newmaps/definition/translate/DefinitionBuilder.java similarity index 95% rename from src/enginuity/newmaps/definition/translate/DefinitionBuilder.java rename to src/com/romraider/newmaps/definition/translate/DefinitionBuilder.java index 0e0ba4dc..1f4c2e82 100644 --- a/src/enginuity/newmaps/definition/translate/DefinitionBuilder.java +++ b/src/com/romraider/newmaps/definition/translate/DefinitionBuilder.java @@ -1,16 +1,16 @@ -package enginuity.newmaps.definition.translate; +package com.romraider.newmaps.definition.translate; import com.sun.org.apache.xml.internal.serialize.OutputFormat; import com.sun.org.apache.xml.internal.serialize.XMLSerializer; -import enginuity.maps.Rom; -import enginuity.maps.RomID; -import enginuity.maps.Scale; -import enginuity.maps.Table; -import enginuity.maps.Table2D; -import enginuity.maps.Table3D; -import enginuity.maps.TableSwitch; -import enginuity.newmaps.xml.XmlHelper; -import enginuity.util.HexUtil; +import com.romraider.maps.Rom; +import com.romraider.maps.RomID; +import com.romraider.maps.Scale; +import com.romraider.maps.Table; +import com.romraider.maps.Table2D; +import com.romraider.maps.Table3D; +import com.romraider.maps.TableSwitch; +import com.romraider.newmaps.xml.XmlHelper; +import com.romraider.util.HexUtil; import org.apache.log4j.Logger; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/src/enginuity/newmaps/definition/translate/FirstGenDefinitionHandler.java b/src/com/romraider/newmaps/definition/translate/FirstGenDefinitionHandler.java similarity index 94% rename from src/enginuity/newmaps/definition/translate/FirstGenDefinitionHandler.java rename to src/com/romraider/newmaps/definition/translate/FirstGenDefinitionHandler.java index 3db96e18..c05e01b7 100644 --- a/src/enginuity/newmaps/definition/translate/FirstGenDefinitionHandler.java +++ b/src/com/romraider/newmaps/definition/translate/FirstGenDefinitionHandler.java @@ -21,23 +21,23 @@ //DOM XML parser for ROMs -package enginuity.newmaps.definition.translate; +package com.romraider.newmaps.definition.translate; -import enginuity.Settings; -import enginuity.maps.DataCell; -import enginuity.maps.Rom; -import enginuity.maps.RomID; -import enginuity.maps.Scale; -import enginuity.maps.Table; -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.xml.RomAttributeParser; -import enginuity.xml.TableIsOmittedException; +import com.romraider.Settings; +import com.romraider.maps.DataCell; +import com.romraider.maps.Rom; +import com.romraider.maps.RomID; +import com.romraider.maps.Scale; +import com.romraider.maps.Table; +import com.romraider.maps.Table1D; +import com.romraider.maps.Table2D; +import com.romraider.maps.Table3D; +import com.romraider.maps.TableSwitch; +import com.romraider.util.ObjectCloner; +import static com.romraider.xml.DOMHelper.unmarshallAttribute; +import static com.romraider.xml.DOMHelper.unmarshallText; +import com.romraider.xml.RomAttributeParser; +import com.romraider.xml.TableIsOmittedException; import org.apache.log4j.Logger; import org.w3c.dom.Node; import static org.w3c.dom.Node.ELEMENT_NODE; diff --git a/src/enginuity/newmaps/definition/translate/FirstGenTranslator.java b/src/com/romraider/newmaps/definition/translate/FirstGenTranslator.java similarity index 94% rename from src/enginuity/newmaps/definition/translate/FirstGenTranslator.java rename to src/com/romraider/newmaps/definition/translate/FirstGenTranslator.java index 23c2da59..074c2278 100644 --- a/src/enginuity/newmaps/definition/translate/FirstGenTranslator.java +++ b/src/com/romraider/newmaps/definition/translate/FirstGenTranslator.java @@ -19,10 +19,10 @@ * */ -package enginuity.newmaps.definition.translate; +package com.romraider.newmaps.definition.translate; import com.sun.org.apache.xerces.internal.parsers.DOMParser; -import enginuity.maps.Rom; +import com.romraider.maps.Rom; import org.w3c.dom.Document; import org.xml.sax.InputSource; import java.io.File; diff --git a/src/enginuity/newmaps/ecudata/AxisData.java b/src/com/romraider/newmaps/ecudata/AxisData.java similarity index 87% rename from src/enginuity/newmaps/ecudata/AxisData.java rename to src/com/romraider/newmaps/ecudata/AxisData.java index 140b10ea..272be525 100644 --- a/src/enginuity/newmaps/ecudata/AxisData.java +++ b/src/com/romraider/newmaps/ecudata/AxisData.java @@ -19,10 +19,10 @@ * */ -package enginuity.newmaps.ecudata; +package com.romraider.newmaps.ecudata; -import enginuity.newmaps.ecumetadata.AxisMetadata; -import enginuity.newmaps.util.ECUDataUtil; +import com.romraider.newmaps.ecumetadata.AxisMetadata; +import com.romraider.newmaps.util.ECUDataUtil; public class AxisData extends TableData { diff --git a/src/enginuity/newmaps/ecudata/DataCell.java b/src/com/romraider/newmaps/ecudata/DataCell.java similarity index 91% rename from src/enginuity/newmaps/ecudata/DataCell.java rename to src/com/romraider/newmaps/ecudata/DataCell.java index e8f8ee96..fd7973a5 100644 --- a/src/enginuity/newmaps/ecudata/DataCell.java +++ b/src/com/romraider/newmaps/ecudata/DataCell.java @@ -19,10 +19,10 @@ * */ -package enginuity.newmaps.ecudata; +package com.romraider.newmaps.ecudata; -import enginuity.newmaps.ecumetadata.Scale; -import enginuity.util.ByteUtil; +import com.romraider.newmaps.ecumetadata.Scale; +import com.romraider.util.ByteUtil; public class DataCell extends Number { diff --git a/src/enginuity/newmaps/ecudata/ECUData.java b/src/com/romraider/newmaps/ecudata/ECUData.java similarity index 92% rename from src/enginuity/newmaps/ecudata/ECUData.java rename to src/com/romraider/newmaps/ecudata/ECUData.java index 7d9cacab..969ee41e 100644 --- a/src/enginuity/newmaps/ecudata/ECUData.java +++ b/src/com/romraider/newmaps/ecudata/ECUData.java @@ -19,7 +19,7 @@ * */ -package enginuity.newmaps.ecudata; +package com.romraider.newmaps.ecudata; public class ECUData { diff --git a/src/enginuity/newmaps/ecudata/ParameterData.java b/src/com/romraider/newmaps/ecudata/ParameterData.java similarity index 93% rename from src/enginuity/newmaps/ecudata/ParameterData.java rename to src/com/romraider/newmaps/ecudata/ParameterData.java index 91b28dea..a7bf4bd6 100644 --- a/src/enginuity/newmaps/ecudata/ParameterData.java +++ b/src/com/romraider/newmaps/ecudata/ParameterData.java @@ -19,7 +19,7 @@ * */ -package enginuity.newmaps.ecudata; +package com.romraider.newmaps.ecudata; public class ParameterData extends TableData { diff --git a/src/enginuity/newmaps/ecudata/SwitchData.java b/src/com/romraider/newmaps/ecudata/SwitchData.java similarity index 93% rename from src/enginuity/newmaps/ecudata/SwitchData.java rename to src/com/romraider/newmaps/ecudata/SwitchData.java index 73c1d78d..bb37d9b2 100644 --- a/src/enginuity/newmaps/ecudata/SwitchData.java +++ b/src/com/romraider/newmaps/ecudata/SwitchData.java @@ -19,7 +19,7 @@ * */ -package enginuity.newmaps.ecudata; +package com.romraider.newmaps.ecudata; public class SwitchData extends TableData { diff --git a/src/enginuity/newmaps/ecudata/SwitchGroupData.java b/src/com/romraider/newmaps/ecudata/SwitchGroupData.java similarity index 93% rename from src/enginuity/newmaps/ecudata/SwitchGroupData.java rename to src/com/romraider/newmaps/ecudata/SwitchGroupData.java index 58e7f202..468a5fec 100644 --- a/src/enginuity/newmaps/ecudata/SwitchGroupData.java +++ b/src/com/romraider/newmaps/ecudata/SwitchGroupData.java @@ -19,7 +19,7 @@ * */ -package enginuity.newmaps.ecudata; +package com.romraider.newmaps.ecudata; public class SwitchGroupData extends TableData { diff --git a/src/enginuity/newmaps/ecudata/Table2DData.java b/src/com/romraider/newmaps/ecudata/Table2DData.java similarity index 93% rename from src/enginuity/newmaps/ecudata/Table2DData.java rename to src/com/romraider/newmaps/ecudata/Table2DData.java index 0b82f517..116c2126 100644 --- a/src/enginuity/newmaps/ecudata/Table2DData.java +++ b/src/com/romraider/newmaps/ecudata/Table2DData.java @@ -19,7 +19,7 @@ * */ -package enginuity.newmaps.ecudata; +package com.romraider.newmaps.ecudata; public class Table2DData extends TableData { diff --git a/src/enginuity/newmaps/ecudata/Table3DData.java b/src/com/romraider/newmaps/ecudata/Table3DData.java similarity index 87% rename from src/enginuity/newmaps/ecudata/Table3DData.java rename to src/com/romraider/newmaps/ecudata/Table3DData.java index 2370e412..e9651ca1 100644 --- a/src/enginuity/newmaps/ecudata/Table3DData.java +++ b/src/com/romraider/newmaps/ecudata/Table3DData.java @@ -19,11 +19,11 @@ * */ -package enginuity.newmaps.ecudata; +package com.romraider.newmaps.ecudata; -import enginuity.newmaps.ecumetadata.Table3DMetadata; -import enginuity.newmaps.exception.DataPopulationException; -import enginuity.newmaps.util.ECUDataUtil; +import com.romraider.newmaps.ecumetadata.Table3DMetadata; +import com.romraider.newmaps.exception.DataPopulationException; +import com.romraider.newmaps.util.ECUDataUtil; public class Table3DData extends TableData { diff --git a/src/enginuity/newmaps/ecudata/TableData.java b/src/com/romraider/newmaps/ecudata/TableData.java similarity index 89% rename from src/enginuity/newmaps/ecudata/TableData.java rename to src/com/romraider/newmaps/ecudata/TableData.java index 3a28212d..3ebcab66 100644 --- a/src/enginuity/newmaps/ecudata/TableData.java +++ b/src/com/romraider/newmaps/ecudata/TableData.java @@ -19,9 +19,9 @@ * */ -package enginuity.newmaps.ecudata; +package com.romraider.newmaps.ecudata; -import enginuity.newmaps.ecumetadata.TableMetadata; +import com.romraider.newmaps.ecumetadata.TableMetadata; public abstract class TableData { diff --git a/src/enginuity/newmaps/ecumetadata/AxisMetadata.java b/src/com/romraider/newmaps/ecumetadata/AxisMetadata.java similarity index 93% rename from src/enginuity/newmaps/ecumetadata/AxisMetadata.java rename to src/com/romraider/newmaps/ecumetadata/AxisMetadata.java index c0f43d2d..130a8561 100644 --- a/src/enginuity/newmaps/ecumetadata/AxisMetadata.java +++ b/src/com/romraider/newmaps/ecumetadata/AxisMetadata.java @@ -19,7 +19,7 @@ * */ -package enginuity.newmaps.ecumetadata; +package com.romraider.newmaps.ecumetadata; import java.io.Serializable; diff --git a/src/enginuity/newmaps/ecumetadata/Category.java b/src/com/romraider/newmaps/ecumetadata/Category.java similarity index 92% rename from src/enginuity/newmaps/ecumetadata/Category.java rename to src/com/romraider/newmaps/ecumetadata/Category.java index c53ea9cf..2475a1a3 100644 --- a/src/enginuity/newmaps/ecumetadata/Category.java +++ b/src/com/romraider/newmaps/ecumetadata/Category.java @@ -19,10 +19,10 @@ * */ -package enginuity.newmaps.ecumetadata; +package com.romraider.newmaps.ecumetadata; -import enginuity.util.Nameable; -import enginuity.util.NamedSet; +import com.romraider.util.Nameable; +import com.romraider.util.NamedSet; import java.io.Serializable; import java.util.Iterator; diff --git a/src/enginuity/newmaps/ecumetadata/ParameterMetadata.java b/src/com/romraider/newmaps/ecumetadata/ParameterMetadata.java similarity index 93% rename from src/enginuity/newmaps/ecumetadata/ParameterMetadata.java rename to src/com/romraider/newmaps/ecumetadata/ParameterMetadata.java index 29b84a05..15f6cde9 100644 --- a/src/enginuity/newmaps/ecumetadata/ParameterMetadata.java +++ b/src/com/romraider/newmaps/ecumetadata/ParameterMetadata.java @@ -19,7 +19,7 @@ * */ -package enginuity.newmaps.ecumetadata; +package com.romraider.newmaps.ecumetadata; import java.io.Serializable; diff --git a/src/enginuity/newmaps/ecumetadata/RomMetadata.java b/src/com/romraider/newmaps/ecumetadata/RomMetadata.java similarity index 93% rename from src/enginuity/newmaps/ecumetadata/RomMetadata.java rename to src/com/romraider/newmaps/ecumetadata/RomMetadata.java index 7eaa0226..c677b217 100644 --- a/src/enginuity/newmaps/ecumetadata/RomMetadata.java +++ b/src/com/romraider/newmaps/ecumetadata/RomMetadata.java @@ -19,10 +19,10 @@ * */ -package enginuity.newmaps.ecumetadata; +package com.romraider.newmaps.ecumetadata; -import enginuity.util.Nameable; -import enginuity.util.NamedSet; +import com.romraider.util.Nameable; +import com.romraider.util.NamedSet; import java.io.Serializable; public class RomMetadata implements Nameable, Serializable { diff --git a/src/enginuity/newmaps/ecumetadata/Scale.java b/src/com/romraider/newmaps/ecumetadata/Scale.java similarity index 94% rename from src/enginuity/newmaps/ecumetadata/Scale.java rename to src/com/romraider/newmaps/ecumetadata/Scale.java index 79026271..64dd5c48 100644 --- a/src/enginuity/newmaps/ecumetadata/Scale.java +++ b/src/com/romraider/newmaps/ecumetadata/Scale.java @@ -19,9 +19,9 @@ * */ -package enginuity.newmaps.ecumetadata; +package com.romraider.newmaps.ecumetadata; -import enginuity.util.Nameable; +import com.romraider.util.Nameable; import java.io.Serializable; public class Scale implements Nameable, Serializable { diff --git a/src/enginuity/newmaps/ecumetadata/SourceDefAxisMetadata.java b/src/com/romraider/newmaps/ecumetadata/SourceDefAxisMetadata.java similarity index 87% rename from src/enginuity/newmaps/ecumetadata/SourceDefAxisMetadata.java rename to src/com/romraider/newmaps/ecumetadata/SourceDefAxisMetadata.java index 4514c7a6..cfa7b590 100644 --- a/src/enginuity/newmaps/ecumetadata/SourceDefAxisMetadata.java +++ b/src/com/romraider/newmaps/ecumetadata/SourceDefAxisMetadata.java @@ -19,9 +19,9 @@ * */ -package enginuity.newmaps.ecumetadata; +package com.romraider.newmaps.ecumetadata; -import static enginuity.newmaps.definition.AttributeParser.stringToStringArray; +import static com.romraider.newmaps.definition.AttributeParser.stringToStringArray; import java.io.Serializable; public class SourceDefAxisMetadata extends AxisMetadata implements Serializable { diff --git a/src/enginuity/newmaps/ecumetadata/SwitchGroupMetadata.java b/src/com/romraider/newmaps/ecumetadata/SwitchGroupMetadata.java similarity index 91% rename from src/enginuity/newmaps/ecumetadata/SwitchGroupMetadata.java rename to src/com/romraider/newmaps/ecumetadata/SwitchGroupMetadata.java index 2b5b0523..0da7e357 100644 --- a/src/enginuity/newmaps/ecumetadata/SwitchGroupMetadata.java +++ b/src/com/romraider/newmaps/ecumetadata/SwitchGroupMetadata.java @@ -19,10 +19,10 @@ * */ -package enginuity.newmaps.ecumetadata; +package com.romraider.newmaps.ecumetadata; -import enginuity.util.NamedSet; -import enginuity.util.exception.NameableNotFoundException; +import com.romraider.util.NamedSet; +import com.romraider.util.exception.NameableNotFoundException; import java.util.Iterator; public class SwitchGroupMetadata extends TableMetadata { diff --git a/src/enginuity/newmaps/ecumetadata/SwitchMetadata.java b/src/com/romraider/newmaps/ecumetadata/SwitchMetadata.java similarity index 92% rename from src/enginuity/newmaps/ecumetadata/SwitchMetadata.java rename to src/com/romraider/newmaps/ecumetadata/SwitchMetadata.java index de6dfb38..041ddfce 100644 --- a/src/enginuity/newmaps/ecumetadata/SwitchMetadata.java +++ b/src/com/romraider/newmaps/ecumetadata/SwitchMetadata.java @@ -19,9 +19,9 @@ * */ -package enginuity.newmaps.ecumetadata; +package com.romraider.newmaps.ecumetadata; -import static enginuity.newmaps.definition.AttributeParser.stringToByteArray; +import static com.romraider.newmaps.definition.AttributeParser.stringToByteArray; import java.io.Serializable; public class SwitchMetadata extends TableMetadata implements Serializable { diff --git a/src/enginuity/newmaps/ecumetadata/Table2DMetadata.java b/src/com/romraider/newmaps/ecumetadata/Table2DMetadata.java similarity index 94% rename from src/enginuity/newmaps/ecumetadata/Table2DMetadata.java rename to src/com/romraider/newmaps/ecumetadata/Table2DMetadata.java index 0a0844d1..79cdbe31 100644 --- a/src/enginuity/newmaps/ecumetadata/Table2DMetadata.java +++ b/src/com/romraider/newmaps/ecumetadata/Table2DMetadata.java @@ -19,7 +19,7 @@ * */ -package enginuity.newmaps.ecumetadata; +package com.romraider.newmaps.ecumetadata; import java.io.Serializable; diff --git a/src/enginuity/newmaps/ecumetadata/Table3DMetadata.java b/src/com/romraider/newmaps/ecumetadata/Table3DMetadata.java similarity index 93% rename from src/enginuity/newmaps/ecumetadata/Table3DMetadata.java rename to src/com/romraider/newmaps/ecumetadata/Table3DMetadata.java index 1dbd7531..8031a26f 100644 --- a/src/enginuity/newmaps/ecumetadata/Table3DMetadata.java +++ b/src/com/romraider/newmaps/ecumetadata/Table3DMetadata.java @@ -19,7 +19,7 @@ * */ -package enginuity.newmaps.ecumetadata; +package com.romraider.newmaps.ecumetadata; import java.io.Serializable; diff --git a/src/enginuity/newmaps/ecumetadata/TableMetadata.java b/src/com/romraider/newmaps/ecumetadata/TableMetadata.java similarity index 93% rename from src/enginuity/newmaps/ecumetadata/TableMetadata.java rename to src/com/romraider/newmaps/ecumetadata/TableMetadata.java index 2b56f37b..03147c96 100644 --- a/src/enginuity/newmaps/ecumetadata/TableMetadata.java +++ b/src/com/romraider/newmaps/ecumetadata/TableMetadata.java @@ -19,9 +19,9 @@ * */ -package enginuity.newmaps.ecumetadata; +package com.romraider.newmaps.ecumetadata; -import enginuity.util.Nameable; +import com.romraider.util.Nameable; import java.io.Serializable; public abstract class TableMetadata implements Nameable, Serializable { diff --git a/src/enginuity/newmaps/ecumetadata/Unit.java b/src/com/romraider/newmaps/ecumetadata/Unit.java similarity index 93% rename from src/enginuity/newmaps/ecumetadata/Unit.java rename to src/com/romraider/newmaps/ecumetadata/Unit.java index 7acdb235..0db814da 100644 --- a/src/enginuity/newmaps/ecumetadata/Unit.java +++ b/src/com/romraider/newmaps/ecumetadata/Unit.java @@ -19,9 +19,9 @@ * */ -package enginuity.newmaps.ecumetadata; +package com.romraider.newmaps.ecumetadata; -import enginuity.util.Nameable; +import com.romraider.util.Nameable; import java.io.Serializable; public class Unit implements Nameable, Serializable { diff --git a/src/enginuity/newmaps/exception/DataPopulationException.java b/src/com/romraider/newmaps/exception/DataPopulationException.java similarity index 93% rename from src/enginuity/newmaps/exception/DataPopulationException.java rename to src/com/romraider/newmaps/exception/DataPopulationException.java index d8ecd615..56ed1fda 100644 --- a/src/enginuity/newmaps/exception/DataPopulationException.java +++ b/src/com/romraider/newmaps/exception/DataPopulationException.java @@ -19,7 +19,7 @@ * */ -package enginuity.newmaps.exception; +package com.romraider.newmaps.exception; public class DataPopulationException extends Exception { diff --git a/src/enginuity/newmaps/exception/RomNotFoundException.java b/src/com/romraider/newmaps/exception/RomNotFoundException.java similarity index 93% rename from src/enginuity/newmaps/exception/RomNotFoundException.java rename to src/com/romraider/newmaps/exception/RomNotFoundException.java index dbb785c2..c0a14497 100644 --- a/src/enginuity/newmaps/exception/RomNotFoundException.java +++ b/src/com/romraider/newmaps/exception/RomNotFoundException.java @@ -19,7 +19,7 @@ * */ -package enginuity.newmaps.exception; +package com.romraider.newmaps.exception; public class RomNotFoundException extends Exception { diff --git a/src/enginuity/newmaps/exception/ScaleNotFoundException.java b/src/com/romraider/newmaps/exception/ScaleNotFoundException.java similarity index 93% rename from src/enginuity/newmaps/exception/ScaleNotFoundException.java rename to src/com/romraider/newmaps/exception/ScaleNotFoundException.java index fc076272..34234fcf 100644 --- a/src/enginuity/newmaps/exception/ScaleNotFoundException.java +++ b/src/com/romraider/newmaps/exception/ScaleNotFoundException.java @@ -19,7 +19,7 @@ * */ -package enginuity.newmaps.exception; +package com.romraider.newmaps.exception; public class ScaleNotFoundException extends Exception { diff --git a/src/enginuity/newmaps/exception/TableNotFoundException.java b/src/com/romraider/newmaps/exception/TableNotFoundException.java similarity index 93% rename from src/enginuity/newmaps/exception/TableNotFoundException.java rename to src/com/romraider/newmaps/exception/TableNotFoundException.java index e06a6dad..2dac9302 100644 --- a/src/enginuity/newmaps/exception/TableNotFoundException.java +++ b/src/com/romraider/newmaps/exception/TableNotFoundException.java @@ -19,7 +19,7 @@ * */ -package enginuity.newmaps.exception; +package com.romraider.newmaps.exception; public class TableNotFoundException extends Exception { diff --git a/src/enginuity/newmaps/exception/UnitNotFoundException.java b/src/com/romraider/newmaps/exception/UnitNotFoundException.java similarity index 92% rename from src/enginuity/newmaps/exception/UnitNotFoundException.java rename to src/com/romraider/newmaps/exception/UnitNotFoundException.java index e15fb7ee..72cdfa10 100644 --- a/src/enginuity/newmaps/exception/UnitNotFoundException.java +++ b/src/com/romraider/newmaps/exception/UnitNotFoundException.java @@ -19,7 +19,7 @@ * */ -package enginuity.newmaps.exception; +package com.romraider.newmaps.exception; public class UnitNotFoundException extends Exception { diff --git a/src/enginuity/newmaps/swing/Frame3D.java b/src/com/romraider/newmaps/swing/Frame3D.java similarity index 85% rename from src/enginuity/newmaps/swing/Frame3D.java rename to src/com/romraider/newmaps/swing/Frame3D.java index 17965203..50c067d5 100644 --- a/src/enginuity/newmaps/swing/Frame3D.java +++ b/src/com/romraider/newmaps/swing/Frame3D.java @@ -19,26 +19,26 @@ * */ -package enginuity.newmaps.swing; +package com.romraider.newmaps.swing; -import enginuity.newmaps.ecudata.DataCell; -import enginuity.newmaps.ecudata.Table3DData; -import enginuity.newmaps.ecumetadata.AxisMetadata; -import enginuity.newmaps.ecumetadata.Scale; -import enginuity.newmaps.ecumetadata.Table3DMetadata; -import enginuity.newmaps.ecumetadata.Unit; -import enginuity.newmaps.exception.DataPopulationException; -import enginuity.util.LogManager; +import com.romraider.newmaps.ecudata.DataCell; +import com.romraider.newmaps.ecudata.Table3DData; +import com.romraider.newmaps.ecumetadata.AxisMetadata; +import com.romraider.newmaps.ecumetadata.Scale; +import com.romraider.newmaps.ecumetadata.Table3DMetadata; +import com.romraider.newmaps.ecumetadata.Unit; +import com.romraider.newmaps.exception.DataPopulationException; +import com.romraider.util.LogManager; import org.apache.log4j.Logger; import javax.swing.JScrollPane; -public class Frame3D extends EnginuityFrame { +public class Frame3D extends RomRaiderFrame { private static final Logger LOGGER = Logger.getLogger(Frame3D.class); Table3DData table; - EnginuityJTable xAxisTable; - EnginuityJTable yAxisTable; - EnginuityJTable jTable; + RomRaiderJTable xAxisTable; + RomRaiderJTable yAxisTable; + RomRaiderJTable jTable; public Frame3D(Table3DData table) { @@ -47,7 +47,7 @@ public class Frame3D extends EnginuityFrame { //super(data, (TableMetadata)metadata); Table3DMetadata metadata = (Table3DMetadata) table.getMetadata(); DataCell[][] dataCell = table.getValues(); - jTable = new EnginuityJTable(metadata.getSizeX(), metadata.getSizeY()); + jTable = new RomRaiderJTable(metadata.getSizeX(), metadata.getSizeY()); setLocationRelativeTo(null); setVisible(true); diff --git a/src/enginuity/newmaps/swing/EnginuityFrame.java b/src/com/romraider/newmaps/swing/RomRaiderFrame.java similarity index 87% rename from src/enginuity/newmaps/swing/EnginuityFrame.java rename to src/com/romraider/newmaps/swing/RomRaiderFrame.java index 99d0830f..6599122d 100644 --- a/src/enginuity/newmaps/swing/EnginuityFrame.java +++ b/src/com/romraider/newmaps/swing/RomRaiderFrame.java @@ -19,11 +19,11 @@ * */ -package enginuity.newmaps.swing; +package com.romraider.newmaps.swing; import javax.swing.JFrame; -public abstract class EnginuityFrame extends JFrame { +public abstract class RomRaiderFrame extends JFrame { } \ No newline at end of file diff --git a/src/enginuity/newmaps/swing/EnginuityJTable.java b/src/com/romraider/newmaps/swing/RomRaiderJTable.java similarity index 91% rename from src/enginuity/newmaps/swing/EnginuityJTable.java rename to src/com/romraider/newmaps/swing/RomRaiderJTable.java index 27e8c512..e3b91eed 100644 --- a/src/enginuity/newmaps/swing/EnginuityJTable.java +++ b/src/com/romraider/newmaps/swing/RomRaiderJTable.java @@ -1,4 +1,4 @@ -package enginuity.newmaps.swing; +package com.romraider.newmaps.swing; import javax.swing.JTable; import java.awt.Color; @@ -13,7 +13,7 @@ import java.util.Comparator; import java.util.HashSet; import java.util.Iterator; -public class EnginuityJTable extends JTable { +public class RomRaiderJTable extends JTable { HashSet cellSelection = new HashSet(); @@ -35,7 +35,7 @@ public class EnginuityJTable extends JTable { private int action; - public EnginuityJTable(int columns, int rows) { + public RomRaiderJTable(int columns, int rows) { super(rows, columns); MouseMotionListener[] cls = (MouseMotionListener[]) (this.getListeners(MouseMotionListener.class)); @@ -207,12 +207,12 @@ public class EnginuityJTable extends JTable { cell = (Point) iter.next(); clipBoard.add(new Cell(cell, this.getValueAt((int) cell.getX(), (int) cell.getY()))); - if (cut == EnginuityJTable.CUT) { + if (cut == RomRaiderJTable.CUT) { setSelectionBackground(this.cutSelectionColour); - setAction(EnginuityJTable.CUT); - } else if (cut == EnginuityJTable.COPY) { + setAction(RomRaiderJTable.CUT); + } else if (cut == RomRaiderJTable.COPY) { setSelectionBackground(this.copySelectionColour); - setAction(EnginuityJTable.COPY); + setAction(RomRaiderJTable.COPY); } repaint(); } @@ -269,9 +269,9 @@ public class EnginuityJTable extends JTable { class MouseMotionH implements MouseMotionListener { - private EnginuityJTable myJTable = null; + private RomRaiderJTable myJTable = null; - public MouseMotionH(EnginuityJTable myJTable) { + public MouseMotionH(RomRaiderJTable myJTable) { super(); this.myJTable = myJTable; } @@ -293,10 +293,10 @@ public class EnginuityJTable extends JTable { } class EventKeyHandler extends KeyAdapter { - private EnginuityJTable myJTable = null; + private RomRaiderJTable myJTable = null; - public EventKeyHandler(EnginuityJTable myJTable) { + public EventKeyHandler(RomRaiderJTable myJTable) { super(); this.myJTable = myJTable; } @@ -305,7 +305,7 @@ public class EnginuityJTable extends JTable { /*Copy*/ //System.out.println(e.getModifiers()); if ((e.isControlDown() && e.getKeyCode() == 67)) { - myJTable.toClipBoard(EnginuityJTable.COPY); + myJTable.toClipBoard(RomRaiderJTable.COPY); return; } else /*Paste*/ @@ -316,7 +316,7 @@ public class EnginuityJTable extends JTable { if (cell != null) { - if (myJTable.getAction() == EnginuityJTable.CUT) + if (myJTable.getAction() == RomRaiderJTable.CUT) for (Iterator iter = clipBoard.iterator(); iter.hasNext();) { cutCell = (Cell) iter.next(); myJTable.setValueAt(null, (int) cutCell.getX(), (int) cutCell.getY()); @@ -344,7 +344,7 @@ public class EnginuityJTable extends JTable { } else /*Cut*/ if ((e.isControlDown() && e.getKeyCode() == 88)) { - myJTable.toClipBoard(EnginuityJTable.CUT); + myJTable.toClipBoard(RomRaiderJTable.CUT); return; } else if (e.getModifiers() == (InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK | InputEvent.BUTTON1_MASK)) { //myJTable.changeSelection(5,5,false, true); diff --git a/src/enginuity/newmaps/swing/TableSelectionModel.java b/src/com/romraider/newmaps/swing/TableSelectionModel.java similarity index 94% rename from src/enginuity/newmaps/swing/TableSelectionModel.java rename to src/com/romraider/newmaps/swing/TableSelectionModel.java index 556914a8..68e9bf9d 100644 --- a/src/enginuity/newmaps/swing/TableSelectionModel.java +++ b/src/com/romraider/newmaps/swing/TableSelectionModel.java @@ -22,7 +22,7 @@ /** * */ -package enginuity.newmaps.swing; +package com.romraider.newmaps.swing; import javax.swing.DefaultListSelectionModel; diff --git a/src/enginuity/newmaps/swing/Test.java b/src/com/romraider/newmaps/swing/Test.java similarity index 81% rename from src/enginuity/newmaps/swing/Test.java rename to src/com/romraider/newmaps/swing/Test.java index 4279979c..0ad20b60 100644 --- a/src/enginuity/newmaps/swing/Test.java +++ b/src/com/romraider/newmaps/swing/Test.java @@ -1,4 +1,4 @@ -package enginuity.newmaps.swing; +package com.romraider.newmaps.swing; import javax.swing.JFrame; import javax.swing.JScrollPane; @@ -6,7 +6,7 @@ import javax.swing.JTable; public class Test extends JFrame { public Test() { - JTable table = new EnginuityJTable(100, 50); + JTable table = new RomRaiderJTable(100, 50); JScrollPane scrollPane = new JScrollPane(table); getContentPane().add(scrollPane); } diff --git a/src/enginuity/newmaps/util/ECUDataUtil.java b/src/com/romraider/newmaps/util/ECUDataUtil.java similarity index 89% rename from src/enginuity/newmaps/util/ECUDataUtil.java rename to src/com/romraider/newmaps/util/ECUDataUtil.java index 27aa2639..5f00c139 100644 --- a/src/enginuity/newmaps/util/ECUDataUtil.java +++ b/src/com/romraider/newmaps/util/ECUDataUtil.java @@ -19,12 +19,12 @@ * */ -package enginuity.newmaps.util; +package com.romraider.newmaps.util; -import enginuity.newmaps.ecudata.DataCell; -import enginuity.newmaps.ecumetadata.Table3DMetadata; -import enginuity.newmaps.ecumetadata.TableMetadata; -import enginuity.util.ByteUtil; +import com.romraider.newmaps.ecudata.DataCell; +import com.romraider.newmaps.ecumetadata.Table3DMetadata; +import com.romraider.newmaps.ecumetadata.TableMetadata; +import com.romraider.util.ByteUtil; public final class ECUDataUtil { diff --git a/src/enginuity/newmaps/xml/SaxParserFactory.java b/src/com/romraider/newmaps/xml/SaxParserFactory.java similarity index 89% rename from src/enginuity/newmaps/xml/SaxParserFactory.java rename to src/com/romraider/newmaps/xml/SaxParserFactory.java index 42eeee2d..0612559f 100644 --- a/src/enginuity/newmaps/xml/SaxParserFactory.java +++ b/src/com/romraider/newmaps/xml/SaxParserFactory.java @@ -19,7 +19,7 @@ * */ -package enginuity.newmaps.xml; +package com.romraider.newmaps.xml; import org.xml.sax.SAXException; import javax.xml.parsers.ParserConfigurationException; @@ -27,7 +27,7 @@ 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.. +// Jared, this is the same as the SaxParserFactory that I used for the logger which I've moved to the com.romraider.util package. You should probably use the same one.. public final class SaxParserFactory { private SaxParserFactory() { diff --git a/src/enginuity/newmaps/xml/XmlHelper.java b/src/com/romraider/newmaps/xml/XmlHelper.java similarity index 95% rename from src/enginuity/newmaps/xml/XmlHelper.java rename to src/com/romraider/newmaps/xml/XmlHelper.java index 364a5880..09e269c3 100644 --- a/src/enginuity/newmaps/xml/XmlHelper.java +++ b/src/com/romraider/newmaps/xml/XmlHelper.java @@ -19,9 +19,9 @@ * */ -package enginuity.newmaps.xml; +package com.romraider.newmaps.xml; -import enginuity.logger.ecu.exception.ConfigurationException; +import com.romraider.logger.ecu.exception.ConfigurationException; import org.apache.log4j.Logger; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/src/enginuity/ramtune/test/RamTuneTestApp.java b/src/com/romraider/ramtune/test/RamTuneTestApp.java similarity index 93% rename from src/enginuity/ramtune/test/RamTuneTestApp.java rename to src/com/romraider/ramtune/test/RamTuneTestApp.java index 7129f615..c389ba09 100644 --- a/src/enginuity/ramtune/test/RamTuneTestApp.java +++ b/src/com/romraider/ramtune/test/RamTuneTestApp.java @@ -1,24 +1,24 @@ -package enginuity.ramtune.test; +package com.romraider.ramtune.test; -import enginuity.Settings; -import enginuity.io.connection.ConnectionProperties; -import enginuity.io.port.SerialPortRefresher; -import enginuity.io.protocol.Protocol; -import enginuity.io.protocol.SSMProtocol; -import enginuity.logger.ecu.ui.SerialPortComboBox; -import enginuity.ramtune.test.command.executor.CommandExecutor; -import enginuity.ramtune.test.command.executor.CommandExecutorImpl; -import enginuity.ramtune.test.command.generator.CommandGenerator; -import enginuity.ramtune.test.command.generator.EcuInitCommandGenerator; -import enginuity.ramtune.test.command.generator.ReadCommandGenerator; -import enginuity.ramtune.test.command.generator.WriteCommandGenerator; -import enginuity.ramtune.test.io.RamTuneTestAppConnectionProperties; -import enginuity.swing.LookAndFeelManager; -import static enginuity.util.HexUtil.asBytes; -import static enginuity.util.HexUtil.asHex; -import enginuity.util.LogManager; -import static enginuity.util.ThreadUtil.runAsDaemon; -import static enginuity.util.ThreadUtil.sleep; +import com.romraider.Settings; +import com.romraider.io.connection.ConnectionProperties; +import com.romraider.io.port.SerialPortRefresher; +import com.romraider.io.protocol.Protocol; +import com.romraider.io.protocol.SSMProtocol; +import com.romraider.logger.ecu.ui.SerialPortComboBox; +import com.romraider.ramtune.test.command.executor.CommandExecutor; +import com.romraider.ramtune.test.command.executor.CommandExecutorImpl; +import com.romraider.ramtune.test.command.generator.CommandGenerator; +import com.romraider.ramtune.test.command.generator.EcuInitCommandGenerator; +import com.romraider.ramtune.test.command.generator.ReadCommandGenerator; +import com.romraider.ramtune.test.command.generator.WriteCommandGenerator; +import com.romraider.ramtune.test.io.RamTuneTestAppConnectionProperties; +import com.romraider.swing.LookAndFeelManager; +import static com.romraider.util.HexUtil.asBytes; +import static com.romraider.util.HexUtil.asHex; +import com.romraider.util.LogManager; +import static com.romraider.util.ThreadUtil.runAsDaemon; +import static com.romraider.util.ThreadUtil.sleep; import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JComboBox; @@ -400,7 +400,7 @@ public final class RamTuneTestApp extends JFrame implements WindowListener { SwingUtilities.invokeLater(new Runnable() { public void run() { RamTuneTestApp ramTuneTestApp = new RamTuneTestApp("RAMTune - Test App"); - ramTuneTestApp.setIconImage(new ImageIcon("./graphics/enginuity-ico.gif").getImage()); + ramTuneTestApp.setIconImage(new ImageIcon("./graphics/romraider-ico.gif").getImage()); ramTuneTestApp.setDefaultCloseOperation(defaultCloseOperation); ramTuneTestApp.addWindowListener(ramTuneTestApp); ramTuneTestApp.setLocation(100, 50); diff --git a/src/enginuity/ramtune/test/command/executor/CommandExecutor.java b/src/com/romraider/ramtune/test/command/executor/CommandExecutor.java similarity index 60% rename from src/enginuity/ramtune/test/command/executor/CommandExecutor.java rename to src/com/romraider/ramtune/test/command/executor/CommandExecutor.java index 64acf576..63215ed8 100644 --- a/src/enginuity/ramtune/test/command/executor/CommandExecutor.java +++ b/src/com/romraider/ramtune/test/command/executor/CommandExecutor.java @@ -1,4 +1,4 @@ -package enginuity.ramtune.test.command.executor; +package com.romraider.ramtune.test.command.executor; public interface CommandExecutor { diff --git a/src/enginuity/ramtune/test/command/executor/CommandExecutorImpl.java b/src/com/romraider/ramtune/test/command/executor/CommandExecutorImpl.java similarity index 67% rename from src/enginuity/ramtune/test/command/executor/CommandExecutorImpl.java rename to src/com/romraider/ramtune/test/command/executor/CommandExecutorImpl.java index dd1fe550..2eec1899 100644 --- a/src/enginuity/ramtune/test/command/executor/CommandExecutorImpl.java +++ b/src/com/romraider/ramtune/test/command/executor/CommandExecutorImpl.java @@ -1,10 +1,10 @@ -package enginuity.ramtune.test.command.executor; +package com.romraider.ramtune.test.command.executor; -import enginuity.io.connection.ConnectionProperties; -import enginuity.io.connection.EcuConnection; -import enginuity.io.connection.EcuConnectionImpl; -import static enginuity.util.ParamChecker.checkNotNull; -import static enginuity.util.ParamChecker.checkNotNullOrEmpty; +import com.romraider.io.connection.ConnectionProperties; +import com.romraider.io.connection.EcuConnection; +import com.romraider.io.connection.EcuConnectionImpl; +import static com.romraider.util.ParamChecker.checkNotNull; +import static com.romraider.util.ParamChecker.checkNotNullOrEmpty; public final class CommandExecutorImpl implements CommandExecutor { private final ConnectionProperties connectionProperties; diff --git a/src/enginuity/ramtune/test/command/generator/AbstractCommandGenerator.java b/src/com/romraider/ramtune/test/command/generator/AbstractCommandGenerator.java similarity index 65% rename from src/enginuity/ramtune/test/command/generator/AbstractCommandGenerator.java rename to src/com/romraider/ramtune/test/command/generator/AbstractCommandGenerator.java index 2c2ca3ca..a3859582 100644 --- a/src/enginuity/ramtune/test/command/generator/AbstractCommandGenerator.java +++ b/src/com/romraider/ramtune/test/command/generator/AbstractCommandGenerator.java @@ -1,7 +1,7 @@ -package enginuity.ramtune.test.command.generator; +package com.romraider.ramtune.test.command.generator; -import enginuity.io.protocol.Protocol; -import static enginuity.util.ParamChecker.checkNotNull; +import com.romraider.io.protocol.Protocol; +import static com.romraider.util.ParamChecker.checkNotNull; public abstract class AbstractCommandGenerator implements CommandGenerator { protected final Protocol protocol; diff --git a/src/enginuity/ramtune/test/command/generator/CommandGenerator.java b/src/com/romraider/ramtune/test/command/generator/CommandGenerator.java similarity index 72% rename from src/enginuity/ramtune/test/command/generator/CommandGenerator.java rename to src/com/romraider/ramtune/test/command/generator/CommandGenerator.java index 1fa47214..ab3e1a20 100644 --- a/src/enginuity/ramtune/test/command/generator/CommandGenerator.java +++ b/src/com/romraider/ramtune/test/command/generator/CommandGenerator.java @@ -1,4 +1,4 @@ -package enginuity.ramtune.test.command.generator; +package com.romraider.ramtune.test.command.generator; import java.util.List; diff --git a/src/enginuity/ramtune/test/command/generator/EcuInitCommandGenerator.java b/src/com/romraider/ramtune/test/command/generator/EcuInitCommandGenerator.java similarity index 81% rename from src/enginuity/ramtune/test/command/generator/EcuInitCommandGenerator.java rename to src/com/romraider/ramtune/test/command/generator/EcuInitCommandGenerator.java index 9e06f215..a74048b2 100644 --- a/src/enginuity/ramtune/test/command/generator/EcuInitCommandGenerator.java +++ b/src/com/romraider/ramtune/test/command/generator/EcuInitCommandGenerator.java @@ -1,6 +1,6 @@ -package enginuity.ramtune.test.command.generator; +package com.romraider.ramtune.test.command.generator; -import enginuity.io.protocol.Protocol; +import com.romraider.io.protocol.Protocol; import static java.util.Arrays.asList; import java.util.List; diff --git a/src/enginuity/ramtune/test/command/generator/ReadCommandGenerator.java b/src/com/romraider/ramtune/test/command/generator/ReadCommandGenerator.java similarity index 89% rename from src/enginuity/ramtune/test/command/generator/ReadCommandGenerator.java rename to src/com/romraider/ramtune/test/command/generator/ReadCommandGenerator.java index d085e7c2..5f61269b 100644 --- a/src/enginuity/ramtune/test/command/generator/ReadCommandGenerator.java +++ b/src/com/romraider/ramtune/test/command/generator/ReadCommandGenerator.java @@ -1,8 +1,8 @@ -package enginuity.ramtune.test.command.generator; +package com.romraider.ramtune.test.command.generator; -import enginuity.io.protocol.Protocol; -import static enginuity.util.ParamChecker.checkGreaterThanZero; -import static enginuity.util.ParamChecker.checkNotNullOrEmpty; +import com.romraider.io.protocol.Protocol; +import static com.romraider.util.ParamChecker.checkGreaterThanZero; +import static com.romraider.util.ParamChecker.checkNotNullOrEmpty; import java.math.BigInteger; import java.util.ArrayList; import static java.util.Arrays.asList; diff --git a/src/enginuity/ramtune/test/command/generator/WriteCommandGenerator.java b/src/com/romraider/ramtune/test/command/generator/WriteCommandGenerator.java similarity index 76% rename from src/enginuity/ramtune/test/command/generator/WriteCommandGenerator.java rename to src/com/romraider/ramtune/test/command/generator/WriteCommandGenerator.java index 14f28d8f..5d3a5039 100644 --- a/src/enginuity/ramtune/test/command/generator/WriteCommandGenerator.java +++ b/src/com/romraider/ramtune/test/command/generator/WriteCommandGenerator.java @@ -1,7 +1,7 @@ -package enginuity.ramtune.test.command.generator; +package com.romraider.ramtune.test.command.generator; -import enginuity.io.protocol.Protocol; -import static enginuity.util.ParamChecker.checkNotNullOrEmpty; +import com.romraider.io.protocol.Protocol; +import static com.romraider.util.ParamChecker.checkNotNullOrEmpty; import static java.util.Arrays.asList; import java.util.List; diff --git a/src/enginuity/ramtune/test/io/RamTuneTestAppConnectionProperties.java b/src/com/romraider/ramtune/test/io/RamTuneTestAppConnectionProperties.java similarity index 88% rename from src/enginuity/ramtune/test/io/RamTuneTestAppConnectionProperties.java rename to src/com/romraider/ramtune/test/io/RamTuneTestAppConnectionProperties.java index fd1115a7..228b5796 100644 --- a/src/enginuity/ramtune/test/io/RamTuneTestAppConnectionProperties.java +++ b/src/com/romraider/ramtune/test/io/RamTuneTestAppConnectionProperties.java @@ -1,6 +1,6 @@ -package enginuity.ramtune.test.io; +package com.romraider.ramtune.test.io; -import enginuity.io.connection.ConnectionProperties; +import com.romraider.io.connection.ConnectionProperties; public final class RamTuneTestAppConnectionProperties implements ConnectionProperties { private final ConnectionProperties defaultConnectionProperties; diff --git a/src/enginuity/swing/CategoryTreeNode.java b/src/com/romraider/swing/CategoryTreeNode.java similarity index 92% rename from src/enginuity/swing/CategoryTreeNode.java rename to src/com/romraider/swing/CategoryTreeNode.java index b1cacf13..de8651c7 100644 --- a/src/enginuity/swing/CategoryTreeNode.java +++ b/src/com/romraider/swing/CategoryTreeNode.java @@ -19,9 +19,9 @@ * */ -package enginuity.swing; +package com.romraider.swing; -import enginuity.maps.Rom; +import com.romraider.maps.Rom; import javax.swing.tree.DefaultMutableTreeNode; public class CategoryTreeNode extends DefaultMutableTreeNode { diff --git a/src/enginuity/swing/DebugPanel.java b/src/com/romraider/swing/DebugPanel.java similarity index 94% rename from src/enginuity/swing/DebugPanel.java rename to src/com/romraider/swing/DebugPanel.java index 580126a8..49468f61 100644 --- a/src/enginuity/swing/DebugPanel.java +++ b/src/com/romraider/swing/DebugPanel.java @@ -19,9 +19,9 @@ * */ -package enginuity.swing; +package com.romraider.swing; -import enginuity.net.URL; +import com.romraider.net.URL; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JTextArea; diff --git a/src/enginuity/swing/DefinitionManager.java b/src/com/romraider/swing/DefinitionManager.java similarity index 97% rename from src/enginuity/swing/DefinitionManager.java rename to src/com/romraider/swing/DefinitionManager.java index c9553436..b3b0d8c3 100644 --- a/src/enginuity/swing/DefinitionManager.java +++ b/src/com/romraider/swing/DefinitionManager.java @@ -19,9 +19,9 @@ * */ -package enginuity.swing; +package com.romraider.swing; -import enginuity.ECUEditor; +import com.romraider.ECUEditor; import javax.swing.JFileChooser; import javax.swing.ListSelectionModel; import java.awt.Font; diff --git a/src/enginuity/swing/ECUEditorMenuBar.java b/src/com/romraider/swing/ECUEditorMenuBar.java similarity index 95% rename from src/enginuity/swing/ECUEditorMenuBar.java rename to src/com/romraider/swing/ECUEditorMenuBar.java index 2ab8db04..30241596 100644 --- a/src/enginuity/swing/ECUEditorMenuBar.java +++ b/src/com/romraider/swing/ECUEditorMenuBar.java @@ -19,7 +19,7 @@ * */ -package enginuity.swing; +package com.romraider.swing; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -39,12 +39,12 @@ import static javax.swing.JOptionPane.showMessageDialog; import javax.swing.JRadioButtonMenuItem; import javax.swing.JSeparator; import com.centerkey.utils.BareBonesBrowserLaunch; -import enginuity.Version; -import enginuity.ECUEditor; -import enginuity.logger.ecu.EcuLogger; -import enginuity.logger.utec.gui.JutecGUI; -import enginuity.maps.Rom; -import enginuity.ramtune.test.RamTuneTestApp; +import com.romraider.Version; +import com.romraider.ECUEditor; +import com.romraider.logger.ecu.EcuLogger; +import com.romraider.logger.utec.gui.JutecGUI; +import com.romraider.maps.Rom; +import com.romraider.ramtune.test.RamTuneTestApp; public class ECUEditorMenuBar extends JMenuBar implements ActionListener { @@ -189,7 +189,7 @@ public class ECUEditorMenuBar extends JMenuBar implements ActionListener { launchRamTuneTestApp.setMnemonic('L'); ramTuneMenu.add(launchRamTuneTestApp); launchRamTuneTestApp.addActionListener(this); - + // help menu stuff add(helpMenu); helpMenu.setMnemonic('H'); @@ -302,9 +302,9 @@ public class ECUEditorMenuBar extends JMenuBar implements ActionListener { } else if (e.getSource() == about) { //TODO: make a separate About class to get a better dialog box // with graphic, hyperlink, etc. - showMessageDialog(this, + showMessageDialog(this, Version.PRODUCT_NAME + " ECU Editor\n" + "Version " + Version.VERSION + "\n" + Version.SUPPORT_URL, - "About " + Version.PRODUCT_NAME, + "About " + Version.PRODUCT_NAME, INFORMATION_MESSAGE); } } diff --git a/src/enginuity/swing/ECUEditorToolBar.java b/src/com/romraider/swing/ECUEditorToolBar.java similarity index 95% rename from src/enginuity/swing/ECUEditorToolBar.java rename to src/com/romraider/swing/ECUEditorToolBar.java index 635a4b38..b88e1862 100644 --- a/src/enginuity/swing/ECUEditorToolBar.java +++ b/src/com/romraider/swing/ECUEditorToolBar.java @@ -19,10 +19,10 @@ * */ -package enginuity.swing; +package com.romraider.swing; -import enginuity.ECUEditor; -import enginuity.maps.Rom; +import com.romraider.ECUEditor; +import com.romraider.maps.Rom; import static javax.swing.BorderFactory.createLineBorder; import javax.swing.ImageIcon; import javax.swing.JButton; diff --git a/src/enginuity/swing/ECUImageFilter.java b/src/com/romraider/swing/ECUImageFilter.java similarity index 94% rename from src/enginuity/swing/ECUImageFilter.java rename to src/com/romraider/swing/ECUImageFilter.java index b929a02d..bc576d6f 100644 --- a/src/enginuity/swing/ECUImageFilter.java +++ b/src/com/romraider/swing/ECUImageFilter.java @@ -19,7 +19,7 @@ * */ -package enginuity.swing; +package com.romraider.swing; import javax.swing.filechooser.FileFilter; import java.io.File; diff --git a/src/enginuity/swing/GenericFileFilter.java b/src/com/romraider/swing/GenericFileFilter.java similarity index 96% rename from src/enginuity/swing/GenericFileFilter.java rename to src/com/romraider/swing/GenericFileFilter.java index f60179f1..530f9a27 100644 --- a/src/enginuity/swing/GenericFileFilter.java +++ b/src/com/romraider/swing/GenericFileFilter.java @@ -19,7 +19,7 @@ * */ -package enginuity.swing; +package com.romraider.swing; import javax.swing.filechooser.FileFilter; import java.io.File; diff --git a/src/enginuity/swing/JProgressPane.java b/src/com/romraider/swing/JProgressPane.java similarity index 95% rename from src/enginuity/swing/JProgressPane.java rename to src/com/romraider/swing/JProgressPane.java index 1ca363a9..26c8a0a7 100644 --- a/src/enginuity/swing/JProgressPane.java +++ b/src/com/romraider/swing/JProgressPane.java @@ -19,7 +19,7 @@ * */ -package enginuity.swing; +package com.romraider.swing; import javax.swing.JLabel; import javax.swing.JPanel; diff --git a/src/enginuity/swing/JTableChooser.java b/src/com/romraider/swing/JTableChooser.java similarity index 94% rename from src/enginuity/swing/JTableChooser.java rename to src/com/romraider/swing/JTableChooser.java index 46fbf97f..93973db8 100644 --- a/src/enginuity/swing/JTableChooser.java +++ b/src/com/romraider/swing/JTableChooser.java @@ -19,10 +19,10 @@ * */ -package enginuity.swing; +package com.romraider.swing; -import enginuity.maps.Rom; -import enginuity.maps.Table; +import com.romraider.maps.Rom; +import com.romraider.maps.Table; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; diff --git a/src/enginuity/swing/LookAndFeelManager.java b/src/com/romraider/swing/LookAndFeelManager.java similarity index 98% rename from src/enginuity/swing/LookAndFeelManager.java rename to src/com/romraider/swing/LookAndFeelManager.java index 7b36935c..d59a9e4f 100644 --- a/src/enginuity/swing/LookAndFeelManager.java +++ b/src/com/romraider/swing/LookAndFeelManager.java @@ -19,7 +19,7 @@ * */ -package enginuity.swing; +package com.romraider.swing; import org.apache.log4j.Logger; import javax.swing.JDialog; diff --git a/src/enginuity/swing/MDIDesktopPane.java b/src/com/romraider/swing/MDIDesktopPane.java similarity index 96% rename from src/enginuity/swing/MDIDesktopPane.java rename to src/com/romraider/swing/MDIDesktopPane.java index fad5d0c6..7e333559 100644 --- a/src/enginuity/swing/MDIDesktopPane.java +++ b/src/com/romraider/swing/MDIDesktopPane.java @@ -19,7 +19,7 @@ * */ -package enginuity.swing; +package com.romraider.swing; import javax.swing.DefaultDesktopManager; import javax.swing.JComponent; diff --git a/src/enginuity/swing/RomCellRenderer.java b/src/com/romraider/swing/RomCellRenderer.java similarity index 95% rename from src/enginuity/swing/RomCellRenderer.java rename to src/com/romraider/swing/RomCellRenderer.java index 14685174..c3f8f4ba 100644 --- a/src/enginuity/swing/RomCellRenderer.java +++ b/src/com/romraider/swing/RomCellRenderer.java @@ -19,10 +19,10 @@ * */ -package enginuity.swing; +package com.romraider.swing; -import enginuity.maps.Rom; -import enginuity.maps.Table; +import com.romraider.maps.Rom; +import com.romraider.maps.Table; import static javax.swing.BorderFactory.createLineBorder; import javax.swing.ImageIcon; import javax.swing.JLabel; diff --git a/src/enginuity/swing/RomPropertyPanel.java b/src/com/romraider/swing/RomPropertyPanel.java similarity index 97% rename from src/enginuity/swing/RomPropertyPanel.java rename to src/com/romraider/swing/RomPropertyPanel.java index 95a816da..02fd4855 100644 --- a/src/enginuity/swing/RomPropertyPanel.java +++ b/src/com/romraider/swing/RomPropertyPanel.java @@ -19,9 +19,9 @@ * */ -package enginuity.swing; +package com.romraider.swing; -import enginuity.maps.Rom; +import com.romraider.maps.Rom; public class RomPropertyPanel extends javax.swing.JPanel { diff --git a/src/enginuity/swing/RomTree.java b/src/com/romraider/swing/RomTree.java similarity index 95% rename from src/enginuity/swing/RomTree.java rename to src/com/romraider/swing/RomTree.java index 75e12e68..64193856 100644 --- a/src/enginuity/swing/RomTree.java +++ b/src/com/romraider/swing/RomTree.java @@ -19,9 +19,9 @@ * */ -package enginuity.swing; +package com.romraider.swing; -import enginuity.ECUEditor; +import com.romraider.ECUEditor; import javax.swing.JTree; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreePath; diff --git a/src/enginuity/swing/RomTreeNode.java b/src/com/romraider/swing/RomTreeNode.java similarity index 94% rename from src/enginuity/swing/RomTreeNode.java rename to src/com/romraider/swing/RomTreeNode.java index 8d52b190..bf5c8909 100644 --- a/src/enginuity/swing/RomTreeNode.java +++ b/src/com/romraider/swing/RomTreeNode.java @@ -19,10 +19,10 @@ * */ -package enginuity.swing; +package com.romraider.swing; -import enginuity.maps.Rom; -import enginuity.maps.Table; +import com.romraider.maps.Rom; +import com.romraider.maps.Table; import javax.swing.tree.DefaultMutableTreeNode; import java.util.Enumeration; import java.util.Vector; diff --git a/src/enginuity/swing/RomTreeRootNode.java b/src/com/romraider/swing/RomTreeRootNode.java similarity index 94% rename from src/enginuity/swing/RomTreeRootNode.java rename to src/com/romraider/swing/RomTreeRootNode.java index 0e1c4207..b3c185cd 100644 --- a/src/enginuity/swing/RomTreeRootNode.java +++ b/src/com/romraider/swing/RomTreeRootNode.java @@ -19,7 +19,7 @@ * */ -package enginuity.swing; +package com.romraider.swing; import javax.swing.tree.DefaultMutableTreeNode; diff --git a/src/enginuity/swing/SettingsForm.java b/src/com/romraider/swing/SettingsForm.java similarity index 97% rename from src/enginuity/swing/SettingsForm.java rename to src/com/romraider/swing/SettingsForm.java index 5c800c20..55b5b2c6 100644 --- a/src/enginuity/swing/SettingsForm.java +++ b/src/com/romraider/swing/SettingsForm.java @@ -19,12 +19,12 @@ * */ -package enginuity.swing; +package com.romraider.swing; import ZoeloeSoft.projects.JFontChooser.JFontChooser; -import enginuity.ECUEditor; -import enginuity.Settings; -import enginuity.util.FileAssociator; +import com.romraider.ECUEditor; +import com.romraider.Settings; +import com.romraider.util.FileAssociator; import javax.swing.JColorChooser; import javax.swing.JFrame; import java.awt.Color; diff --git a/src/enginuity/swing/TableChooserTreeNode.java b/src/com/romraider/swing/TableChooserTreeNode.java similarity index 91% rename from src/enginuity/swing/TableChooserTreeNode.java rename to src/com/romraider/swing/TableChooserTreeNode.java index 0915ec46..60cf07a8 100644 --- a/src/enginuity/swing/TableChooserTreeNode.java +++ b/src/com/romraider/swing/TableChooserTreeNode.java @@ -19,9 +19,9 @@ * */ -package enginuity.swing; +package com.romraider.swing; -import enginuity.maps.Table; +import com.romraider.maps.Table; import javax.swing.tree.DefaultMutableTreeNode; public class TableChooserTreeNode extends DefaultMutableTreeNode { diff --git a/src/enginuity/swing/TableFrame.java b/src/com/romraider/swing/TableFrame.java similarity index 94% rename from src/enginuity/swing/TableFrame.java rename to src/com/romraider/swing/TableFrame.java index cb22cb65..748f3cef 100644 --- a/src/enginuity/swing/TableFrame.java +++ b/src/com/romraider/swing/TableFrame.java @@ -19,9 +19,9 @@ * */ -package enginuity.swing; +package com.romraider.swing; -import enginuity.maps.Table; +import com.romraider.maps.Table; import static javax.swing.BorderFactory.createBevelBorder; import javax.swing.JInternalFrame; import javax.swing.event.InternalFrameEvent; diff --git a/src/enginuity/swing/TableMenuBar.java b/src/com/romraider/swing/TableMenuBar.java similarity index 96% rename from src/enginuity/swing/TableMenuBar.java rename to src/com/romraider/swing/TableMenuBar.java index 8a4c8713..edde0253 100644 --- a/src/enginuity/swing/TableMenuBar.java +++ b/src/com/romraider/swing/TableMenuBar.java @@ -19,9 +19,9 @@ * */ -package enginuity.swing; +package com.romraider.swing; -import enginuity.maps.Table; +import com.romraider.maps.Table; import javax.swing.ButtonGroup; import javax.swing.JMenu; import javax.swing.JMenuBar; diff --git a/src/enginuity/swing/TablePropertyPanel.java b/src/com/romraider/swing/TablePropertyPanel.java similarity index 97% rename from src/enginuity/swing/TablePropertyPanel.java rename to src/com/romraider/swing/TablePropertyPanel.java index 8819323d..02a3897d 100644 --- a/src/enginuity/swing/TablePropertyPanel.java +++ b/src/com/romraider/swing/TablePropertyPanel.java @@ -19,9 +19,9 @@ * */ -package enginuity.swing; +package com.romraider.swing; -import enginuity.maps.Table; +import com.romraider.maps.Table; public class TablePropertyPanel extends javax.swing.JPanel { diff --git a/src/enginuity/swing/TableToolBar.java b/src/com/romraider/swing/TableToolBar.java similarity index 96% rename from src/enginuity/swing/TableToolBar.java rename to src/com/romraider/swing/TableToolBar.java index 20105012..ea0f984d 100644 --- a/src/enginuity/swing/TableToolBar.java +++ b/src/com/romraider/swing/TableToolBar.java @@ -19,16 +19,16 @@ * */ -package enginuity.swing; +package com.romraider.swing; import com.ecm.graphics.Graph3dFrameManager; import com.ecm.graphics.data.GraphData; import com.ecm.graphics.data.GraphDataListener; -import enginuity.maps.DataCell; -import enginuity.maps.Scale; -import enginuity.maps.Table; -import enginuity.maps.Table1D; -import enginuity.maps.Table3D; +import com.romraider.maps.DataCell; +import com.romraider.maps.Scale; +import com.romraider.maps.Table; +import com.romraider.maps.Table1D; +import com.romraider.maps.Table3D; import org.apache.log4j.Logger; import javax.swing.AbstractAction; import javax.swing.Action; diff --git a/src/enginuity/swing/TableTreeNode.java b/src/com/romraider/swing/TableTreeNode.java similarity index 91% rename from src/enginuity/swing/TableTreeNode.java rename to src/com/romraider/swing/TableTreeNode.java index eb3f57cb..cc0e8ec4 100644 --- a/src/enginuity/swing/TableTreeNode.java +++ b/src/com/romraider/swing/TableTreeNode.java @@ -19,10 +19,10 @@ * */ -package enginuity.swing; +package com.romraider.swing; -import enginuity.maps.Rom; -import enginuity.maps.Table; +import com.romraider.maps.Rom; +import com.romraider.maps.Table; import javax.swing.tree.DefaultMutableTreeNode; public class TableTreeNode extends DefaultMutableTreeNode { diff --git a/src/enginuity/swing/VTextIcon.java b/src/com/romraider/swing/VTextIcon.java similarity index 97% rename from src/enginuity/swing/VTextIcon.java rename to src/com/romraider/swing/VTextIcon.java index 592387d2..fe8e8fb8 100644 --- a/src/enginuity/swing/VTextIcon.java +++ b/src/com/romraider/swing/VTextIcon.java @@ -19,7 +19,7 @@ * */ -package enginuity.swing; +package com.romraider.swing; import javax.swing.Icon; import java.awt.Component; diff --git a/src/enginuity/swing/XMLFilter.java b/src/com/romraider/swing/XMLFilter.java similarity index 96% rename from src/enginuity/swing/XMLFilter.java rename to src/com/romraider/swing/XMLFilter.java index 2b2ebb22..755f1a23 100644 --- a/src/enginuity/swing/XMLFilter.java +++ b/src/com/romraider/swing/XMLFilter.java @@ -19,7 +19,7 @@ * */ -package enginuity.swing; +package com.romraider.swing; import javax.swing.filechooser.FileFilter; import java.io.File; diff --git a/src/enginuity/tts/Speaker.java b/src/com/romraider/tts/Speaker.java similarity index 90% rename from src/enginuity/tts/Speaker.java rename to src/com/romraider/tts/Speaker.java index d4d698fc..281c4870 100644 --- a/src/enginuity/tts/Speaker.java +++ b/src/com/romraider/tts/Speaker.java @@ -1,8 +1,8 @@ -package enginuity.tts; +package com.romraider.tts; import com.sun.speech.freetts.Voice; import com.sun.speech.freetts.VoiceManager; -import static enginuity.util.ThreadUtil.runAsDaemon; +import static com.romraider.util.ThreadUtil.runAsDaemon; public class Speaker { private static final String VOICE_NAME = "kevin16"; diff --git a/src/enginuity/util/AxisRange.java b/src/com/romraider/util/AxisRange.java similarity index 94% rename from src/enginuity/util/AxisRange.java rename to src/com/romraider/util/AxisRange.java index 8257b357..ff2d7626 100644 --- a/src/enginuity/util/AxisRange.java +++ b/src/com/romraider/util/AxisRange.java @@ -19,7 +19,7 @@ * */ -package enginuity.util; +package com.romraider.util; public final class AxisRange { private final int startIndex; diff --git a/src/enginuity/util/ByteUtil.java b/src/com/romraider/util/ByteUtil.java similarity index 95% rename from src/enginuity/util/ByteUtil.java rename to src/com/romraider/util/ByteUtil.java index a6171813..466fbcb8 100644 --- a/src/enginuity/util/ByteUtil.java +++ b/src/com/romraider/util/ByteUtil.java @@ -19,9 +19,9 @@ * */ -package enginuity.util; +package com.romraider.util; -import enginuity.newmaps.ecumetadata.Scale; +import com.romraider.newmaps.ecumetadata.Scale; import java.nio.ByteBuffer; @SuppressWarnings({"UnnecessaryBoxing"}) diff --git a/src/enginuity/util/ColorScaler.java b/src/com/romraider/util/ColorScaler.java similarity index 93% rename from src/enginuity/util/ColorScaler.java rename to src/com/romraider/util/ColorScaler.java index dfce8c3a..780633eb 100644 --- a/src/enginuity/util/ColorScaler.java +++ b/src/com/romraider/util/ColorScaler.java @@ -19,9 +19,9 @@ * */ -package enginuity.util; +package com.romraider.util; -import enginuity.Settings; +import com.romraider.Settings; import java.awt.Color; public final class ColorScaler { diff --git a/src/enginuity/util/FileAssociator.java b/src/com/romraider/util/FileAssociator.java similarity index 95% rename from src/enginuity/util/FileAssociator.java rename to src/com/romraider/util/FileAssociator.java index c9f1dbd8..ae72fffc 100644 --- a/src/enginuity/util/FileAssociator.java +++ b/src/com/romraider/util/FileAssociator.java @@ -19,7 +19,7 @@ * */ -package enginuity.util; +package com.romraider.util; import org.apache.log4j.Logger; import org.jdesktop.jdic.filetypes.Action; @@ -51,7 +51,7 @@ public final class FileAssociator { logassoc.addFileExtension(extension.toUpperCase()); logassoc.setDescription(description); logassoc.addAction(new Action("open", command + " %1")); - logassoc.setIconFileName(new File("").getAbsolutePath() + "/graphics/enginuity-ico.ico"); + logassoc.setIconFileName(new File("").getAbsolutePath() + "/graphics/romraider-ico.ico"); LOGGER.debug("Adding ...\n" + logassoc + "\n\n\n"); diff --git a/src/enginuity/util/HexUtil.java b/src/com/romraider/util/HexUtil.java similarity index 96% rename from src/enginuity/util/HexUtil.java rename to src/com/romraider/util/HexUtil.java index 0ce9aa3d..3b57fa6e 100644 --- a/src/enginuity/util/HexUtil.java +++ b/src/com/romraider/util/HexUtil.java @@ -19,7 +19,7 @@ * */ -package enginuity.util; +package com.romraider.util; public final class HexUtil { diff --git a/src/enginuity/util/JEPUtil.java b/src/com/romraider/util/JEPUtil.java similarity index 95% rename from src/enginuity/util/JEPUtil.java rename to src/com/romraider/util/JEPUtil.java index a5cb0494..359e75b5 100644 --- a/src/enginuity/util/JEPUtil.java +++ b/src/com/romraider/util/JEPUtil.java @@ -19,7 +19,7 @@ * */ -package enginuity.util; +package com.romraider.util; import org.nfunk.jep.JEP; import java.util.Map; diff --git a/src/enginuity/util/LogManager.java b/src/com/romraider/util/LogManager.java similarity index 86% rename from src/enginuity/util/LogManager.java rename to src/com/romraider/util/LogManager.java index cac6a4d9..e49974e2 100644 --- a/src/enginuity/util/LogManager.java +++ b/src/com/romraider/util/LogManager.java @@ -1,4 +1,4 @@ -package enginuity.util; +package com.romraider.util; import org.apache.log4j.PropertyConfigurator; diff --git a/src/enginuity/util/MD5Checksum.java b/src/com/romraider/util/MD5Checksum.java similarity index 95% rename from src/enginuity/util/MD5Checksum.java rename to src/com/romraider/util/MD5Checksum.java index 9a11d650..8cd99558 100644 --- a/src/enginuity/util/MD5Checksum.java +++ b/src/com/romraider/util/MD5Checksum.java @@ -19,7 +19,7 @@ * */ -package enginuity.util; +package com.romraider.util; import java.io.FileInputStream; import java.io.InputStream; diff --git a/src/enginuity/util/Nameable.java b/src/com/romraider/util/Nameable.java similarity index 94% rename from src/enginuity/util/Nameable.java rename to src/com/romraider/util/Nameable.java index 0d0eb593..b8d2c7a3 100644 --- a/src/enginuity/util/Nameable.java +++ b/src/com/romraider/util/Nameable.java @@ -19,7 +19,7 @@ * */ -package enginuity.util; +package com.romraider.util; public interface Nameable { diff --git a/src/enginuity/util/NamedSet.java b/src/com/romraider/util/NamedSet.java similarity index 94% rename from src/enginuity/util/NamedSet.java rename to src/com/romraider/util/NamedSet.java index abad3ba8..7c0c076c 100644 --- a/src/enginuity/util/NamedSet.java +++ b/src/com/romraider/util/NamedSet.java @@ -19,9 +19,9 @@ * */ -package enginuity.util; +package com.romraider.util; -import enginuity.util.exception.NameableNotFoundException; +import com.romraider.util.exception.NameableNotFoundException; import java.io.Serializable; import java.util.Collection; import java.util.Iterator; diff --git a/src/enginuity/util/ObjectCloner.java b/src/com/romraider/util/ObjectCloner.java similarity index 96% rename from src/enginuity/util/ObjectCloner.java rename to src/com/romraider/util/ObjectCloner.java index 6fc9c311..eead4c63 100644 --- a/src/enginuity/util/ObjectCloner.java +++ b/src/com/romraider/util/ObjectCloner.java @@ -19,7 +19,7 @@ * */ -package enginuity.util; +package com.romraider.util; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/src/enginuity/util/ParamChecker.java b/src/com/romraider/util/ParamChecker.java similarity index 96% rename from src/enginuity/util/ParamChecker.java rename to src/com/romraider/util/ParamChecker.java index ebdc8a19..fd28b44b 100644 --- a/src/enginuity/util/ParamChecker.java +++ b/src/com/romraider/util/ParamChecker.java @@ -19,7 +19,7 @@ * */ -package enginuity.util; +package com.romraider.util; import java.util.Collection; import java.util.Map; diff --git a/src/enginuity/util/SaxParserFactory.java b/src/com/romraider/util/SaxParserFactory.java similarity index 96% rename from src/enginuity/util/SaxParserFactory.java rename to src/com/romraider/util/SaxParserFactory.java index 15929f71..eef64252 100644 --- a/src/enginuity/util/SaxParserFactory.java +++ b/src/com/romraider/util/SaxParserFactory.java @@ -19,7 +19,7 @@ * */ -package enginuity.util; +package com.romraider.util; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; diff --git a/src/enginuity/util/SettingsManager.java b/src/com/romraider/util/SettingsManager.java similarity index 61% rename from src/enginuity/util/SettingsManager.java rename to src/com/romraider/util/SettingsManager.java index c9d661fe..b921cad6 100644 --- a/src/enginuity/util/SettingsManager.java +++ b/src/com/romraider/util/SettingsManager.java @@ -1,7 +1,7 @@ -package enginuity.util; +package com.romraider.util; -import enginuity.Settings; -import enginuity.swing.JProgressPane; +import com.romraider.Settings; +import com.romraider.swing.JProgressPane; public interface SettingsManager { Settings load(String settingsNotFoundMessage); diff --git a/src/enginuity/util/SettingsManagerImpl.java b/src/com/romraider/util/SettingsManagerImpl.java similarity index 83% rename from src/enginuity/util/SettingsManagerImpl.java rename to src/com/romraider/util/SettingsManagerImpl.java index 348d8d2d..962e9e72 100644 --- a/src/enginuity/util/SettingsManagerImpl.java +++ b/src/com/romraider/util/SettingsManagerImpl.java @@ -1,11 +1,11 @@ -package enginuity.util; +package com.romraider.util; import com.sun.org.apache.xerces.internal.parsers.DOMParser; -import static enginuity.Version.VERSION; // this is a generated class - see build.xml -import enginuity.Settings; -import enginuity.swing.JProgressPane; -import enginuity.xml.DOMSettingsBuilder; -import enginuity.xml.DOMSettingsUnmarshaller; +import static com.romraider.Version.VERSION; // this is a generated class - see build.xml +import com.romraider.Settings; +import com.romraider.swing.JProgressPane; +import com.romraider.xml.DOMSettingsBuilder; +import com.romraider.xml.DOMSettingsUnmarshaller; import org.w3c.dom.Document; import org.xml.sax.InputSource; import static javax.swing.JOptionPane.INFORMATION_MESSAGE; diff --git a/src/enginuity/util/TableAxisUtil.java b/src/com/romraider/util/TableAxisUtil.java similarity index 92% rename from src/enginuity/util/TableAxisUtil.java rename to src/com/romraider/util/TableAxisUtil.java index a2e47cf6..54e1a90e 100644 --- a/src/enginuity/util/TableAxisUtil.java +++ b/src/com/romraider/util/TableAxisUtil.java @@ -19,10 +19,10 @@ * */ -package enginuity.util; +package com.romraider.util; -import enginuity.maps.DataCell; -import enginuity.maps.Table1D; +import com.romraider.maps.DataCell; +import com.romraider.maps.Table1D; public final class TableAxisUtil { diff --git a/src/enginuity/util/ThreadCheckingRepaintManager.java b/src/com/romraider/util/ThreadCheckingRepaintManager.java similarity index 95% rename from src/enginuity/util/ThreadCheckingRepaintManager.java rename to src/com/romraider/util/ThreadCheckingRepaintManager.java index 889e8248..02d04e85 100644 --- a/src/enginuity/util/ThreadCheckingRepaintManager.java +++ b/src/com/romraider/util/ThreadCheckingRepaintManager.java @@ -1,4 +1,4 @@ -package enginuity.util; +package com.romraider.util; import javax.swing.JComponent; import javax.swing.RepaintManager; diff --git a/src/enginuity/util/ThreadUtil.java b/src/com/romraider/util/ThreadUtil.java similarity index 95% rename from src/enginuity/util/ThreadUtil.java rename to src/com/romraider/util/ThreadUtil.java index ed37c5dc..3713519d 100644 --- a/src/enginuity/util/ThreadUtil.java +++ b/src/com/romraider/util/ThreadUtil.java @@ -19,7 +19,7 @@ * */ -package enginuity.util; +package com.romraider.util; import org.apache.log4j.Logger; import java.util.concurrent.TimeUnit; diff --git a/src/enginuity/util/exception/NameableNotFoundException.java b/src/com/romraider/util/exception/NameableNotFoundException.java similarity index 93% rename from src/enginuity/util/exception/NameableNotFoundException.java rename to src/com/romraider/util/exception/NameableNotFoundException.java index 6eaeab57..c9e3b2e6 100644 --- a/src/enginuity/util/exception/NameableNotFoundException.java +++ b/src/com/romraider/util/exception/NameableNotFoundException.java @@ -19,7 +19,7 @@ * */ -package enginuity.util.exception; +package com.romraider.util.exception; public class NameableNotFoundException extends Exception { diff --git a/src/enginuity/xml/DOMHelper.java b/src/com/romraider/xml/DOMHelper.java similarity index 95% rename from src/enginuity/xml/DOMHelper.java rename to src/com/romraider/xml/DOMHelper.java index f03109a4..6a5ec711 100644 --- a/src/enginuity/xml/DOMHelper.java +++ b/src/com/romraider/xml/DOMHelper.java @@ -1,4 +1,4 @@ -package enginuity.xml; +package com.romraider.xml; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/src/enginuity/xml/DOMRomUnmarshaller.java b/src/com/romraider/xml/DOMRomUnmarshaller.java similarity index 94% rename from src/enginuity/xml/DOMRomUnmarshaller.java rename to src/com/romraider/xml/DOMRomUnmarshaller.java index 476fe9b9..b7818050 100644 --- a/src/enginuity/xml/DOMRomUnmarshaller.java +++ b/src/com/romraider/xml/DOMRomUnmarshaller.java @@ -1,24 +1,24 @@ //DOM XML parser for ROMs -package enginuity.xml; +package com.romraider.xml; -import enginuity.ECUEditor; -import enginuity.Settings; -import enginuity.maps.DataCell; -import enginuity.maps.Rom; -import enginuity.maps.RomID; -import enginuity.maps.Scale; -import enginuity.maps.Table; -import enginuity.maps.Table1D; -import enginuity.maps.Table2D; -import enginuity.maps.Table3D; -import enginuity.maps.TableSwitch; -import enginuity.swing.DebugPanel; -import enginuity.swing.JProgressPane; -import enginuity.util.LogManager; -import enginuity.util.ObjectCloner; -import static enginuity.xml.DOMHelper.unmarshallAttribute; -import static enginuity.xml.DOMHelper.unmarshallText; +import com.romraider.ECUEditor; +import com.romraider.Settings; +import com.romraider.maps.DataCell; +import com.romraider.maps.Rom; +import com.romraider.maps.RomID; +import com.romraider.maps.Scale; +import com.romraider.maps.Table; +import com.romraider.maps.Table1D; +import com.romraider.maps.Table2D; +import com.romraider.maps.Table3D; +import com.romraider.maps.TableSwitch; +import com.romraider.swing.DebugPanel; +import com.romraider.swing.JProgressPane; +import com.romraider.util.LogManager; +import com.romraider.util.ObjectCloner; +import static com.romraider.xml.DOMHelper.unmarshallAttribute; +import static com.romraider.xml.DOMHelper.unmarshallText; import org.apache.log4j.Logger; import org.w3c.dom.Node; import static org.w3c.dom.Node.ELEMENT_NODE; diff --git a/src/enginuity/xml/DOMSettingsBuilder.java b/src/com/romraider/xml/DOMSettingsBuilder.java similarity index 97% rename from src/enginuity/xml/DOMSettingsBuilder.java rename to src/com/romraider/xml/DOMSettingsBuilder.java index 8ccd35c7..d288eb4e 100644 --- a/src/enginuity/xml/DOMSettingsBuilder.java +++ b/src/com/romraider/xml/DOMSettingsBuilder.java @@ -1,9 +1,9 @@ -package enginuity.xml; +package com.romraider.xml; import com.sun.org.apache.xml.internal.serialize.OutputFormat; import com.sun.org.apache.xml.internal.serialize.XMLSerializer; -import enginuity.Settings; -import enginuity.swing.JProgressPane; +import com.romraider.Settings; +import com.romraider.swing.JProgressPane; import javax.imageio.metadata.IIOMetadataNode; import java.io.File; import java.io.FileOutputStream; diff --git a/src/enginuity/xml/DOMSettingsUnmarshaller.java b/src/com/romraider/xml/DOMSettingsUnmarshaller.java similarity index 96% rename from src/enginuity/xml/DOMSettingsUnmarshaller.java rename to src/com/romraider/xml/DOMSettingsUnmarshaller.java index 402d4983..a0785d3d 100644 --- a/src/enginuity/xml/DOMSettingsUnmarshaller.java +++ b/src/com/romraider/xml/DOMSettingsUnmarshaller.java @@ -1,7 +1,7 @@ -package enginuity.xml; +package com.romraider.xml; -import enginuity.Settings; -import static enginuity.xml.DOMHelper.unmarshallAttribute; +import com.romraider.Settings; +import static com.romraider.xml.DOMHelper.unmarshallAttribute; import org.w3c.dom.Node; import static org.w3c.dom.Node.ELEMENT_NODE; import org.w3c.dom.NodeList; diff --git a/src/enginuity/xml/RomAttributeParser.java b/src/com/romraider/xml/RomAttributeParser.java similarity index 87% rename from src/enginuity/xml/RomAttributeParser.java rename to src/com/romraider/xml/RomAttributeParser.java index 50dd562f..abca1bf9 100644 --- a/src/enginuity/xml/RomAttributeParser.java +++ b/src/com/romraider/xml/RomAttributeParser.java @@ -1,17 +1,17 @@ // Parses attributes from ROM XML -package enginuity.xml; +package com.romraider.xml; -import static enginuity.maps.Scale.INVERSE; -import static enginuity.maps.Scale.LINEAR; -import static enginuity.maps.Table.ENDIAN_BIG; -import static enginuity.maps.Table.ENDIAN_LITTLE; -import static enginuity.maps.Table.STORAGE_TYPE_FLOAT; -import static enginuity.maps.Table.TABLE_1D; -import static enginuity.maps.Table.TABLE_2D; -import static enginuity.maps.Table.TABLE_3D; -import static enginuity.maps.Table.TABLE_X_AXIS; -import static enginuity.maps.Table.TABLE_Y_AXIS; +import static com.romraider.maps.Scale.INVERSE; +import static com.romraider.maps.Scale.LINEAR; +import static com.romraider.maps.Table.ENDIAN_BIG; +import static com.romraider.maps.Table.ENDIAN_LITTLE; +import static com.romraider.maps.Table.STORAGE_TYPE_FLOAT; +import static com.romraider.maps.Table.TABLE_1D; +import static com.romraider.maps.Table.TABLE_2D; +import static com.romraider.maps.Table.TABLE_3D; +import static com.romraider.maps.Table.TABLE_X_AXIS; +import static com.romraider.maps.Table.TABLE_Y_AXIS; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/src/enginuity/xml/RomNotFoundException.java b/src/com/romraider/xml/RomNotFoundException.java similarity index 75% rename from src/enginuity/xml/RomNotFoundException.java rename to src/com/romraider/xml/RomNotFoundException.java index 245eda1b..e5d9b404 100644 --- a/src/enginuity/xml/RomNotFoundException.java +++ b/src/com/romraider/xml/RomNotFoundException.java @@ -1,4 +1,4 @@ -package enginuity.xml; +package com.romraider.xml; public final class RomNotFoundException extends Exception { diff --git a/src/enginuity/xml/TableIsOmittedException.java b/src/com/romraider/xml/TableIsOmittedException.java similarity index 82% rename from src/enginuity/xml/TableIsOmittedException.java rename to src/com/romraider/xml/TableIsOmittedException.java index 17611d6d..e22bfa1d 100644 --- a/src/enginuity/xml/TableIsOmittedException.java +++ b/src/com/romraider/xml/TableIsOmittedException.java @@ -1,4 +1,4 @@ -package enginuity.xml; +package com.romraider.xml; public final class TableIsOmittedException extends Exception { diff --git a/src/enginuity/xml/TableNotFoundException.java b/src/com/romraider/xml/TableNotFoundException.java similarity index 80% rename from src/enginuity/xml/TableNotFoundException.java rename to src/com/romraider/xml/TableNotFoundException.java index 959fff9f..bbacc99a 100644 --- a/src/enginuity/xml/TableNotFoundException.java +++ b/src/com/romraider/xml/TableNotFoundException.java @@ -1,4 +1,4 @@ -package enginuity.xml; +package com.romraider.xml; public final class TableNotFoundException extends Exception { public String getMessage() { diff --git a/src/enginuity/NewGUI/tools/EnginuityDataTools.java b/src/enginuity/NewGUI/tools/EnginuityDataTools.java deleted file mode 100644 index d8d71184..00000000 --- a/src/enginuity/NewGUI/tools/EnginuityDataTools.java +++ /dev/null @@ -1,5 +0,0 @@ -package enginuity.NewGUI.tools; - -public class EnginuityDataTools { - -} diff --git a/src/enginuity/logger/ecu/comms/query/Query.java b/src/enginuity/logger/ecu/comms/query/Query.java deleted file mode 100644 index 16df1c2f..00000000 --- a/src/enginuity/logger/ecu/comms/query/Query.java +++ /dev/null @@ -1,11 +0,0 @@ -package enginuity.logger.ecu.comms.query; - -import enginuity.logger.ecu.definition.LoggerData; - -public interface Query { - - LoggerData getLoggerData(); - - double getResponse(); - -} diff --git a/src/enginuity/logger/ecu/ui/handler/file/FileUpdateHandler.java b/src/enginuity/logger/ecu/ui/handler/file/FileUpdateHandler.java deleted file mode 100644 index 1989ed1e..00000000 --- a/src/enginuity/logger/ecu/ui/handler/file/FileUpdateHandler.java +++ /dev/null @@ -1,13 +0,0 @@ -package enginuity.logger.ecu.ui.handler.file; - -import enginuity.logger.ecu.ui.StatusChangeListener; -import enginuity.logger.ecu.ui.handler.DataUpdateHandler; - -public interface FileUpdateHandler extends DataUpdateHandler { - - void addListener(StatusChangeListener listener); - - void start(); - - void stop(); -} diff --git a/src/enginuity/swing/DefinitionManager.form b/src/enginuity/swing/DefinitionManager.form deleted file mode 100644 index f3642cde..00000000 --- a/src/enginuity/swing/DefinitionManager.form +++ /dev/null @@ -1,147 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/enginuity/swing/RomPropertyPanel.form b/src/enginuity/swing/RomPropertyPanel.form deleted file mode 100644 index 51de5619..00000000 --- a/src/enginuity/swing/RomPropertyPanel.form +++ /dev/null @@ -1,308 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/enginuity/swing/SettingsForm.form b/src/enginuity/swing/SettingsForm.form deleted file mode 100644 index e05c2383..00000000 --- a/src/enginuity/swing/SettingsForm.form +++ /dev/null @@ -1,623 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/enginuity/swing/TablePropertyPanel.form b/src/enginuity/swing/TablePropertyPanel.form deleted file mode 100644 index 0c9b1154..00000000 --- a/src/enginuity/swing/TablePropertyPanel.form +++ /dev/null @@ -1,401 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/templates/install-linux.xml.template b/templates/install-linux.xml.template index 465c9b74..1d0ad3d4 100644 --- a/templates/install-linux.xml.template +++ b/templates/install-linux.xml.template @@ -38,7 +38,7 @@ - Enginuity binary files + RomRaider binary files diff --git a/templates/install-windows.xml.template b/templates/install-windows.xml.template index 3c7ba0b2..6145c16f 100644 --- a/templates/install-windows.xml.template +++ b/templates/install-windows.xml.template @@ -37,7 +37,7 @@ - Enginuity binary files + RomRaider binary files