3020772
/
Schach
2
2
Fork 0
Code Issues 6 Pull Requests 2 Packages Projects Releases Wiki Activity

undo last merge

buttonActions
dstuck 2025-06-21 15:54:17 +02:00
parent 22e5f10039
commit 8cb621d804
1 changed files with 28 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/main/java/de/mannheim/th/chess/ui/SpielFrame.java
View File

@ -245,53 +245,14 @@ public class SpielFrame extends JFrame {
selectables = game.getLegalMoveableSquares(selectedSquare); selectables = game.getLegalMoveableSquares(selectedSquare);
for ( for (Square square : selectables) {
Square square : selectables) {
JButton b = buttons.get(mirrowedGrid(square.ordinal())); JButton b = buttons.get(mirrowedGrid(square.ordinal()));
final Move move = new Move(selectedSquare, square); final Move move = new Move(selectedSquare, square);
b.setEnabled(true); b.setEnabled(true);
b.setBackground(new Color(230, 100, 100)); b.setBackground(new Color(230, 100, 100));
b.addActionListener(new ButtonMovePieceListener(this, this.game, move)); b.addActionListener(new ButtonMovePieceListener(this, this.game, move));
} }
<<<<<<< HEAD
for (Square square : selectables) {
JButton b = buttons.get(mirrowedGrid(square.ordinal()));
final Move move = new Move(selectedSquare, square);
b.setEnabled(true);
b.setBackground(new Color(230, 100, 100));
for (ActionListener al : b.getActionListeners()) {
b.removeActionListener(al);
}
b.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
if(game.isPromotionMove(move)) {
game.doPromotionMove(showPromotion(), selectedSquare, square);
} else {
game.playMove(move);
}
if (game.isDraw()) {
game.stopClock();
mode = BoardMode.finished;
showDraw();
} else if (game.isMate()) {
game.stopClock();
mode = BoardMode.finished;
showWin(game.getActivePlayer());
}
mode = BoardMode.normal;
setCursor(null);
erstelleBrett();
}
});
}
=======
break; break;
>>>>>>> branch 'buttonActions' of https://gitty.informatik.hs-mannheim.de/3020772/Schach.git
case finished: case finished:
clearButtons(); clearButtons();
break; break;
@ -311,25 +272,22 @@ public class SpielFrame extends JFrame {
frame.setSize(300, 150); frame.setSize(300, 150);
frame.setLayout(null); frame.setLayout(null);
<<<<<<< HEAD // JLabel jl = new JLabel(String.format("%d - %d", player / 2, player % 2));
JLabel jl = new JLabel(String.format("%d - %d", player / 2, player % 2)); // jl.setBounds(50, 30, 200, 25);
jl.setBounds(50, 30, 200, 25); // jl.setFont(new Font("Tahoma", Font.BOLD, 20));
jl.setFont(new Font("Tahoma", Font.BOLD, 20)); // frame.add(jl);
frame.add(jl); // frame.setVisible(true);
frame.setVisible(true);
} }
private int showPromotion() { public int showPromotion() {
final int[] result = { -1 }; final int[] result = { -1 };
JDialog dialog = new JDialog(this, "Wähle eine Figur", true); JDialog dialog = new JDialog(this, "Wähle eine Figur", true);
dialog.setLayout(new GridLayout(2, 2)); dialog.setLayout(new GridLayout(2, 2));
dialog.setSize(300, 200); dialog.setSize(300, 200);
int[] pictures = { 81, 82, 66, 78, 113, 114, 98, 110 }; int[] pictures = { 81, 82, 66, 78, 113, 114, 98, 110 };
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
int index = (game.getActivePlayer() - 1) * 4 + i; int index = (game.getActivePlayer() - 1) * 4 + i;
JButton jb = new JButton(); JButton jb = new JButton();
@ -349,15 +307,6 @@ public class SpielFrame extends JFrame {
return result[0]; return result[0];
} }
=======
JLabel jl = new JLabel("1/2 - 1/2");
jl.setBounds(50, 30, 200, 25);
jl.setFont(new Font("Tahoma", Font.BOLD, 20));
frame.add(jl);
frame.setVisible(true);
}
public void showWin(int player) { public void showWin(int player) {
JFrame frame = new JFrame("Result"); JFrame frame = new JFrame("Result");
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
@ -370,6 +319,5 @@ public class SpielFrame extends JFrame {
frame.add(jl); frame.add(jl);
frame.setVisible(true); frame.setVisible(true);
} }
>>>>>>> branch 'buttonActions' of https://gitty.informatik.hs-mannheim.de/3020772/Schach.git
} }