rusefi
/
RomRaider
mirror of https://github.com/rusefi/RomRaider.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Internationalize ReadCodesManagerImpl Class

This commit is contained in:
Dale Schultz 2019-12-21 20:18:25 -05:00
parent f1e3d39897
commit f3aac201e2
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
i18n/com/romraider/logger/ecu/comms/readcodes/ReadCodesManagerImpl.properties Normal file
View File

@ -0,0 +1,3 @@
READCODES = Reading {0} DTC codes ...
COMPLETE = Reading {0} DTC codes ... complete
FAILED = Unable to read {0} DTC codes - check correct serial port has been selected, cable is connected and ignition is on.

23
src/main/java/com/romraider/logger/ecu/comms/readcodes/ReadCodesManagerImpl.java
View File

@ -1,6 +1,6 @@
/* /*
* RomRaider Open-Source Tuning, Logging and Reflashing * RomRaider Open-Source Tuning, Logging and Reflashing
* Copyright (C) 2006-2014 RomRaider.com * Copyright (C) 2006-2019 RomRaider.com
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -22,9 +22,11 @@ package com.romraider.logger.ecu.comms.readcodes;
import static com.romraider.logger.ecu.comms.io.connection.LoggerConnectionFactory.getConnection; import static com.romraider.logger.ecu.comms.io.connection.LoggerConnectionFactory.getConnection;
import static com.romraider.util.ParamChecker.checkNotNull; import static com.romraider.util.ParamChecker.checkNotNull;
import java.text.MessageFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.ResourceBundle;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
@ -37,11 +39,14 @@ import com.romraider.logger.ecu.comms.query.EcuQueryImpl;
import com.romraider.logger.ecu.definition.EcuSwitch; import com.romraider.logger.ecu.definition.EcuSwitch;
import com.romraider.logger.ecu.ui.MessageListener; import com.romraider.logger.ecu.ui.MessageListener;
import com.romraider.logger.ecu.ui.swing.tools.ReadCodesResultsPanel; import com.romraider.logger.ecu.ui.swing.tools.ReadCodesResultsPanel;
import com.romraider.util.ResourceUtil;
import com.romraider.util.SettingsManager; import com.romraider.util.SettingsManager;
public final class ReadCodesManagerImpl implements ReadCodesManager { public final class ReadCodesManagerImpl implements ReadCodesManager {
private static final Logger LOGGER = private static final Logger LOGGER =
Logger.getLogger(ReadCodesManagerImpl.class); Logger.getLogger(ReadCodesManagerImpl.class);
private static final ResourceBundle rb = new ResourceUtil().getBundle(
ReadCodesManagerImpl.class.getName());
private final MessageListener messageListener; private final MessageListener messageListener;
private final EcuLogger logger; private final EcuLogger logger;
private final List<EcuSwitch> dtcodes; private final List<EcuSwitch> dtcodes;
@ -77,15 +82,15 @@ public final class ReadCodesManagerImpl implements ReadCodesManager {
} }
final Settings settings = SettingsManager.getSettings(); final Settings settings = SettingsManager.getSettings();
final String target = settings.getDestinationTarget().getName(); final String target = settings.getDestinationTarget().getName().toUpperCase();
try { try {
final LoggerConnection connection = getConnection( final LoggerConnection connection = getConnection(
settings.getLoggerProtocol(), settings.getLoggerProtocol(),
settings.getLoggerPort(), settings.getLoggerPort(),
settings.getLoggerConnectionProperties()); settings.getLoggerConnectionProperties());
try { try {
messageListener.reportMessage( messageListener.reportMessage(MessageFormat.format(
"Reading " + target + " DTC codes..."); rb.getString("READCODES"), target));
final Collection<EcuQuery> querySet = new ArrayList<EcuQuery>(); final Collection<EcuQuery> querySet = new ArrayList<EcuQuery>();
for (int i = 0; i < queries.size(); i += 150) { for (int i = 0; i < queries.size(); i += 150) {
for (int j = i; (j < i + 150) && (j < queries.size()); j++) { for (int j = i; (j < i + 150) && (j < queries.size()); j++) {
@ -97,8 +102,8 @@ public final class ReadCodesManagerImpl implements ReadCodesManager {
new PollingStateImpl()); new PollingStateImpl());
querySet.clear(); querySet.clear();
} }
messageListener.reportMessage( messageListener.reportMessage(MessageFormat.format(
"Reading " + target + " DTC codes...complete."); rb.getString("COMPLETE"), target));
double result = 0; double result = 0;
final ArrayList<EcuQuery> dtcSet = new ArrayList<EcuQuery>(); final ArrayList<EcuQuery> dtcSet = new ArrayList<EcuQuery>();
@ -130,10 +135,8 @@ public final class ReadCodesManagerImpl implements ReadCodesManager {
} }
} }
catch (Exception e) { catch (Exception e) {
messageListener.reportMessage( messageListener.reportMessage(MessageFormat.format(
"Unable to read " + target + " DTC " + rb.getString("FAILED"), target));
" codes - check correct serial port has been selected," +
" cable is connected and ignition is on.");
LOGGER.error("Error reading " + target + " DTC codes", e); LOGGER.error("Error reading " + target + " DTC codes", e);
return 0; return 0;