From 2a7a7c81e366461d8c73d114c5916351672b8625 Mon Sep 17 00:00:00 2001 From: Joshua Perry <45966243+jpez-development@users.noreply.github.com> Date: Sun, 5 Feb 2023 20:48:17 +0000 Subject: [PATCH] updated method order --- .../r0r5chach/controllers/EditController.java | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/r0r5chach/controllers/EditController.java b/src/main/java/com/r0r5chach/controllers/EditController.java index d346d20..caea892 100644 --- a/src/main/java/com/r0r5chach/controllers/EditController.java +++ b/src/main/java/com/r0r5chach/controllers/EditController.java @@ -129,6 +129,36 @@ public class EditController extends Controller { loadEdit(); }); } + /** + * Loads the edit View elements with their appropriate data + */ + public void loadEdit() { + competitorsList.setItems(FXCollections.observableList(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()))); + } + /** + * Gets the player selected in the competitors list and loads the player in the editing area of the edit View + */ + @FXML //Triggered when new list item is selected + private void getCompetitor() { + Competitor player = competitors.getCompetitors().get(competitorIds.indexOf(competitorsList.getSelectionModel().getSelectedItem())); + loadPlayer(player); + } + /** + * Updates the player that is loaded in the editing area of the edit View + */ + @FXML //Triggered when the update button is pressed + private void updateCompetitor() { + int playerIndex = competitorIds.indexOf(competitorsList.getSelectionModel().getSelectedItem()); + Competitor player = competitors.getCompetitors().get(playerIndex); + updatePlayer(player); + competitorIds.set(playerIndex, player.getPlayerNumber()); + loadEdit(); + loadPlayer(player); + } /** * Loads the selected player into the editing area of the edit View * @param player The player to load into the editing area @@ -207,34 +237,4 @@ public class EditController extends Controller { } player.setScores(newScores); } - /** - * Gets the player selected in the competitors list and loads the player in the editing area of the edit View - */ - @FXML //Triggered when new list item is selected - private void getCompetitor() { - Competitor player = competitors.getCompetitors().get(competitorIds.indexOf(competitorsList.getSelectionModel().getSelectedItem())); - loadPlayer(player); - } - /** - * Updates the player that is loaded in the editing area of the edit View - */ - @FXML //Triggered when the update button is pressed - private void updateCompetitor() { - int playerIndex = competitorIds.indexOf(competitorsList.getSelectionModel().getSelectedItem()); - Competitor player = competitors.getCompetitors().get(playerIndex); - updatePlayer(player); - competitorIds.set(playerIndex, player.getPlayerNumber()); - loadEdit(); - loadPlayer(player); - } - /** - * Loads the edit View elements with their appropriate data - */ - public void loadEdit() { - competitorsList.setItems(FXCollections.observableList(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()))); - } } \ No newline at end of file