From dadbe3b770012cec35b729b8c7f904c91294df04 Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 28 Mar 2014 17:03:43 +0200 Subject: [PATCH] Add lambda to events --- src/com/annimon/turrets/GameCanvas.java | 24 ++++++++---------------- src/com/annimon/turrets/HelpPanel.java | 21 ++++----------------- 2 files changed, 12 insertions(+), 33 deletions(-) diff --git a/src/com/annimon/turrets/GameCanvas.java b/src/com/annimon/turrets/GameCanvas.java index 79d3bbb..24b1317 100644 --- a/src/com/annimon/turrets/GameCanvas.java +++ b/src/com/annimon/turrets/GameCanvas.java @@ -247,25 +247,17 @@ public final class GameCanvas extends DoubleBufferedCanvas implements Runnable, instanceTurret.setBarrelParams(x, Constants.HEIGHT - y); } - private final Turret.TurretListener serverTurretListener = new Turret.TurretListener() { - - @Override - public void shootComplete(boolean hitOpponent) { - serverMove = false; - if (hitOpponent) { - finishRound(true); - } + private final Turret.TurretListener serverTurretListener = (hitOpponent) -> { + serverMove = false; + if (hitOpponent) { + finishRound(true); } }; - private final Turret.TurretListener clientTurretListener = new Turret.TurretListener() { - - @Override - public void shootComplete(boolean hitOpponent) { - serverMove = true; - if (hitOpponent) { - finishRound(false); - } + private final Turret.TurretListener clientTurretListener = (hitOpponent) -> { + serverMove = true; + if (hitOpponent) { + finishRound(false); } }; } diff --git a/src/com/annimon/turrets/HelpPanel.java b/src/com/annimon/turrets/HelpPanel.java index 0401c84..60da7e7 100644 --- a/src/com/annimon/turrets/HelpPanel.java +++ b/src/com/annimon/turrets/HelpPanel.java @@ -6,8 +6,6 @@ import com.annimon.turrets.util.ExceptionHandler; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Font; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.io.IOException; import javax.swing.JButton; import javax.swing.JEditorPane; @@ -16,7 +14,6 @@ import javax.swing.JPanel; import javax.swing.SwingConstants; import javax.swing.border.EmptyBorder; import javax.swing.event.HyperlinkEvent; -import javax.swing.event.HyperlinkListener; /** * @@ -49,25 +46,15 @@ public final class HelpPanel extends JPanel { "GitHub

" + "

Ukraine, Donetsk 2014

" + ""); - infoPane.addHyperlinkListener(new HyperlinkListener() { - - @Override - public void hyperlinkUpdate(HyperlinkEvent hle) { - if (HyperlinkEvent.EventType.ACTIVATED.equals(hle.getEventType())) { - openBrowser(hle.getURL().toString()); - } + infoPane.addHyperlinkListener((e) -> { + if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType())) { + openBrowser(e.getURL().toString()); } }); add(infoPane, BorderLayout.CENTER); final JButton backButton = new JButton("Back"); - backButton.addActionListener(new ActionListener() { - - @Override - public void actionPerformed(ActionEvent e) { - Main.getInstance().switchToMainMenu(); - } - }); + backButton.addActionListener((e) -> Main.getInstance().switchToMainMenu()); backButton.setForeground(Color.GRAY); backButton.setFont(new Font(MENU_FONT_NAME, 1, 30)); backButton.setBorderPainted(false);