From 8facb8491a38b4809fe41e76314cfcd4caeaa08b Mon Sep 17 00:00:00 2001
From: rusEfi <russianefi@gmail.com>
Date: Tue, 3 Feb 2015 11:06:06 -0600
Subject: [PATCH] auto-sync

---
 java_console/ui/resources/appicon.png         | Bin 0 -> 3161 bytes
 java_console/ui/src/com/irnems/Launcher.java  |   6 +-
 .../ui/src/com/rusefi/PortLookupFrame.java    |  57 +++++++++++++++---
 .../ui/src/com/rusefi/SimulatorHelper.java    |   6 +-
 java_console/ui/ui.iml                        |   1 +
 5 files changed, 54 insertions(+), 16 deletions(-)
 create mode 100644 java_console/ui/resources/appicon.png

diff --git a/java_console/ui/resources/appicon.png b/java_console/ui/resources/appicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..5454108492ecb2cbaec0d288fa671900de5a00d3
GIT binary patch
literal 3161
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

literal 0
HcmV?d00001

diff --git a/java_console/ui/src/com/irnems/Launcher.java b/java_console/ui/src/com/irnems/Launcher.java
index 4e7ed4092c..7d0c6b007a 100644
--- a/java_console/ui/src/com/irnems/Launcher.java
+++ b/java_console/ui/src/com/irnems/Launcher.java
@@ -20,10 +20,11 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
  * 12/25/12
  * (c) Andrey Belomutskiy 2013-2015
  *
+ * @see PortLookupFrame
  * @see WavePanel
  */
 public class Launcher extends FrameHelper {
-    public static final int CONSOLE_VERSION = 20150130;
+    public static final int CONSOLE_VERSION = 20150203;
     public static final boolean SHOW_STIMULATOR = true;
     public static final String TAB_INDEX = "main_tab";
     private final String port;
@@ -67,6 +68,7 @@ public class Launcher extends FrameHelper {
             tabbedPane.setSelectedIndex(selectedIndex);
         }
 
+        PortLookupFrame.setAppIcon(frame);
         showFrame(tabbedPane);
     }
 
