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

resolve conflict

This commit is contained in:
Dale Schultz 2015-01-14 22:53:10 -05:00
parent 685a6a7161
commit 1fe7640245
1 changed files with 48 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,7 @@
package com.romraider.logger.ecu; package com.romraider.logger.ecu;
import com.romraider.net.BrowserControl;
import static com.romraider.Version.LOGGER_DEFS_URL; import static com.romraider.Version.LOGGER_DEFS_URL;
import static com.romraider.Version.PRODUCT_NAME; import static com.romraider.Version.PRODUCT_NAME;
import static com.romraider.Version.VERSION; import static com.romraider.Version.VERSION;
@ -181,7 +182,6 @@ import com.romraider.logger.external.core.ExternalDataItem;
import com.romraider.logger.external.core.ExternalDataSource; import com.romraider.logger.external.core.ExternalDataSource;
import com.romraider.logger.external.core.ExternalDataSourceLoader; import com.romraider.logger.external.core.ExternalDataSourceLoader;
import com.romraider.logger.external.core.ExternalDataSourceLoaderImpl; import com.romraider.logger.external.core.ExternalDataSourceLoaderImpl;
import com.romraider.net.BrowserControl;
import com.romraider.swing.AbstractFrame; import com.romraider.swing.AbstractFrame;
import com.romraider.swing.SetFont; import com.romraider.swing.SetFont;
import com.romraider.util.FormatFilename; import com.romraider.util.FormatFilename;
@ -282,6 +282,7 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
private List<EcuSwitch> dtcodes = new ArrayList<EcuSwitch>(); private List<EcuSwitch> dtcodes = new ArrayList<EcuSwitch>();
private Map<String, Map<Transport, Collection<Module>>> protocolList = private Map<String, Map<Transport, Collection<Module>>> protocolList =
new HashMap<String, Map<Transport, Collection<Module>>>(); new HashMap<String, Map<Transport, Collection<Module>>>();
private final List<JComponent> labelsForUpdate = new ArrayList<JComponent>();
public EcuLogger() { public EcuLogger() {
super(ECU_LOGGER_TITLE); super(ECU_LOGGER_TITLE);
@ -300,11 +301,11 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
// these libraries, this is a hard error here // these libraries, this is a hard error here
if (!JREChecker.is32bit()) { if (!JREChecker.is32bit()) {
showMessageDialog(null, showMessageDialog(null,
"Incompatible JRE detected.\n" + "Incompatible JRE detected.\n" +
PRODUCT_NAME + PRODUCT_NAME +
" ECU Logger requires a 32-bit JRE.\nLogger will now exit.", " RomRaider Logger requires a 32-bit JRE.\nLogger will now exit.",
"JRE Incompatibility Error", "JRE Incompatibility Error",
ERROR_MESSAGE); ERROR_MESSAGE);
// this will generate a NullPointerException because we never got // this will generate a NullPointerException because we never got
// things started // things started
WindowEvent e = new WindowEvent(this, WindowEvent.WINDOW_CLOSED); WindowEvent e = new WindowEvent(this, WindowEvent.WINDOW_CLOSED);
@ -319,7 +320,7 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
JProgressBar progressBar = startbar(); JProgressBar progressBar = startbar();
bootstrap(); bootstrap();
progressBar.setValue(20); progressBar.setValue(20);
startText.setText(" Loading ECU Defs..."); startText.setText(" Loading Logger Defs...");
loadEcuDefs(); loadEcuDefs();
progressBar.setValue(40); progressBar.setValue(40);
startText.setText(" Loading Plugins..."); startText.setText(" Loading Plugins...");
@ -327,7 +328,7 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
loadLoggerPlugins(); loadLoggerPlugins();
progressBar.setIndeterminate(false); progressBar.setIndeterminate(false);
progressBar.setValue(60); progressBar.setValue(60);
startText.setText(" Loading ECU Parameters..."); startText.setText(" Loading Logging Parameters...");
loadLoggerParams(); loadLoggerParams();
progressBar.setValue(80); progressBar.setValue(80);
startText.setText(" Starting Logger..."); startText.setText(" Starting Logger...");
@ -341,11 +342,11 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
} }
else { else {
bootstrap(); bootstrap();
ecuEditor.getStatusPanel().update("Loading ECU Defs...", 20); ecuEditor.getStatusPanel().update("Loading Logger Defs...", 20);
loadEcuDefs(); loadEcuDefs();
ecuEditor.getStatusPanel().update("Loading Plugins...", 40); ecuEditor.getStatusPanel().update("Loading Plugins...", 40);
loadLoggerPlugins(); loadLoggerPlugins();
ecuEditor.getStatusPanel().update("Loading ECU Parameters...", 60); ecuEditor.getStatusPanel().update("Loading Logging Parameters...", 60);
loadLoggerParams(); loadLoggerParams();
ecuEditor.getStatusPanel().update("Starting Logger...", 80); ecuEditor.getStatusPanel().update("Starting Logger...", 80);
initControllerListeners(); initControllerListeners();
@ -613,7 +614,7 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
final File profileFile = new File(path); final File profileFile = new File(path);
if (profileFile.exists()) { if (profileFile.exists()) {
reportMessageInTitleBar( reportMessageInTitleBar(
"Profile: " + FormatFilename.getShortName(profileFile)); "Profile: " + FormatFilename.getShortName(profileFile));
} }
return true; return true;
} }
@ -654,10 +655,10 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
Object[] options = {"Load", "Cancel"}; Object[] options = {"Load", "Cancel"};
final String message = String.format( final String message = String.format(
"This profile was created for logging protocol %s.%n" + "This profile was created for logging protocol %s.%n" +
"Some parameters may not be selected by this profile if%n" + "Some parameters may not be selected by this profile if%n" +
"you load it. Change protocols in the Settings menu%n" + "you load it. Change protocols in the Settings menu%n" +
"then reload this profile.", "then reload this profile.",
profileProto); profileProto);
int answer = showOptionDialog(this, int answer = showOptionDialog(this,
message, message,
"Protocol Mismatch", DEFAULT_OPTION, WARNING_MESSAGE, null, options, options[1]); "Protocol Mismatch", DEFAULT_OPTION, WARNING_MESSAGE, null, options, options[1]);
@ -1113,6 +1114,7 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
ecuIdPanel.setBorder(createLoweredBevelBorder()); ecuIdPanel.setBorder(createLoweredBevelBorder());
ecuIdPanel.add(calIdLabel); ecuIdPanel.add(calIdLabel);
ecuIdPanel.add(ecuIdLabel); ecuIdPanel.add(ecuIdLabel);
labelsForUpdate.add(ecuIdLabel);
constraints.gridx = 2; constraints.gridx = 2;
constraints.gridy = 0; constraints.gridy = 0;
constraints.gridwidth = 1; constraints.gridwidth = 1;
@ -1198,6 +1200,7 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
JPopupMenu fileNamePopup = new JPopupMenu(); JPopupMenu fileNamePopup = new JPopupMenu();
JMenuItem ecuIdItem = new JMenuItem("Use Current " + target + " ID"); JMenuItem ecuIdItem = new JMenuItem("Use Current " + target + " ID");
labelsForUpdate.add(ecuIdItem);
ecuIdItem.addActionListener(new ActionListener() { ecuIdItem.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
@ -1245,24 +1248,24 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
logToFileButton.setBackground(GREEN); logToFileButton.setBackground(GREEN);
logToFileButton.setOpaque(true); logToFileButton.setOpaque(true);
logToFileButton.addActionListener( logToFileButton.addActionListener(
new ActionListener() { new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent actionEvent) { public void actionPerformed(ActionEvent actionEvent) {
if (logToFileButton.isSelected() && controller.isStarted()) { if (logToFileButton.isSelected() && controller.isStarted()) {
fileUpdateHandler.start(); fileUpdateHandler.start();
logToFileButton.setBackground(RED); logToFileButton.setBackground(RED);
logToFileButton.setText(LOG_TO_FILE_STOP); logToFileButton.setText(LOG_TO_FILE_STOP);
} }
else { else {
fileUpdateHandler.stop(); fileUpdateHandler.stop();
if (!controller.isStarted()) statusIndicator.stopped(); if (!controller.isStarted()) statusIndicator.stopped();
logToFileButton.setBackground(GREEN); logToFileButton.setBackground(GREEN);
logToFileButton.setSelected(false); logToFileButton.setSelected(false);
logToFileButton.setText(LOG_TO_FILE_START); logToFileButton.setText(LOG_TO_FILE_START);
}
} }
} }
); }
);
logToFileButton.getInputMap( logToFileButton.getInputMap(
WHEN_IN_FOCUSED_WINDOW).put( WHEN_IN_FOCUSED_WINDOW).put(
getKeyStroke(LOG_TO_FILE_FK), "toggleFileLogging"); getKeyStroke(LOG_TO_FILE_FK), "toggleFileLogging");
@ -1318,6 +1321,7 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
} }
JButton reconnectButton = new JButton(new ImageIcon( getClass().getResource("/graphics/logger_restart.png"))); JButton reconnectButton = new JButton(new ImageIcon( getClass().getResource("/graphics/logger_restart.png")));
labelsForUpdate.add(reconnectButton);
reconnectButton.setPreferredSize(new Dimension(25, 25)); reconnectButton.setPreferredSize(new Dimension(25, 25));
reconnectButton.setToolTipText("Reconnect to " + target); reconnectButton.setToolTipText("Reconnect to " + target);
reconnectButton.addActionListener(new ActionListener() { reconnectButton.addActionListener(new ActionListener() {
@ -1332,6 +1336,7 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
}); });
comboBoxPanel.add(reconnectButton); comboBoxPanel.add(reconnectButton);
JButton disconnectButton = new JButton(new ImageIcon( getClass().getResource("/graphics/logger_stop.png"))); JButton disconnectButton = new JButton(new ImageIcon( getClass().getResource("/graphics/logger_stop.png")));
labelsForUpdate.add(disconnectButton);
disconnectButton.setPreferredSize(new Dimension(25, 25)); disconnectButton.setPreferredSize(new Dimension(25, 25));
disconnectButton.setToolTipText("Disconnect from " + target); disconnectButton.setToolTipText("Disconnect from " + target);
disconnectButton.addActionListener(new ActionListener() { disconnectButton.addActionListener(new ActionListener() {
@ -1360,6 +1365,17 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
getSettings().setDestinationTarget(module); getSettings().setDestinationTarget(module);
} }
} }
for (JComponent jc : labelsForUpdate) {
if (jc instanceof JLabel) {
((JLabel) jc).setText(((JLabel) jc).getText().replaceAll("[A-Z]{3}", target));
}
if (jc instanceof JMenuItem) {
((JMenuItem) jc).setText(((JMenuItem) jc).getText().replaceAll("[A-Z]{3}", target));
}
if (jc instanceof JButton) {
jc.setToolTipText(jc.getToolTipText().replaceAll("[A-Z]{3}", target));
}
}
} }
private Transport getTransportByName(String name) { private Transport getTransportByName(String name) {