From dad6bf83f233ea3070f357a33b3dc082523fde09 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Tue, 3 Feb 2015 19:04:24 -0600 Subject: [PATCH] auto-sync --- java_console/build.xml | 8 ++++++-- .../ui/resources/{ => com/rusefi}/appicon.png | Bin java_console/ui/resources/com/rusefi/logo.gif | Bin 0 -> 3915 bytes .../ui/src/com/{irnems => rusefi}/Launcher.java | 3 ++- .../ui/src/com/rusefi/SimulatorHelper.java | 1 - java_console/ui/src/com/rusefi/StartupFrame.java | 14 ++++++++++---- .../ui/src/com/rusefi/StimulationInputs.java | 2 -- .../ui/src/com/rusefi/VersionChecker.java | 2 +- .../com/rusefi/ui/DefaultExceptionHandler.java | 2 +- 9 files changed, 20 insertions(+), 12 deletions(-) rename java_console/ui/resources/{ => com/rusefi}/appicon.png (100%) create mode 100644 java_console/ui/resources/com/rusefi/logo.gif rename java_console/ui/src/com/{irnems => rusefi}/Launcher.java (98%) diff --git a/java_console/build.xml b/java_console/build.xml index fbc39c94ad..9ac029d0a7 100644 --- a/java_console/build.xml +++ b/java_console/build.xml @@ -38,9 +38,14 @@ + + + + + - + @@ -56,7 +61,6 @@ - diff --git a/java_console/ui/resources/appicon.png b/java_console/ui/resources/com/rusefi/appicon.png similarity index 100% rename from java_console/ui/resources/appicon.png rename to java_console/ui/resources/com/rusefi/appicon.png diff --git a/java_console/ui/resources/com/rusefi/logo.gif b/java_console/ui/resources/com/rusefi/logo.gif new file mode 100644 index 0000000000000000000000000000000000000000..6314214d149313114053a545e4754426aecbc852 GIT binary patch literal 3915 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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/rusefi/Launcher.java similarity index 98% rename from java_console/ui/src/com/irnems/Launcher.java rename to java_console/ui/src/com/rusefi/Launcher.java index e7ca7b9419..2879ef68fb 100644 --- a/java_console/ui/src/com/irnems/Launcher.java +++ b/java_console/ui/src/com/rusefi/Launcher.java @@ -1,5 +1,6 @@ -package com.irnems; +package com.rusefi; +import com.irnems.FileLog; import com.irnems.core.EngineState; import com.irnems.core.MessagesCentral; import com.rusefi.*; diff --git a/java_console/ui/src/com/rusefi/SimulatorHelper.java b/java_console/ui/src/com/rusefi/SimulatorHelper.java index 3b3b646e04..9fe773f1e8 100644 --- a/java_console/ui/src/com/rusefi/SimulatorHelper.java +++ b/java_console/ui/src/com/rusefi/SimulatorHelper.java @@ -1,6 +1,5 @@ package com.rusefi; -import com.irnems.Launcher; import com.rusefi.io.LinkManager; import com.rusefi.io.tcp.TcpConnector; diff --git a/java_console/ui/src/com/rusefi/StartupFrame.java b/java_console/ui/src/com/rusefi/StartupFrame.java index 718b3afd04..67fb8f386e 100644 --- a/java_console/ui/src/com/rusefi/StartupFrame.java +++ b/java_console/ui/src/com/rusefi/StartupFrame.java @@ -1,6 +1,5 @@ package com.rusefi; -import com.irnems.Launcher; import com.rusefi.io.LinkManager; import com.rusefi.io.tcp.TcpConnector; import com.rusefi.ui.UiUtils; @@ -28,7 +27,8 @@ import java.util.List; */ public class StartupFrame { // todo: figure out a better way to work with absolute path - public static final String APPICON_PNG = "../../appicon.png"; + private static final String APPICON = "appicon.png"; + private static final String LOGO = "logo.gif"; private static final String LINK_TEXT = "rusEfi (c) 2012-2015"; private static final String URI = "http://rusefi.com/?java_console"; @@ -49,7 +49,7 @@ public class StartupFrame { } public static void setAppIcon(JFrame frame) { - ImageIcon icon = loadIcon(APPICON_PNG); + ImageIcon icon = loadIcon(APPICON); if (icon != null) frame.setIconImage(icon.getImage()); } @@ -92,7 +92,13 @@ public class StartupFrame { JPanel content = new JPanel(new BorderLayout()); content.add(startupOptions, BorderLayout.WEST); - content.add(new JLabel("Logo"), BorderLayout.EAST); + + ImageIcon logoIcon = loadIcon(LOGO); + if (logoIcon != null) { + JLabel logo = new JLabel(logoIcon); + logo.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 10)); + content.add(logo, BorderLayout.EAST); + } frame.add(content); frame.pack(); diff --git a/java_console/ui/src/com/rusefi/StimulationInputs.java b/java_console/ui/src/com/rusefi/StimulationInputs.java index 66a83cfa0f..fd771b00c1 100644 --- a/java_console/ui/src/com/rusefi/StimulationInputs.java +++ b/java_console/ui/src/com/rusefi/StimulationInputs.java @@ -1,7 +1,5 @@ package com.rusefi; -import com.irnems.Launcher; - import javax.swing.*; import java.awt.*; diff --git a/java_console/ui/src/com/rusefi/VersionChecker.java b/java_console/ui/src/com/rusefi/VersionChecker.java index 090022f337..2d3caf84ae 100644 --- a/java_console/ui/src/com/rusefi/VersionChecker.java +++ b/java_console/ui/src/com/rusefi/VersionChecker.java @@ -13,7 +13,7 @@ import java.net.URL; import java.util.HashMap; import java.util.Map; -import static com.irnems.Launcher.*; +import static com.rusefi.Launcher.*; /** * This class checks the recommended versions numbers and compares them with current versions diff --git a/java_console/ui/src/com/rusefi/ui/DefaultExceptionHandler.java b/java_console/ui/src/com/rusefi/ui/DefaultExceptionHandler.java index dda9624cc2..7a1e59cd95 100644 --- a/java_console/ui/src/com/rusefi/ui/DefaultExceptionHandler.java +++ b/java_console/ui/src/com/rusefi/ui/DefaultExceptionHandler.java @@ -7,7 +7,7 @@ import java.awt.*; import java.io.ByteArrayOutputStream; import java.io.PrintStream; -import static com.irnems.Launcher.*; +import static com.rusefi.Launcher.*; import static javax.swing.JOptionPane.OK_OPTION; /**