diff --git a/src/main/java/name/nathanmcrae/numbersstation/AddPrefixController.java b/src/main/java/name/nathanmcrae/numbersstation/AddPrefixController.java index 8ffcc21..f178fa0 100644 --- a/src/main/java/name/nathanmcrae/numbersstation/AddPrefixController.java +++ b/src/main/java/name/nathanmcrae/numbersstation/AddPrefixController.java @@ -20,14 +20,14 @@ private Button cancelButton; private int digitsPerGroup; - private MainSettingsController mainSettingsController; + private StationSettingsController stationSettingsController; public void setDigitsPerGroup(int newDigitsPerGroup) { digitsPerGroup = newDigitsPerGroup; } - public void setMainSettingsController(MainSettingsController mainSettingsController) { - this.mainSettingsController = mainSettingsController; + public void setStationSettingsController(StationSettingsController stationSettingsController) { + this.stationSettingsController = stationSettingsController; } @FXML @@ -129,7 +129,7 @@ private void handleOkButtonPress() { String prefix = prefixField.getText(); if (prefix != null && !prefix.isEmpty()) { - mainSettingsController.addPrefix(prefix.replaceAll(" ", "")); + stationSettingsController.addPrefix(prefix.replaceAll(" ", "")); closeWindow(); } } diff --git a/src/main/java/name/nathanmcrae/numbersstation/MainController.java b/src/main/java/name/nathanmcrae/numbersstation/MainController.java index 79ac7cf..044c8da 100644 --- a/src/main/java/name/nathanmcrae/numbersstation/MainController.java +++ b/src/main/java/name/nathanmcrae/numbersstation/MainController.java @@ -54,10 +54,10 @@ public class MainController implements Initializable { if (settingsStage == null || !settingsStage.isShowing()) { try { - FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("MainSettingsView.fxml")); + FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("StationSettingsView.fxml")); Parent root = fxmlLoader.load(); - MainSettingsController controller = fxmlLoader.getController(); + StationSettingsController controller = fxmlLoader.getController(); if (selectedStation == null) { Alert alert = new Alert(Alert.AlertType.WARNING); alert.setTitle("Invalid Station Selected"); diff --git a/src/main/java/name/nathanmcrae/numbersstation/MainSettingsController.java b/src/main/java/name/nathanmcrae/numbersstation/StationSettingsController.java similarity index 99% rename from src/main/java/name/nathanmcrae/numbersstation/MainSettingsController.java rename to src/main/java/name/nathanmcrae/numbersstation/StationSettingsController.java index 6a8e834..5d02a80 100644 --- a/src/main/java/name/nathanmcrae/numbersstation/MainSettingsController.java +++ b/src/main/java/name/nathanmcrae/numbersstation/StationSettingsController.java @@ -42,7 +42,7 @@ import javafx.stage.Modality; import javafx.stage.Stage; import javafx.util.Callback; -public class MainSettingsController { +public class StationSettingsController { private IntegerProperty digitsPerGroup = new SimpleIntegerProperty(); private StringProperty externalProgramCommand = new SimpleStringProperty(); private BooleanProperty manageScheduleExternally = new SimpleBooleanProperty(); @@ -120,7 +120,7 @@ public class MainSettingsController { @FXML private RadioButton weeklyRadioButton; - public MainSettingsController() { } + public StationSettingsController() { } @FXML private void initialize() { @@ -331,7 +331,7 @@ public class MainSettingsController { Parent root = loader.load(); AddPrefixController controller = loader.getController(); - controller.setMainSettingsController(this); + controller.setStationSettingsController(this); controller.setDigitsPerGroup(settings.getDigitsPerGroup()); Stage stage = new Stage(); diff --git a/src/main/java/name/nathanmcrae/numbersstation/MainSettingsView.fxml b/src/main/java/name/nathanmcrae/numbersstation/StationSettingsView.fxml similarity index 99% rename from src/main/java/name/nathanmcrae/numbersstation/MainSettingsView.fxml rename to src/main/java/name/nathanmcrae/numbersstation/StationSettingsView.fxml index a02e25c..f138b1e 100644 --- a/src/main/java/name/nathanmcrae/numbersstation/MainSettingsView.fxml +++ b/src/main/java/name/nathanmcrae/numbersstation/StationSettingsView.fxml @@ -18,7 +18,7 @@ - +