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

Added private methods to eliminate code duplication

This commit is contained in:
Dale Schultz 2015-01-04 22:56:36 -05:00
parent acf161a64e
commit 611c598a54
2 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/romraider/logger/ecu/EcuLogger.java
View File

@ -1287,11 +1287,7 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
comboBoxPanel.add(portsComboBox);
final CustomButtonGroup moduleGroup = new CustomButtonGroup();
final Map<Transport, Collection<Module>> transportMap =
protocolList.get(getSettings().getLoggerProtocol());
final Transport loggerTransport = getTransportByName(getSettings().getTransportProtocol());
final Collection<Module> modules = transportMap.get(loggerTransport);
for (Module module : modules) {
for (Module module : getModuleList()) {
final JCheckBox cb = new JCheckBox(module.getName().toUpperCase());
final String tipText = String.format(
"%s Polling. Uncheck all boxes for Externals logging only.",
@ -1357,11 +1353,7 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
}
private void setTarget(String name) {
final Map<Transport, Collection<Module>> transportMap =
protocolList.get(getSettings().getLoggerProtocol());
final Transport loggerTransport = getTransportByName(getSettings().getTransportProtocol());
final Collection<Module> modules = transportMap.get(loggerTransport);
for (Module module: modules) {
for (Module module: getModuleList()) {
if (module.getName().equalsIgnoreCase(name)) {
getSettings().setDestinationTarget(module);
}
@ -1370,16 +1362,22 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
}
private Transport getTransportByName(String name) {
final Map<Transport, Collection<Module>> transportMap =
protocolList.get(getSettings().getLoggerProtocol());
Transport loggerTransport = null;
for (Transport transport : transportMap.keySet()) {
for (Transport transport : getTransportMap().keySet()) {
if (transport.getName().equalsIgnoreCase(name))
loggerTransport = transport;
}
return loggerTransport;
}
private Map<Transport, Collection<Module>> getTransportMap() {
return protocolList.get(getSettings().getLoggerProtocol());
}
private Collection<Module> getModuleList() {
return getTransportMap().get(getTransportByName(getSettings().getTransportProtocol()));
}
public String getTarget() {
return target;
}

24
src/main/java/com/romraider/ramtune/test/RamTuneTestApp.java
View File

@ -418,11 +418,7 @@ public final class RamTuneTestApp extends AbstractFrame {
panel.add(buildSendTimeout());
final ButtonGroup moduleGroup = new ButtonGroup();
final Map<Transport, Collection<Module>> transportMap =
protocolList.get(settings.getLoggerProtocol());
final Transport loggerTransport = getTransportByName(settings.getTransportProtocol());
final Collection<Module> modules = transportMap.get(loggerTransport);
for (Module module : modules) {
for (Module module : getModuleList()) {
final JCheckBox cb = new JCheckBox(module.getName().toUpperCase());
final String tipText = String.format(
"%s Polling.", module.getDescription());
@ -448,11 +444,7 @@ public final class RamTuneTestApp extends AbstractFrame {
}
private void setTarget(String name) {
final Map<Transport, Collection<Module>> transportMap =
protocolList.get(settings.getLoggerProtocol());
final Transport loggerTransport = getTransportByName(settings.getTransportProtocol());
final Collection<Module> modules = transportMap.get(loggerTransport);
for (Module module: modules) {
for (Module module: getModuleList()) {
if (module.getName().equalsIgnoreCase(name)) {
RamTuneTestApp.module = module;
}
@ -460,16 +452,22 @@ public final class RamTuneTestApp extends AbstractFrame {
}
private Transport getTransportByName(String name) {
final Map<Transport, Collection<Module>> transportMap =
protocolList.get(settings.getLoggerProtocol());
Transport loggerTransport = null;
for (Transport transport : transportMap.keySet()) {
for (Transport transport : getTransportMap().keySet()) {
if (transport.getName().equalsIgnoreCase(name))
loggerTransport = transport;
}
return loggerTransport;
}
private Map<Transport, Collection<Module>> getTransportMap() {
return protocolList.get(settings.getLoggerProtocol());
}
private Collection<Module> getModuleList() {
return getTransportMap().get(getTransportByName(settings.getTransportProtocol()));
}
private Component buildSendTimeout() {
sendTimeoutField.setText("55");
JPanel panel = new JPanel(new FlowLayout());