From dea62e16f9e1218f6d3c8ad62e7314137eb58a28 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Mon, 20 Jun 2016 18:01:52 -0400 Subject: [PATCH] auto-sync --- .../ui/src/com/rusefi/SensorSnifferPane.java | 12 +++++------- java_console/ui/src/com/rusefi/ui/FormulasPane.java | 5 +---- java_console/ui/src/com/rusefi/ui/GaugesPanel.java | 4 +--- java_console/ui/src/com/rusefi/ui/MessagesPanel.java | 4 +--- .../src/com/rusefi/ui/engine/EngineSnifferPanel.java | 4 +--- java_console/ui/src/com/rusefi/ui/util/UiUtils.java | 7 +++++++ 6 files changed, 16 insertions(+), 20 deletions(-) diff --git a/java_console/ui/src/com/rusefi/SensorSnifferPane.java b/java_console/ui/src/com/rusefi/SensorSnifferPane.java index a3c9bdef5f..75e3f8f597 100644 --- a/java_console/ui/src/com/rusefi/SensorSnifferPane.java +++ b/java_console/ui/src/com/rusefi/SensorSnifferPane.java @@ -3,12 +3,12 @@ package com.rusefi; import com.rusefi.config.Fields; import com.rusefi.ui.RpmLabel; import com.rusefi.ui.RpmModel; -import com.rusefi.ui.config.EnumConfigField; -import com.rusefi.ui.storage.Node; -import com.rusefi.ui.util.UiUtils; -import com.rusefi.ui.engine.EngineSnifferPanel; import com.rusefi.ui.config.ConfigField; +import com.rusefi.ui.config.EnumConfigField; +import com.rusefi.ui.engine.EngineSnifferPanel; +import com.rusefi.ui.storage.Node; import com.rusefi.ui.util.URLLabel; +import com.rusefi.ui.util.UiUtils; import com.rusefi.ui.widgets.AnyCommand; import javax.swing.*; @@ -19,8 +19,6 @@ import java.util.*; import java.util.List; import static com.rusefi.ui.util.LocalizedMessages.CLEAR; -import static com.rusefi.ui.util.LocalizedMessages.PAUSE; -import static com.rusefi.ui.util.LocalizedMessages.RESUME; /** * Date: 12/21/13 @@ -85,7 +83,7 @@ public class SensorSnifferPane { } ); - final JButton pauseButton = new JButton(PAUSE.getMessage()); + final JButton pauseButton = UiUtils.createPauseButton(); upperPanel.add(pauseButton); upperPanel.add(new RpmLabel(2).getContent()); diff --git a/java_console/ui/src/com/rusefi/ui/FormulasPane.java b/java_console/ui/src/com/rusefi/ui/FormulasPane.java index 0efe9eb6f5..7d187fb1b7 100644 --- a/java_console/ui/src/com/rusefi/ui/FormulasPane.java +++ b/java_console/ui/src/com/rusefi/ui/FormulasPane.java @@ -18,8 +18,6 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.image.BufferedImage; -import static com.rusefi.ui.util.LocalizedMessages.PAUSE; - /** * (c) Andrey Belomutskiy 2013-2016 */ @@ -34,8 +32,7 @@ public class FormulasPane { centerProxy.add(new JLabel("Waiting for data..."), BorderLayout.CENTER); - final JButton pauseButton = new JButton(PAUSE.getMessage()); - pauseButton.setMnemonic('p'); + final JButton pauseButton = UiUtils.createPauseButton(); pauseButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { diff --git a/java_console/ui/src/com/rusefi/ui/GaugesPanel.java b/java_console/ui/src/com/rusefi/ui/GaugesPanel.java index 312a224355..4655e0af63 100644 --- a/java_console/ui/src/com/rusefi/ui/GaugesPanel.java +++ b/java_console/ui/src/com/rusefi/ui/GaugesPanel.java @@ -15,8 +15,6 @@ import java.awt.event.ActionListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import static com.rusefi.ui.util.LocalizedMessages.PAUSE; - /** * Date: 2/5/13 * (c) Andrey Belomutskiy @@ -200,7 +198,7 @@ public class GaugesPanel { } private Component createPauseButton() { - final JButton pauseButton = new JButton(PAUSE.getMessage()); + final JButton pauseButton = UiUtils.createPauseButton(); pauseButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { diff --git a/java_console/ui/src/com/rusefi/ui/MessagesPanel.java b/java_console/ui/src/com/rusefi/ui/MessagesPanel.java index 6e62affe68..da53a7963f 100644 --- a/java_console/ui/src/com/rusefi/ui/MessagesPanel.java +++ b/java_console/ui/src/com/rusefi/ui/MessagesPanel.java @@ -10,7 +10,6 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import static com.rusefi.ui.util.LocalizedMessages.CLEAR; -import static com.rusefi.ui.util.LocalizedMessages.PAUSE; /** * This panel displays plain-text 'msg' plain-text debug messages @@ -43,8 +42,7 @@ public class MessagesPanel { } }); - final JButton pauseButton = new JButton(PAUSE.getMessage()); - pauseButton.setMnemonic('p'); + final JButton pauseButton = UiUtils.createPauseButton(); pauseButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { diff --git a/java_console/ui/src/com/rusefi/ui/engine/EngineSnifferPanel.java b/java_console/ui/src/com/rusefi/ui/engine/EngineSnifferPanel.java index 38060a3c80..d842e8236d 100644 --- a/java_console/ui/src/com/rusefi/ui/engine/EngineSnifferPanel.java +++ b/java_console/ui/src/com/rusefi/ui/engine/EngineSnifferPanel.java @@ -26,7 +26,6 @@ import java.util.*; import java.util.List; import static com.rusefi.ui.util.LocalizedMessages.CLEAR; -import static com.rusefi.ui.util.LocalizedMessages.PAUSE; /** * Engine Sniffer control consists of a set of {@link UpDownImage} @@ -98,8 +97,7 @@ public class EngineSnifferPanel { } }); - final JButton pauseButton = new JButton(PAUSE.getMessage()); - pauseButton.setMnemonic('p'); + final JButton pauseButton = UiUtils.createPauseButton(); pauseButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { diff --git a/java_console/ui/src/com/rusefi/ui/util/UiUtils.java b/java_console/ui/src/com/rusefi/ui/util/UiUtils.java index 21665956c9..293bbbeb97 100644 --- a/java_console/ui/src/com/rusefi/ui/util/UiUtils.java +++ b/java_console/ui/src/com/rusefi/ui/util/UiUtils.java @@ -133,4 +133,11 @@ public class UiUtils { public static void showLoadingMessage(JPanel panel) { panel.add(new JLabel("Loading..."), BorderLayout.CENTER); } + + @NotNull + public static JButton createPauseButton() { + final JButton pauseButton = new JButton(PAUSE.getMessage()); + pauseButton.setMnemonic('p'); + return pauseButton; + } }