r0r-5chach/CSY2030-assignment-2
r0r-5chach
/
CSY2030-assignment-2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

This commit is contained in:
Joshua Perry 2023-02-01 15:33:30 +00:00
parent 3129206188
commit b667265472
6 changed files with 49 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/com/r0r5chach/MainController.java
View File

@ -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<Competitor> 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<Competitor,Integer>("Player Number"));
competitorTable.getColumns().add(new TableColumn<Competitor,String>("Player Name"));
competitorTable.getColumns().add(new TableColumn<Competitor,Rank>("Player Rank"));
competitorTable.getColumns().add(new TableColumn<Competitor,int[]>("Player Scores"));
}
private void loadPlayer(Competitor player) {
this.playerNumber.setText(String.valueOf(player.getPlayerNumber()));
this.playerName.setText(player.getPlayerName().getFullName());

8
src/main/java/com/r0r5chach/Manager.java
View File

@ -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.<MainController>getController();
controller.setCompetitors(createList());
break;
}
MainController controller = fxmlLoader.<MainController>getController();
controller.setCompetitors(createList());
return root;
}

0
src/main/java/org/r0r5chach/CompetitorList.java Normal file
View File

28
src/main/resources/com/r0r5chach/main.fxml
View File

@ -7,6 +7,7 @@
<?import javafx.scene.control.SplitPane?>
<?import javafx.scene.control.Tab?>
<?import javafx.scene.control.TabPane?>
<?import javafx.scene.control.TableView?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.ColumnConstraints?>
@ -19,15 +20,20 @@
<children>
<TabPane prefHeight="406.0" prefWidth="600.0" tabClosingPolicy="UNAVAILABLE">
<tabs>
<Tab text="Edit">
<Tab text="Home">
<content>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
</content>
</Tab>
<Tab onSelectionChanged="#loadEdit" text="Edit">
<content>
<SplitPane dividerPositions="0.29" prefHeight="254.0" prefWidth="600.0">
<SplitPane dividerPositions="0.3016666666666667" prefHeight="254.0" prefWidth="600.0">
<items>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
<VBox maxHeight="-Infinity" maxWidth="-Infinity" prefHeight="371.0" prefWidth="212.0">
<children>
<ListView fx:id="competitorsList" onMouseClicked="#getCompetitor" prefHeight="398.0" prefWidth="175.0" />
<ListView fx:id="competitorsList" onMouseClicked="#getCompetitor" prefHeight="371.0" prefWidth="193.0" />
</children>
</AnchorPane>
</VBox>
<GridPane>
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="204.0" minWidth="10.0" prefWidth="127.0" />
@ -144,11 +150,19 @@
</SplitPane>
</content>
</Tab>
<Tab text="View">
<Tab onSelectionChanged="#loadView" text="View">
<content>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
<children>
<TableView fx:id="competitorTable" prefHeight="373.0" prefWidth="600.0" />
</children></AnchorPane>
</content>
</Tab>
<Tab text="Report">
<content>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
</content>
</Tab>
</tabs>
</TabPane>
</children>

27
src/test/java/com/r0r5chach/MainTest.java
View File

@ -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());
}
}

22
src/test/java/com/r0r5chach/ManagerTest.java
View File

@ -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() {