Code refactored lil bit

akgarg0472 · Mar 8, 2023 · f0b18f6 · f0b18f6
1 parent df9ec46
commit f0b18f6
Show file tree

Hide file tree

Showing 9 changed files with 210 additions and 285 deletions.
diff --git a/src/TicTacToeJavaFX/GameBoard.fxml b/src/TicTacToeJavaFX/GameBoard.fxml
@@ -1,27 +1,31 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<BorderPane fx:controller="TicTacToeJavaFX.GameBoardController"
-            xmlns:fx="http://javafx.com/fxml">
+<BorderPane xmlns:fx="http://javafx.com/fxml"
+            fx:controller="TicTacToeJavaFX.GameBoardController">
     <center>
         <VBox>
             <HBox>
-                <Button fx:id="btn1"></Button>
-                <Button fx:id="btn2"></Button>
-                <Button fx:id="btn3"></Button>
+                <Button fx:id="btn1"/>
+                <Button fx:id="btn2"/>
+                <Button fx:id="btn3"/>
             </HBox>
+
             <HBox>
-                <Button fx:id="btn4"></Button>
-                <Button fx:id="btn5"></Button>
-                <Button fx:id="btn6"></Button>
+                <Button fx:id="btn4"/>
+                <Button fx:id="btn5"/>
+                <Button fx:id="btn6"/>
             </HBox>
+
             <HBox>
-                <Button fx:id="btn7"></Button>
-                <Button fx:id="btn8"></Button>
-                <Button fx:id="btn9"></Button>
+                <Button fx:id="btn7"/>
+                <Button fx:id="btn8"/>
+                <Button fx:id="btn9"/>
             </HBox>
         </VBox>
     </center>
+
     <bottom>
-        <Label fx:id="bottomCopyrightLabel" text="©Akhilesh Garg" BorderPane.alignment="BOTTOM_CENTER"></Label>
+        <Label fx:id="bottomCopyrightLabel" text="©Akhilesh Garg" BorderPane.alignment="BOTTOM_CENTER"/>
     </bottom>
+
 </BorderPane>
diff --git a/src/TicTacToeJavaFX/GameBoardController.java b/src/TicTacToeJavaFX/GameBoardController.java
diff --git a/src/TicTacToeJavaFX/GameResult.fxml b/src/TicTacToeJavaFX/GameResult.fxml
@@ -4,8 +4,8 @@
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
-<BorderPane fx:id="myid" xmlns="http://javafx.com/javafx"
-            xmlns:fx="http://javafx.com/fxml"
+<BorderPane xmlns:fx="http://javafx.com/fxml" fx:id="myid"
+            xmlns="http://javafx.com/javafx"
             fx:controller="TicTacToeJavaFX.GameResultController"
             prefHeight="400.0" prefWidth="600.0">
 

diff --git a/src/TicTacToeJavaFX/GameResultController.java b/src/TicTacToeJavaFX/GameResultController.java
@@ -11,7 +11,10 @@
 import javafx.scene.text.FontWeight;
 
 import java.io.IOException;
+import java.net.URL;
+import java.util.Objects;
 
