java-projects/Turrets
1
0
Fork 0
Code

Add lambda to events

Browse Source
This commit is contained in:
Victor 2014-03-28 17:03:43 +02:00
parent 4e85dc549a
commit dadbe3b770
2 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/com/annimon/turrets/GameCanvas.java
View File

@ -247,25 +247,17 @@ public final class GameCanvas extends DoubleBufferedCanvas implements Runnable,
instanceTurret.setBarrelParams(x, Constants.HEIGHT - y); instanceTurret.setBarrelParams(x, Constants.HEIGHT - y);
} }
private final Turret.TurretListener serverTurretListener = new Turret.TurretListener() { private final Turret.TurretListener serverTurretListener = (hitOpponent) -> {
serverMove = false;
@Override if (hitOpponent) {
public void shootComplete(boolean hitOpponent) { finishRound(true);
serverMove = false;
if (hitOpponent) {
finishRound(true);
}
} }
}; };
private final Turret.TurretListener clientTurretListener = new Turret.TurretListener() { private final Turret.TurretListener clientTurretListener = (hitOpponent) -> {
serverMove = true;
@Override if (hitOpponent) {
public void shootComplete(boolean hitOpponent) { finishRound(false);
serverMove = true;
if (hitOpponent) {
finishRound(false);
}
} }
}; };
} }

21
src/com/annimon/turrets/HelpPanel.java
View File

@ -6,8 +6,6 @@ import com.annimon.turrets.util.ExceptionHandler;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Color; import java.awt.Color;
import java.awt.Font; import java.awt.Font;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.IOException; import java.io.IOException;
import javax.swing.JButton; import javax.swing.JButton;
import javax.swing.JEditorPane; import javax.swing.JEditorPane;
@ -16,7 +14,6 @@ import javax.swing.JPanel;
import javax.swing.SwingConstants; import javax.swing.SwingConstants;
import javax.swing.border.EmptyBorder; import javax.swing.border.EmptyBorder;
import javax.swing.event.HyperlinkEvent; import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkListener;
/** /**
* *
@ -49,25 +46,15 @@ public final class HelpPanel extends JPanel {
"<a href=\"https://github.com/aNNiMON/turrets\">GitHub</a></p>" + "<a href=\"https://github.com/aNNiMON/turrets\">GitHub</a></p>" +
"<br/><p>Ukraine, Donetsk 2014</p>" + "<br/><p>Ukraine, Donetsk 2014</p>" +
"</html>"); "</html>");
infoPane.addHyperlinkListener(new HyperlinkListener() { infoPane.addHyperlinkListener((e) -> {
if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType())) {
@Override openBrowser(e.getURL().toString());
public void hyperlinkUpdate(HyperlinkEvent hle) {
if (HyperlinkEvent.EventType.ACTIVATED.equals(hle.getEventType())) {
openBrowser(hle.getURL().toString());
}
} }
}); });
add(infoPane, BorderLayout.CENTER); add(infoPane, BorderLayout.CENTER);
final JButton backButton = new JButton("Back"); final JButton backButton = new JButton("Back");
backButton.addActionListener(new ActionListener() { backButton.addActionListener((e) -> Main.getInstance().switchToMainMenu());
@Override
public void actionPerformed(ActionEvent e) {
Main.getInstance().switchToMainMenu();
}
});
backButton.setForeground(Color.GRAY); backButton.setForeground(Color.GRAY);
backButton.setFont(new Font(MENU_FONT_NAME, 1, 30)); backButton.setFont(new Font(MENU_FONT_NAME, 1, 30));
backButton.setBorderPainted(false); backButton.setBorderPainted(false);