@@ -124,7 +126,7 @@ public class Launcher extends FrameHelper {
             } else {
                 for (String p : SerialPortList.getPortNames())
                     MessagesCentral.getInstance().postMessage(Launcher.class, "Available port: " + p);
-                PortLookupFrame.chooseSerialPort();
+                new PortLookupFrame().chooseSerialPort();
             }
 
         } catch (Throwable e) {
diff --git a/java_console/ui/src/com/rusefi/PortLookupFrame.java b/java_console/ui/src/com/rusefi/PortLookupFrame.java
index 51e09bd2ac..a1d623d490 100644
--- a/java_console/ui/src/com/rusefi/PortLookupFrame.java
+++ b/java_console/ui/src/com/rusefi/PortLookupFrame.java
@@ -11,6 +11,9 @@ import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -23,17 +26,38 @@ import java.util.List;
  *         2/14/14
  */
 public class PortLookupFrame {
+    // todo: figure out a better way to work with absolute path
+    public static final String APPICON_PNG = "../../appicon.png";
+    private static final String LINK_TEXT = "rusEfi (c) 2012-2015";
+    private static final String URI = "http://rusefi.com/?java_console";
 
-    public static final String RUS_EFI_C_2012_2014 = "rusEfi (c) 2012-2015";
-    public static final String URI = "http://rusefi.com/?java_console";
+    private final JFrame frame;
+    private boolean isProceeding;
 
-    public static void chooseSerialPort() {
+    public PortLookupFrame() {
+        frame = new JFrame(Launcher.CONSOLE_VERSION + ": Serial port selection");
+        frame.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+        frame.addWindowListener(new WindowAdapter() {
+            @Override
+            public void windowClosed(WindowEvent ev) {
+                if (!isProceeding)
+                    System.exit(0);
+            }
+        });
+        setAppIcon(frame);
+    }
+
+    public static void setAppIcon(JFrame frame) {
+        ImageIcon icon = loadIcon(APPICON_PNG);
+        if (icon != null)
+            frame.setIconImage(icon.getImage());
+    }
+
+    public void chooseSerialPort() {
         List<String> ports = new ArrayList<>();
         ports.addAll(Arrays.asList(SerialPortList.getPortNames()));
         ports.addAll(TcpConnector.getAvailablePorts());
 
-        final JFrame frame = new JFrame(Launcher.CONSOLE_VERSION + ": Serial port selection");
-
         JPanel content = new JPanel(new BorderLayout());
 
         final JPanel upperPanel = new JPanel(new FlowLayout());
@@ -46,7 +70,7 @@ public class PortLookupFrame {
         buttonLogViewer.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                frame.dispose();
+                disposeFrameAndProceed();
                 new Launcher(LinkManager.LOG_VIEWER);
             }
         });
@@ -54,11 +78,11 @@ public class PortLookupFrame {
         upperPanel.add(buttonLogViewer);
 
         JPanel centerPanel = new JPanel(new FlowLayout());
-        centerPanel.add(SimulatorHelper.createSimulatorComponent(frame));
+        centerPanel.add(SimulatorHelper.createSimulatorComponent(this));
 
 
         JPanel lowerPanel = new JPanel(new FlowLayout());
-        lowerPanel.add(new URLLabel(RUS_EFI_C_2012_2014, URI));
+        lowerPanel.add(new URLLabel(LINK_TEXT, URI));
         content.add(upperPanel, BorderLayout.NORTH);
         content.add(centerPanel, BorderLayout.CENTER);
         content.add(lowerPanel, BorderLayout.SOUTH);
@@ -70,7 +94,12 @@ public class PortLookupFrame {
         UiUtils.centerWindow(frame);
     }
 
-    private static void addPortSelection(List<String> ports, final JFrame frame, JPanel panel) {
+    public void disposeFrameAndProceed() {
+        isProceeding = true;
+        frame.dispose();
+    }
+
+    private void addPortSelection(List<String> ports, final JFrame frame, JPanel panel) {
         final JComboBox<String> comboPorts = new JComboBox<>();
         for (final String port : ports)
             comboPorts.addItem(port);
@@ -81,9 +110,17 @@ public class PortLookupFrame {
         connect.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                frame.dispose();
+                disposeFrameAndProceed();
                 new Launcher(comboPorts.getSelectedItem().toString());
             }
         });
     }
+
+    public static ImageIcon loadIcon(String strPath) {
+        URL imgURL = PortLookupFrame.class.getResource(strPath);
+        if (imgURL != null)
+            return new ImageIcon(imgURL);
+        else
+            return null;
+    }
 }
\ No newline at end of file
diff --git a/java_console/ui/src/com/rusefi/SimulatorHelper.java b/java_console/ui/src/com/rusefi/SimulatorHelper.java
index 998f3703e7..07dc3d9609 100644
--- a/java_console/ui/src/com/rusefi/SimulatorHelper.java
+++ b/java_console/ui/src/com/rusefi/SimulatorHelper.java
@@ -43,24 +43,22 @@ public class SimulatorHelper {
 
     }
 
-    public static JComponent createSimulatorComponent(final JFrame frame) {
+    public static JComponent createSimulatorComponent(final PortLookupFrame portSelector) {
         if (!SimulatorHelper.isBinaryHere())
             return new JLabel(SimulatorHelper.BINARY + " not found");
 
         if (TcpConnector.isTcpPortOpened())
             return new JLabel("Port " + TcpConnector.DEFAULT_PORT + " already busy. Simulator running?");
 
-
         JButton simulatorButton = new JButton("Start Simulator");
         simulatorButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent event) {
-                frame.dispose();
+                portSelector.disposeFrameAndProceed();
                 startSimulator();
             }
         });
 
-
         return simulatorButton;
     }
 
diff --git a/java_console/ui/ui.iml b/java_console/ui/ui.iml
index 756ce4e759..8706fc21f6 100644
--- a/java_console/ui/ui.iml
+++ b/java_console/ui/ui.iml
@@ -4,6 +4,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />