From c6321cc58852d16450015535915ae74b45ed6c83 Mon Sep 17 00:00:00 2001 From: Joshua Perry <45966243+jpez-development@users.noreply.github.com> Date: Thu, 2 Feb 2023 17:27:19 +0000 Subject: [PATCH] updates --- .../java/com/r0r5chach/CompetitorList.java | 1 - src/main/java/com/r0r5chach/Manager.java | 23 +++++++++++++++++-- src/main/java/module-info.java | 1 + 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/r0r5chach/CompetitorList.java b/src/main/java/com/r0r5chach/CompetitorList.java index be3dad0..5d6f953 100644 --- a/src/main/java/com/r0r5chach/CompetitorList.java +++ b/src/main/java/com/r0r5chach/CompetitorList.java @@ -10,7 +10,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Scanner; - import com.r0r5chach.competitor.Competitor; import com.r0r5chach.competitor.Name; import com.r0r5chach.competitor.Rank; diff --git a/src/main/java/com/r0r5chach/Manager.java b/src/main/java/com/r0r5chach/Manager.java index ea1bee8..4dd0256 100644 --- a/src/main/java/com/r0r5chach/Manager.java +++ b/src/main/java/com/r0r5chach/Manager.java @@ -3,8 +3,12 @@ import java.io.File; import javafx.application.Application; import java.io.IOException; + +import com.r0r5chach.controllers.MainController; + import javafx.fxml.FXMLLoader; import javafx.scene.Parent; +import javafx.stage.Popup; import javafx.stage.Stage; import javafx.scene.Scene; import static com.r0r5chach.CompetitorList.createErrorLog; @@ -12,12 +16,15 @@ import static com.r0r5chach.CompetitorList.createErrorLog; public class Manager extends Application { private static Scene scene; + private static Stage stage; + private static Popup filters; @Override public void start(Stage stage) throws IOException { scene = new Scene(loadFXML("main"), 640, 480); - stage.setScene(scene); - stage.show(); + Manager.stage = stage; + Manager.stage.setScene(scene); + Manager.stage.show(); } @Override @@ -56,4 +63,16 @@ public class Manager extends Application { } return competitors; } + + public static void filtersOpen() throws IOException { + filters = new Popup(); + FXMLLoader loader = new FXMLLoader(Manager.class.getResource("pages/filters.fxml")); + filters.getContent().add((Parent)loader.load()); + filters.show(Manager.stage); + } + + public static void filtersClose() { + filters.hide(); + } + } diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 05e8976..85ebbf4 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -5,6 +5,7 @@ module com.r0r5chach { opens com.r0r5chach to javafx.fxml; opens com.r0r5chach.pages to javafx.base; + opens com.r0r5chach.controllers to javafx.fxml; exports com.r0r5chach; exports com.r0r5chach.competitor; exports com.r0r5chach.competitor.r6;