+@SuppressWarnings("UnusedDeclaration")
 public class GameResultController {
 
     @FXML
@@ -27,8 +30,30 @@ public class GameResultController {
     @FXML
     private Button exitGameButton;
 
+    public void initialize() {
+        this.playAgainButton.setOnMouseClicked(new EventHandler<MouseEvent>() {
+            @Override
+            public void handle(MouseEvent event) {
+                try {
+                    final URL welcomeScreenResource = getClass().getResource("WelcomeScreen.fxml");
+                    Objects.requireNonNull(welcomeScreenResource, "Error loading game welcome screen");
+
+                    Main.getPrimaryStage().setScene(new Scene(
+                            FXMLLoader.load(welcomeScreenResource),
+                            Main.STAGE_DEFAULT_WIDTH,
+                            Main.STAGE_DEFAULT_HEIGHT
+                    ));
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+
+        exitGameButton.setOnMouseClicked(event -> Main.getPrimaryStage().close());
+    }
+
     // this method dynamically update the content of the final result scene of the game according to the game result
-    void setGameResultText(String gameResultText1, String winner) {
+    void setGameResultText(final String gameResultText1, final String winner) {
         if (gameResultText1.equals("Draw")) {
             gameOverLabel.setFont(Font.font("Algerian", FontWeight.BOLD, 45));
             congratsLabel.setFont(new Font(35));
@@ -53,24 +78,4 @@ void setGameResultText(String gameResultText1, String winner) {
         }
     }
 
-    public void initialize() {
-        playAgainButton.setOnMouseClicked(new EventHandler<MouseEvent>() {
-            @Override
-            public void handle(MouseEvent event) {
-                try {
-                    Main.getPrimaryStage().setScene(new Scene
-                            (FXMLLoader.load(getClass().getResource("WelcomeScreen.fxml")), Main.STAGE_DEFAULT_WIDTH, Main.STAGE_DEFAULT_HEIGHT));
-                } catch (IOException exception) {
-                    exception.printStackTrace();
-                }
-            }
-        });
-
-        exitGameButton.setOnMouseClicked(new EventHandler<MouseEvent>() {
-            @Override
-            public void handle(MouseEvent event) {
-                Main.getPrimaryStage().close();
-            }
-        });
-    }
-}
+}
diff --git a/src/TicTacToeJavaFX/Main.java b/src/TicTacToeJavaFX/Main.java
@@ -6,10 +6,13 @@
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 
+import java.net.URL;
+import java.util.Objects;
+
 public class Main extends Application {
 
-    static final int STAGE_DEFAULT_WIDTH = 300;
-    static final int STAGE_DEFAULT_HEIGHT = 300;
+    static final double STAGE_DEFAULT_WIDTH = 350;
+    static final double STAGE_DEFAULT_HEIGHT = 350;
     static final int BUTTON_DEFAULT_FONT_SIZE = 40;
 
     private static Stage stage;
@@ -26,11 +29,14 @@ public static void main(String[] args) {
     @Override
     public void start(Stage primaryStage) throws Exception {
         stage = primaryStage;
-        Parent root = FXMLLoader.load(getClass().getResource("WelcomeScreen.fxml"));
+        final URL mainResource = getClass().getResource("WelcomeScreen.fxml");
+        Objects.requireNonNull(mainResource, "Error in initializing game board. System error occurred.");
+        final Parent screen = FXMLLoader.load(mainResource);
         primaryStage.setTitle("Tic Tac Toe");
-        Scene scene = new Scene(root, STAGE_DEFAULT_WIDTH, STAGE_DEFAULT_HEIGHT);
+        final Scene scene = new Scene(screen, STAGE_DEFAULT_WIDTH, STAGE_DEFAULT_HEIGHT);
         primaryStage.setScene(scene);
         primaryStage.setResizable(false);
         primaryStage.show();
     }
+
 }
diff --git a/src/TicTacToeJavaFX/Utils.java b/src/TicTacToeJavaFX/Utils.java
@@ -0,0 +1,17 @@
+package TicTacToeJavaFX;
+
+/**
+ * @author Akhilesh Garg
+ * @since 08-03-2023
+ */
+final class Utils {
+
+    private Utils() {
+        throw new UnsupportedOperationException();
+    }
+
+    static boolean isStringValid(final String str) {
+        return str != null && !str.trim().isEmpty();
+    }
+
+}
diff --git a/src/TicTacToeJavaFX/WelcomeScreen.fxml b/src/TicTacToeJavaFX/WelcomeScreen.fxml
@@ -2,8 +2,8 @@
 
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<GridPane xmlns="http://javafx.com/javafx"
-          xmlns:fx="http://javafx.com/fxml"
+<GridPane xmlns:fx="http://javafx.com/fxml"
+          xmlns="http://javafx.com/javafx"
           fx:controller="TicTacToeJavaFX.WelcomeScreenController"
           prefHeight="400.0" prefWidth="600.0">
 

diff --git a/src/TicTacToeJavaFX/WelcomeScreenController.java b/src/TicTacToeJavaFX/WelcomeScreenController.java
@@ -11,45 +11,45 @@
 import javafx.scene.text.Font;
 
 import java.io.IOException;
+import java.net.URL;
+import java.util.Objects;
 
+@SuppressWarnings("UnusedDeclaration")
 public class WelcomeScreenController {
 
+    private static final String PLAYER_ONE_DEFAULT_NAME = "Player 1";
+    private static final String PLAYER_TWO_DEFAULT_NAME = "Player 2";
     private static final Font font = new Font(14);
+
     private static String playerOneName;
     private static String playerTwoName;
     private static String playerOneSymbol;
     private static String playerTwoSymbol;
     private static String playerOneColor;
     private static String playerTwoColor;
 
-    private ToggleGroup toggleGroup;
     @FXML
     private Label playerOneNameLabel;
     @FXML
     private TextField playerOneNameField;
-
     @FXML
     private Label playerTwoNameLabel;
     @FXML
     private TextField playerTwoNameField;
-
     @FXML
     private Label playerOneSymbolLabel;
     @FXML
     private RadioButton crossSymbol;
     @FXML
     private RadioButton zeroSymbol;
-
     @FXML
     private Label playerOneColorLabel;
     @FXML
     private ColorPicker playerOneColorPicker;
-
     @FXML
     private Label playerTwoColorLabel;
     @FXML
     private ColorPicker playerTwoColorPicker;
-
     @FXML
     private Button startGameButton;
 
@@ -78,10 +78,13 @@ static String getPlayerTwoColor() {
     }
 
     public void initialize() {
-        toggleGroup = new ToggleGroup();
+        final ToggleGroup toggleGroup = new ToggleGroup();
         crossSymbol.setToggleGroup(toggleGroup);
         zeroSymbol.setToggleGroup(toggleGroup);
 
+        playerOneName = PLAYER_ONE_DEFAULT_NAME;
+        playerTwoName = PLAYER_TWO_DEFAULT_NAME;
+
         playerOneNameLabel.setFont(font);
         playerTwoNameLabel.setFont(font);
         playerOneSymbolLabel.setFont(font);
@@ -91,11 +94,18 @@ public void initialize() {
         playerOneColorPicker.setValue(Color.BLACK);
         playerTwoColorPicker.setValue(Color.BLACK);
 
-        startGameButton.setOnAction(new EventHandler<ActionEvent>() {
+        this.startGameButton.setOnAction(new EventHandler<ActionEvent>() {
             @Override
             public void handle(ActionEvent actionEvent) {
-                playerOneName = playerOneNameField.getText();
-                playerTwoName = playerTwoNameField.getText();
+                final String _playerOneName = playerOneNameField.getText();
+                if (Utils.isStringValid(_playerOneName)) {
+                    playerOneName = _playerOneName;
+                }
+
+                final String _playerTwoName = playerTwoNameField.getText();
+                if (Utils.isStringValid(_playerTwoName)) {
+                    playerTwoName = _playerTwoName;
+                }
 
                 if (crossSymbol.isSelected()) {
                     playerOneSymbol = "X";
@@ -109,13 +119,16 @@ public void handle(ActionEvent actionEvent) {
                 playerTwoColor = playerTwoColorPicker.getValue().toString();
 
                 try {
-                    Parent root = FXMLLoader.load(getClass().getResource("GameBoard.fxml"));
-                    Scene scene = new Scene(root, Main.STAGE_DEFAULT_WIDTH, Main.STAGE_DEFAULT_HEIGHT);
+                    final URL gameBoardResource = getClass().getResource("GameBoard.fxml");
+                    Objects.requireNonNull(gameBoardResource, "Error loading game board screen");
+                    final Parent root = FXMLLoader.load(gameBoardResource);
+                    final Scene scene = new Scene(root, Main.STAGE_DEFAULT_WIDTH, Main.STAGE_DEFAULT_HEIGHT);
                     Main.getPrimaryStage().setScene(scene);
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
             }
         });
     }
-}
+
+}
diff --git a/src/module-info.java b/src/module-info.java
@@ -1,7 +1,6 @@
-module SampleJavaFX {
-
-    requires javafx.fxml;
-    requires javafx.controls;
-
-    opens TicTacToeJavaFX;
-}
+//module SampleJavaFX {
+//    requires jfxrt;
+//    requires rt;
+//
+//    opens TicTacToeJavaFX;
+//}