kske/chess
Archived
1
Fork 0
Code Issues 6 Pull Requests Releases 5 Activity

Refactoring

Browse Source 
- Simplified FEN-string generation
- Made GameConfigurationDialog a utility class
This commit is contained in:
Kai S. K. Engelbart 2019-09-09 19:05:57 +02:00
parent 8d23315481
commit 249c9f74a0
6 changed files with 61 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/dev/kske/chess/board/Board.java
View File

@ -480,39 +480,18 @@ public class Board implements Cloneable {
// Piece placement (from white's perspective) // Piece placement (from white's perspective)
for (int i = 0; i < 8; i++) { for (int i = 0; i < 8; i++) {
int emptyCount = 0; int emptyCount = 0;
for (int j = 0; j < 8; j++) for (int j = 0; j < 8; j++) {
if (boardArr[j][i] == null) ++emptyCount; final Piece piece = boardArr[j][i];
if (piece == null) ++emptyCount;
else { else {
if (emptyCount != 0) { if (emptyCount != 0) {
sb.append(emptyCount); sb.append(emptyCount);
emptyCount = 0; emptyCount = 0;
} }
char piece; char p = boardArr[j][i].getType().firstChar();
switch (boardArr[j][i].getType()) { sb.append(piece.getColor() == Color.WHITE ? Character.toUpperCase(p) : p);
case KING:
piece = 'K';
break;
case QUEEN:
piece = 'Q';
break;
case ROOK:
piece = 'R';
break;
case KNIGHT:
piece = 'N';
break;
case BISHOP:
piece = 'B';
break;
case PAWN:
piece = 'P';
break;
default:
piece = '-';
}
if (boardArr[j][i].getColor() == Color.BLACK) piece = Character.toLowerCase(piece);
sb.append(piece);
} }
}
if (emptyCount != 0) sb.append(emptyCount); if (emptyCount != 0) sb.append(emptyCount);
if (i < 7) sb.append('/'); if (i < 7) sb.append('/');
} }

9
src/dev/kske/chess/board/Piece.java
View File

@ -85,7 +85,14 @@ public abstract class Piece implements Cloneable {
} }
public static enum Type { public static enum Type {
KING, QUEEN, ROOK, KNIGHT, BISHOP, PAWN KING, QUEEN, ROOK, KNIGHT, BISHOP, PAWN;
/**
* @return The first character of this {@link Type} in algebraic notation and lower case
*/
public char firstChar() {
return this == KNIGHT ? 'n' : Character.toLowerCase(this.toString().charAt(0));
}
} }
public static enum Color { public static enum Color {

2
src/dev/kske/chess/ui/FENDropTarget.java
View File

@ -36,7 +36,7 @@ public class FENDropTarget extends DropTargetAdapter {
try (BufferedReader br = new BufferedReader(new FileReader(file))) { try (BufferedReader br = new BufferedReader(new FileReader(file))) {
final GamePane gamePane = mainWindow.addGamePane(); final GamePane gamePane = mainWindow.addGamePane();
final String fen = br.readLine(); final String fen = br.readLine();
new GameConfigurationDialog((whiteName, blackName) -> { GameConfigurationDialog.show((whiteName, blackName) -> {
final Game game = new Game(gamePane.getBoardPane(), whiteName, blackName, fen); final Game game = new Game(gamePane.getBoardPane(), whiteName, blackName, fen);
gamePane.setGame(game); gamePane.setGame(game);
game.start(); game.start();

87
src/dev/kske/chess/ui/GameConfigurationDialog.java
View File

@ -4,6 +4,7 @@ import java.awt.Font;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.function.BiConsumer;
import javax.swing.DefaultComboBoxModel; import javax.swing.DefaultComboBoxModel;
import javax.swing.JButton; import javax.swing.JButton;
@ -17,61 +18,59 @@ import javax.swing.JLabel;
* Created: <strong>24.07.2019</strong><br> * Created: <strong>24.07.2019</strong><br>
* Author: <strong>Kai S. K. Engelbart</strong> * Author: <strong>Kai S. K. Engelbart</strong>
*/ */
public class GameConfigurationDialog extends JDialog { public class GameConfigurationDialog {
private static final long serialVersionUID = 9080577278529876972L; private GameConfigurationDialog() {}
/** public static void show(BiConsumer<String, String> action) {
* Create the dialog. new JDialog() {
*/
public GameConfigurationDialog(ActionWithConfiguration action) {
setTitle("Game Configuration");
setBounds(100, 100, 281, 142);
setModal(true);
setLocationRelativeTo(null);
getContentPane().setLayout(null);
List<String> options = new ArrayList<>(Arrays.asList("Natural Player", "AI Player")); private static final long serialVersionUID = -5768339760489440385L;
EngineUtil.getEngineInfos().forEach(info -> options.add(info.name));
JLabel lblWhite = new JLabel("White:"); {
lblWhite.setFont(new Font("Tahoma", Font.PLAIN, 14)); setTitle("Game Configuration");
lblWhite.setBounds(10, 11, 49, 14); setBounds(100, 100, 281, 142);
getContentPane().add(lblWhite); setModal(true);
setLocationRelativeTo(null);
getContentPane().setLayout(null);
JComboBox<Object> cbWhite = new JComboBox<>(); List<String> options = new ArrayList<>(Arrays.asList("Natural Player", "AI Player"));
cbWhite.setModel(new DefaultComboBoxModel<Object>(options.toArray())); EngineUtil.getEngineInfos().forEach(info -> options.add(info.name));
cbWhite.setBounds(98, 9, 159, 22);
getContentPane().add(cbWhite);
JLabel lblBlack = new JLabel("Black:"); JLabel lblWhite = new JLabel("White:");
lblBlack.setFont(new Font("Tahoma", Font.PLAIN, 14)); lblWhite.setFont(new Font("Tahoma", Font.PLAIN, 14));
lblBlack.setBounds(10, 38, 49, 14); lblWhite.setBounds(10, 11, 49, 14);
getContentPane().add(lblBlack); getContentPane().add(lblWhite);
JComboBox<Object> cbBlack = new JComboBox<>(); JComboBox<Object> cbWhite = new JComboBox<>();
cbBlack.setModel(new DefaultComboBoxModel<Object>(options.toArray())); cbWhite.setModel(new DefaultComboBoxModel<Object>(options.toArray()));
cbBlack.setBounds(98, 36, 159, 22); cbWhite.setBounds(98, 9, 159, 22);
getContentPane().add(cbBlack); getContentPane().add(cbWhite);
JButton btnStart = new JButton("Start"); JLabel lblBlack = new JLabel("Black:");
btnStart.addActionListener((evt) -> { lblBlack.setFont(new Font("Tahoma", Font.PLAIN, 14));
dispose(); lblBlack.setBounds(10, 38, 49, 14);
action.onConfigurationSet(options.get(cbWhite.getSelectedIndex()), options.get(cbBlack.getSelectedIndex())); getContentPane().add(lblBlack);
});
btnStart.setBounds(20, 73, 89, 23);
getContentPane().add(btnStart);
JButton btnCancel = new JButton("Cancel"); JComboBox<Object> cbBlack = new JComboBox<>();
btnCancel.addActionListener((evt) -> dispose()); cbBlack.setModel(new DefaultComboBoxModel<Object>(options.toArray()));
btnCancel.setBounds(157, 73, 89, 23); cbBlack.setBounds(98, 36, 159, 22);
getContentPane().add(btnCancel); getContentPane().add(cbBlack);
setVisible(true); JButton btnStart = new JButton("Start");
} btnStart.addActionListener((evt) -> {
dispose();
action.accept(options.get(cbWhite.getSelectedIndex()), options.get(cbBlack.getSelectedIndex()));
});
btnStart.setBounds(20, 73, 89, 23);
getContentPane().add(btnStart);
public static interface ActionWithConfiguration { JButton btnCancel = new JButton("Cancel");
btnCancel.addActionListener((evt) -> dispose());
btnCancel.setBounds(157, 73, 89, 23);
getContentPane().add(btnCancel);
void onConfigurationSet(String whiteName, String blackName); }
}.setVisible(true);
} }
} }

4
src/dev/kske/chess/ui/MenuBar.java
View File

@ -34,7 +34,7 @@ public class MenuBar extends JMenuBar {
JMenu gameMenu = new JMenu("Game"); JMenu gameMenu = new JMenu("Game");
JMenuItem newGameMenuItem = new JMenuItem("New Game"); JMenuItem newGameMenuItem = new JMenuItem("New Game");
newGameMenuItem.addActionListener((evt) -> { newGameMenuItem.addActionListener((evt) -> {
new GameConfigurationDialog((whiteName, blackName) -> { GameConfigurationDialog.show((whiteName, blackName) -> {
GamePane gamePane = mainWindow.addGamePane(); GamePane gamePane = mainWindow.addGamePane();
Game game = new Game(gamePane.getBoardPane(), whiteName, blackName); Game game = new Game(gamePane.getBoardPane(), whiteName, blackName);
gamePane.setGame(game); gamePane.setGame(game);
@ -80,7 +80,7 @@ public class MenuBar extends JMenuBar {
loadFromFENMenuItem.addActionListener((evt) -> { loadFromFENMenuItem.addActionListener((evt) -> {
final GamePane gamePane = mainWindow.addGamePane(); final GamePane gamePane = mainWindow.addGamePane();
final String fen = JOptionPane.showInputDialog("Enter a FEN string: "); final String fen = JOptionPane.showInputDialog("Enter a FEN string: ");
new GameConfigurationDialog((whiteName, blackName) -> { GameConfigurationDialog.show((whiteName, blackName) -> {
final Game game = new Game(gamePane.getBoardPane(), whiteName, blackName, fen); final Game game = new Game(gamePane.getBoardPane(), whiteName, blackName, fen);
gamePane.setGame(game); gamePane.setGame(game);
game.start(); game.start();

4
src/dev/kske/chess/ui/TextureUtil.java
View File

@ -19,11 +19,9 @@ import dev.kske.chess.board.Piece;
*/ */
public class TextureUtil { public class TextureUtil {
private static Map<String, Image> textures, scaledTextures; private static Map<String, Image> textures = new HashMap<>(), scaledTextures = new HashMap<>();
static { static {
textures = new HashMap<>();
scaledTextures = new HashMap<>();
loadPieceTextures(); loadPieceTextures();
scaledTextures.putAll(textures); scaledTextures.putAll(textures);
} }