mirror of
https://github.com/2OOP/pism.git
synced 2026-02-04 19:04:49 +00:00
Formatting
This commit is contained in:
@@ -52,7 +52,11 @@ public class LocalGameSelector extends JFrame {
|
|||||||
deleteSave = new JButton("Delete Save");
|
deleteSave = new JButton("Delete Save");
|
||||||
panel1.add(deleteSave);
|
panel1.add(deleteSave);
|
||||||
deleteSave.setEnabled(false);
|
deleteSave.setEnabled(false);
|
||||||
deleteSave.addActionListener(e -> {tttBoard = null; deleteSave.setEnabled(false);});
|
deleteSave.addActionListener(
|
||||||
|
e -> {
|
||||||
|
tttBoard = null;
|
||||||
|
deleteSave.setEnabled(false);
|
||||||
|
});
|
||||||
|
|
||||||
cards.add(panel1, "MainMenu");
|
cards.add(panel1, "MainMenu");
|
||||||
|
|
||||||
|
|||||||
@@ -125,7 +125,9 @@ public class RemoteGameSelector {
|
|||||||
// } // TODO: Better error handling to not crash the system.
|
// } // TODO: Better error handling to not crash the system.
|
||||||
|
|
||||||
frame.remove(mainMenu);
|
frame.remove(mainMenu);
|
||||||
localTicTacToe = LocalTicTacToe.createRemote(ipTextField.getText(), portTextField.getText());
|
localTicTacToe =
|
||||||
|
LocalTicTacToe.createRemote(
|
||||||
|
ipTextField.getText(), portTextField.getText());
|
||||||
UIGameBoard ttt = new UIGameBoard(localTicTacToe, this); // TODO: Fix later
|
UIGameBoard ttt = new UIGameBoard(localTicTacToe, this); // TODO: Fix later
|
||||||
frame.add(ttt.getTTTPanel()); // TODO: Fix later
|
frame.add(ttt.getTTTPanel()); // TODO: Fix later
|
||||||
frame.revalidate();
|
frame.revalidate();
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package org.toop.frontend.UI;
|
|||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
import java.awt.event.ActionEvent;
|
import java.awt.event.ActionEvent;
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
import org.toop.frontend.games.LocalTicTacToe;
|
import org.toop.frontend.games.LocalTicTacToe;
|
||||||
@@ -50,8 +49,7 @@ public class UIGameBoard {
|
|||||||
// Game now gets reset in local
|
// Game now gets reset in local
|
||||||
if (parentLocal) {
|
if (parentLocal) {
|
||||||
((LocalGameSelector) parent).showMainMenu();
|
((LocalGameSelector) parent).showMainMenu();
|
||||||
}
|
} else {
|
||||||
else{
|
|
||||||
((RemoteGameSelector) parent).showMainMenu();
|
((RemoteGameSelector) parent).showMainMenu();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -92,12 +90,18 @@ public class UIGameBoard {
|
|||||||
}
|
}
|
||||||
this.localTicTacToe.move(index);
|
this.localTicTacToe.move(index);
|
||||||
cells[index].setText(currentPlayer);
|
cells[index].setText(currentPlayer);
|
||||||
}
|
} else {
|
||||||
else{
|
logger.info(
|
||||||
logger.info("Player " + currentPlayerIndex + " attempted invalid move at: " + cells[index].getText());
|
"Player "
|
||||||
|
+ currentPlayerIndex
|
||||||
|
+ " attempted invalid move at: "
|
||||||
|
+ cells[index].getText());
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
logger.info("Player " + currentPlayerIndex + " attempted to move after the game has ended.");
|
logger.info(
|
||||||
|
"Player "
|
||||||
|
+ currentPlayerIndex
|
||||||
|
+ " attempted to move after the game has ended.");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -109,18 +113,16 @@ public class UIGameBoard {
|
|||||||
System.out.println(cells[index].getText());
|
System.out.println(cells[index].getText());
|
||||||
cells[index].setText(move);
|
cells[index].setText(move);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setState(GameBase.State state, String playerMove) {
|
public void setState(GameBase.State state, String playerMove) {
|
||||||
Color color;
|
Color color;
|
||||||
if (state == GameBase.State.WIN && playerMove.equals(currentPlayer)) {
|
if (state == GameBase.State.WIN && playerMove.equals(currentPlayer)) {
|
||||||
color = new Color(160, 220, 160);
|
color = new Color(160, 220, 160);
|
||||||
}
|
} else if (state == GameBase.State.WIN) {
|
||||||
else if (state == GameBase.State.WIN) {
|
|
||||||
color = new Color(220, 160, 160);
|
color = new Color(220, 160, 160);
|
||||||
}
|
} else if (state == GameBase.State.DRAW) {
|
||||||
else if (state == GameBase.State.DRAW){
|
|
||||||
color = new Color(220, 220, 160);
|
color = new Color(220, 220, 160);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
color = new Color(220, 220, 220);
|
color = new Color(220, 220, 220);
|
||||||
}
|
}
|
||||||
for (JButton cell : cells) {
|
for (JButton cell : cells) {
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ import org.toop.eventbus.Events;
|
|||||||
import org.toop.eventbus.GlobalEventBus;
|
import org.toop.eventbus.GlobalEventBus;
|
||||||
import org.toop.frontend.UI.UIGameBoard;
|
import org.toop.frontend.UI.UIGameBoard;
|
||||||
import org.toop.game.tictactoe.GameBase;
|
import org.toop.game.tictactoe.GameBase;
|
||||||
import org.toop.game.tictactoe.ai.MinMaxTicTacToe;
|
|
||||||
import org.toop.game.tictactoe.TicTacToe;
|
import org.toop.game.tictactoe.TicTacToe;
|
||||||
|
import org.toop.game.tictactoe.ai.MinMaxTicTacToe;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A representation of a local tic-tac-toe game. Calls are made to a server for information about
|
* A representation of a local tic-tac-toe game. Calls are made to a server for information about
|
||||||
@@ -208,11 +208,15 @@ public class LocalTicTacToe { // TODO: Implement runnable
|
|||||||
if (this.playersTurn == 0 && !isAiPlayer[0]) {
|
if (this.playersTurn == 0 && !isAiPlayer[0]) {
|
||||||
this.moveQueuePlayerA.put(moveIndex);
|
this.moveQueuePlayerA.put(moveIndex);
|
||||||
logger.info(
|
logger.info(
|
||||||
"Adding player's {}, move: {}", this.playersTurn, moveIndex);
|
"Adding player's {}, move: {} to queue A",
|
||||||
|
this.playersTurn,
|
||||||
|
moveIndex);
|
||||||
} else if (this.playersTurn == 1 && !isAiPlayer[1]) {
|
} else if (this.playersTurn == 1 && !isAiPlayer[1]) {
|
||||||
this.moveQueuePlayerB.put(moveIndex);
|
this.moveQueuePlayerB.put(moveIndex);
|
||||||
logger.info(
|
logger.info(
|
||||||
"Adding player's {}, move: {}", this.playersTurn, moveIndex);
|
"Adding player's {}, move: {} to queue B",
|
||||||
|
this.playersTurn,
|
||||||
|
moveIndex);
|
||||||
}
|
}
|
||||||
} catch (InterruptedException e) {
|
} catch (InterruptedException e) {
|
||||||
logger.error(
|
logger.error(
|
||||||
@@ -235,10 +239,7 @@ public class LocalTicTacToe { // TODO: Implement runnable
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
logger.info(
|
logger.info(
|
||||||
"Received message from "
|
"Received message from {}: {}", this.connectionId, receivedMessage.message());
|
||||||
+ this.connectionId
|
|
||||||
+ ": "
|
|
||||||
+ receivedMessage.message());
|
|
||||||
this.receivedQueue.put(receivedMessage.message());
|
this.receivedQueue.put(receivedMessage.message());
|
||||||
} catch (InterruptedException e) {
|
} catch (InterruptedException e) {
|
||||||
logger.error("Error waiting for received Message", e);
|
logger.error("Error waiting for received Message", e);
|
||||||
|
|||||||
Reference in New Issue
Block a user