resolve conflict

src/main/java/com/romraider/logger/ecu/EcuLogger.java

@@ -19,6 +19,7 @@
 
 package com.romraider.logger.ecu;
 
+import com.romraider.net.BrowserControl;
 import static com.romraider.Version.LOGGER_DEFS_URL;
 import static com.romraider.Version.PRODUCT_NAME;
 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.ExternalDataSourceLoader;
 import com.romraider.logger.external.core.ExternalDataSourceLoaderImpl;
-import com.romraider.net.BrowserControl;
 import com.romraider.swing.AbstractFrame;
 import com.romraider.swing.SetFont;
 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 Map<String, Map<Transport, Collection<Module>>> protocolList =
             new HashMap<String, Map<Transport, Collection<Module>>>();
+    private final List<JComponent> labelsForUpdate = new ArrayList<JComponent>();
 
     public EcuLogger() {
         super(ECU_LOGGER_TITLE);
@@ -302,7 +303,7 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
             showMessageDialog(null, 
                 "Incompatible JRE detected.\n" +
                 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", 
                 ERROR_MESSAGE);
             // this will generate a NullPointerException because we never got
@@ -319,7 +320,7 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
             JProgressBar progressBar = startbar();
             bootstrap();
             progressBar.setValue(20);
-            startText.setText(" Loading ECU Defs...");
+            startText.setText(" Loading Logger Defs...");
             loadEcuDefs();
             progressBar.setValue(40);
             startText.setText(" Loading Plugins...");
@@ -327,7 +328,7 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
             loadLoggerPlugins();
             progressBar.setIndeterminate(false);
             progressBar.setValue(60);
-            startText.setText(" Loading ECU Parameters...");
+            startText.setText(" Loading Logging Parameters...");
             loadLoggerParams();
             progressBar.setValue(80);
             startText.setText(" Starting Logger...");
@@ -341,11 +342,11 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
         }
         else {
             bootstrap();
-            ecuEditor.getStatusPanel().update("Loading ECU Defs...", 20);
+            ecuEditor.getStatusPanel().update("Loading Logger Defs...", 20);
             loadEcuDefs();
             ecuEditor.getStatusPanel().update("Loading Plugins...", 40);
             loadLoggerPlugins();
-            ecuEditor.getStatusPanel().update("Loading ECU Parameters...", 60);
+            ecuEditor.getStatusPanel().update("Loading Logging Parameters...", 60);
             loadLoggerParams();
             ecuEditor.getStatusPanel().update("Starting Logger...", 80);
             initControllerListeners();
@@ -1113,6 +1114,7 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
         ecuIdPanel.setBorder(createLoweredBevelBorder());
         ecuIdPanel.add(calIdLabel);
         ecuIdPanel.add(ecuIdLabel);
+        labelsForUpdate.add(ecuIdLabel);
         constraints.gridx = 2;
         constraints.gridy = 0;
         constraints.gridwidth = 1;
@@ -1198,6 +1200,7 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
 
         JPopupMenu fileNamePopup = new JPopupMenu();
         JMenuItem ecuIdItem = new JMenuItem("Use Current " + target + " ID");
+        labelsForUpdate.add(ecuIdItem);
         ecuIdItem.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
@@ -1318,6 +1321,7 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
         }
 
         JButton reconnectButton = new JButton(new ImageIcon( getClass().getResource("/graphics/logger_restart.png")));
+        labelsForUpdate.add(reconnectButton);
         reconnectButton.setPreferredSize(new Dimension(25, 25));
         reconnectButton.setToolTipText("Reconnect to " + target);
         reconnectButton.addActionListener(new ActionListener() {
@@ -1332,6 +1336,7 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
         });
         comboBoxPanel.add(reconnectButton);
         JButton disconnectButton = new JButton(new ImageIcon( getClass().getResource("/graphics/logger_stop.png")));
+        labelsForUpdate.add(disconnectButton);
         disconnectButton.setPreferredSize(new Dimension(25, 25));
         disconnectButton.setToolTipText("Disconnect from " + target);
         disconnectButton.addActionListener(new ActionListener() {
@@ -1360,6 +1365,17 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
                 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) {