From b667265472a8ad8e138fcc170f08f56eb2d822ce Mon Sep 17 00:00:00 2001 From: Joshua Perry <45966243+jpez-development@users.noreply.github.com> Date: Wed, 1 Feb 2023 15:33:30 +0000 Subject: [PATCH] update --- .../java/com/r0r5chach/MainController.java | 30 +++++++++++++++---- src/main/java/com/r0r5chach/Manager.java | 8 ++--- .../java/org/r0r5chach/CompetitorList.java | 0 src/main/resources/com/r0r5chach/main.fxml | 28 ++++++++++++----- src/test/java/com/r0r5chach/MainTest.java | 27 ----------------- src/test/java/com/r0r5chach/ManagerTest.java | 22 ++------------ 6 files changed, 49 insertions(+), 66 deletions(-) create mode 100644 src/main/java/org/r0r5chach/CompetitorList.java delete mode 100644 src/test/java/com/r0r5chach/MainTest.java diff --git a/src/main/java/com/r0r5chach/MainController.java b/src/main/java/com/r0r5chach/MainController.java index 4402a45..330a759 100644 --- a/src/main/java/com/r0r5chach/MainController.java +++ b/src/main/java/com/r0r5chach/MainController.java @@ -11,12 +11,15 @@ import com.r0r5chach.r6.R6Player; import com.r0r5chach.valorant.ValorantAgent; import com.r0r5chach.valorant.ValorantPlayer; +import javafx.application.Platform; import javafx.collections.FXCollections; import javafx.fxml.FXML; import javafx.fxml.Initializable; import javafx.scene.control.Button; import javafx.scene.control.ChoiceBox; import javafx.scene.control.ListView; +import javafx.scene.control.TableColumn; +import javafx.scene.control.TableView; import javafx.scene.control.TextField; import javafx.scene.text.Text; @@ -74,11 +77,17 @@ public class MainController implements Initializable { @FXML Button updateButton; + @FXML + TableView competitorTable; + @Override public void initialize(URL url, ResourceBundle rb) { - loadCompetitors(); - this.scores = new TextField[]{scores0, scores1, scores2, scores3, scores4, scores5}; - loadView(); + Platform.runLater(() -> { + this.scores = new TextField[]{scores0, scores1, scores2, scores3, scores4, scores5}; + loadCompetitors(); + loadEdit(); + }); + } public void setCompetitors(CompetitorList list) { @@ -97,7 +106,7 @@ public class MainController implements Initializable { Competitor player = this.competitors.getCompetitors().get(playerIndex); updatePlayer(player); competitorIds.set(playerIndex, player.getPlayerNumber()); - loadView(); + loadEdit(); loadPlayer(player); } @@ -108,14 +117,23 @@ public class MainController implements Initializable { } } - private void loadView() { - competitorsList.setItems(FXCollections.observableArrayList(this.competitorIds)); + @FXML + private void loadEdit() { + competitorsList.setItems(FXCollections.observableList(this.competitorIds)); playerLevel.setItems(FXCollections.observableList(Arrays.asList(Rank.values()))); favoriteAttacker.setItems(FXCollections.observableList(Arrays.asList(R6Attacker.values()))); favoriteDefender.setItems(FXCollections.observableList(Arrays.asList(R6Defender.values()))); favoriteAgent.setItems(FXCollections.observableList(Arrays.asList(ValorantAgent.values()))); } + @FXML + private void loadView() { + competitorTable.getColumns().add(new TableColumn("Player Number")); + competitorTable.getColumns().add(new TableColumn("Player Name")); + competitorTable.getColumns().add(new TableColumn("Player Rank")); + competitorTable.getColumns().add(new TableColumn("Player Scores")); + } + private void loadPlayer(Competitor player) { this.playerNumber.setText(String.valueOf(player.getPlayerNumber())); this.playerName.setText(player.getPlayerName().getFullName()); diff --git a/src/main/java/com/r0r5chach/Manager.java b/src/main/java/com/r0r5chach/Manager.java index 0bfa867..6c4e7c5 100644 --- a/src/main/java/com/r0r5chach/Manager.java +++ b/src/main/java/com/r0r5chach/Manager.java @@ -27,12 +27,8 @@ public class Manager extends Application { private static Parent loadFXML(String fxml) throws IOException { FXMLLoader fxmlLoader = new FXMLLoader(Manager.class.getResource(fxml + ".fxml")); Parent root = fxmlLoader.load(); - switch(fxml) { - case "main": - MainController controller = fxmlLoader.getController(); - controller.setCompetitors(createList()); - break; - } + MainController controller = fxmlLoader.getController(); + controller.setCompetitors(createList()); return root; } diff --git a/src/main/java/org/r0r5chach/CompetitorList.java b/src/main/java/org/r0r5chach/CompetitorList.java new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/com/r0r5chach/main.fxml b/src/main/resources/com/r0r5chach/main.fxml index 0d51ee3..3689a10 100644 --- a/src/main/resources/com/r0r5chach/main.fxml +++ b/src/main/resources/com/r0r5chach/main.fxml @@ -7,6 +7,7 @@ + @@ -19,15 +20,20 @@ - + + + + + + - + - + - + - + @@ -144,11 +150,19 @@ - + - + + + + + + + + + diff --git a/src/test/java/com/r0r5chach/MainTest.java b/src/test/java/com/r0r5chach/MainTest.java deleted file mode 100644 index dff875e..0000000 --- a/src/test/java/com/r0r5chach/MainTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.r0r5chach; -import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.jupiter.api.Test; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.PrintStream; -import java.nio.file.Files; -import java.nio.file.Path; - -public class MainTest { - @Test - public void mainTest() { - ByteArrayOutputStream output = new ByteArrayOutputStream(); - ByteArrayOutputStream expected = new ByteArrayOutputStream(); - System.setOut(new PrintStream(expected)); - try { - System.out.println(Files.readString(Path.of("src/test/java/reportTest.txt"))); - } - catch (IOException e) { - System.out.println("File doesn't exist"); - } - System.setOut(new PrintStream(output)); - Main.main(new String[0]); - assertEquals(expected.toString(), output.toString()); - } -} diff --git a/src/test/java/com/r0r5chach/ManagerTest.java b/src/test/java/com/r0r5chach/ManagerTest.java index f471a7d..9ee62a3 100644 --- a/src/test/java/com/r0r5chach/ManagerTest.java +++ b/src/test/java/com/r0r5chach/ManagerTest.java @@ -1,29 +1,11 @@ package com.r0r5chach; -import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; - public class ManagerTest { - @Test - public void managerTest() { - Manager m = new Manager(); - assertEquals("Joshua Luke Perry", m.getCompetitors().getCompetitors().get(1).getPlayerName().getFullName()); - } + + - @Test - public void managerTestGetReport() { - try { - Manager m = new Manager(); - assertEquals(Files.readString(Path.of("src/test/java/reportTest.txt")), Files.readString(m.getReport().toPath())); - } - catch (IOException e) { - System.out.println("File does not exist"); - } - } @Test public void managerTestGetCompetitors() {