Compare commits
4 Commits
cb3f0b0938
...
7ba68c5ec1
Author | SHA1 | Date | |
---|---|---|---|
7ba68c5ec1 | |||
6e86e660a7 | |||
15192e04e4 | |||
59625b773c |
@ -1,8 +1,9 @@
|
|||||||
$Env:JAVA_HOME = "C:\Users\nathanm\Downloads\openjdk-23.0.1_windows-x64_bin\jdk-23.0.1"
|
$Env:JAVA_HOME = "C:\Users\nathanm\Downloads\openjdk-23.0.1_windows-x64_bin\jdk-23.0.1"
|
||||||
$Env:PATH = "C:\Users\nathanm\Downloads\openjdk-23.0.1_windows-x64_bin\jdk-23.0.1\bin;$($Env:PATH)"
|
$Env:PATH = "C:\Users\nathanm\Downloads\openjdk-23.0.1_windows-x64_bin\jdk-23.0.1\bin;$($Env:PATH)"
|
||||||
$Env:PATH_TO_FX="C:\Users\nathanm\Downloads\openjfx-23.0.1_windows-x64_bin-sdk\javafx-sdk-23.0.1\lib"
|
$Env:PATH_TO_FX="C:\Users\nathanm\Downloads\openjfx-23.0.1_windows-x64_bin-sdk\javafx-sdk-23.0.1\lib"
|
||||||
$modulePath = "$Env:PATH_TO_FX;P:\personal_root\projects\number-station\lib"
|
$modulePath = "$Env:PATH_TO_FX;$PSScriptRoot\lib"
|
||||||
$modules = $(
|
$modules = $(
|
||||||
|
"com.ctc.wstx",
|
||||||
"com.fasterxml.jackson.annotation",
|
"com.fasterxml.jackson.annotation",
|
||||||
"com.fasterxml.jackson.core",
|
"com.fasterxml.jackson.core",
|
||||||
"com.fasterxml.jackson.dataformat.xml",
|
"com.fasterxml.jackson.dataformat.xml",
|
||||||
|
3
run.ps1
3
run.ps1
@ -2,8 +2,9 @@ cd $PSScriptRoot
|
|||||||
$Env:JAVA_HOME = "C:\Users\nathanm\Downloads\openjdk-23.0.1_windows-x64_bin\jdk-23.0.1"
|
$Env:JAVA_HOME = "C:\Users\nathanm\Downloads\openjdk-23.0.1_windows-x64_bin\jdk-23.0.1"
|
||||||
$Env:PATH = "C:\Users\nathanm\Downloads\openjdk-23.0.1_windows-x64_bin\jdk-23.0.1\bin;$($Env:PATH)"
|
$Env:PATH = "C:\Users\nathanm\Downloads\openjdk-23.0.1_windows-x64_bin\jdk-23.0.1\bin;$($Env:PATH)"
|
||||||
$Env:PATH_TO_FX="C:\Users\nathanm\Downloads\openjfx-23.0.1_windows-x64_bin-sdk\javafx-sdk-23.0.1\lib"
|
$Env:PATH_TO_FX="C:\Users\nathanm\Downloads\openjfx-23.0.1_windows-x64_bin-sdk\javafx-sdk-23.0.1\lib"
|
||||||
$modulePath = "$Env:PATH_TO_FX;P:\personal_root\projects\number-station\lib"
|
$modulePath = "$Env:PATH_TO_FX;$PSScriptRoot\lib"
|
||||||
$modules = $(
|
$modules = $(
|
||||||
|
"com.ctc.wstx",
|
||||||
"com.fasterxml.jackson.annotation",
|
"com.fasterxml.jackson.annotation",
|
||||||
"com.fasterxml.jackson.core",
|
"com.fasterxml.jackson.core",
|
||||||
"com.fasterxml.jackson.dataformat.xml",
|
"com.fasterxml.jackson.dataformat.xml",
|
||||||
|
@ -51,6 +51,10 @@ public class Main extends Application {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void start(Stage primaryStage) throws Exception {
|
public void start(Stage primaryStage) throws Exception {
|
||||||
|
primaryStage.setOnCloseRequest(e -> {
|
||||||
|
Platform.exit();
|
||||||
|
});
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if (startParams.notification().isPresent()){
|
if (startParams.notification().isPresent()){
|
||||||
FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("NotificationView.fxml"));
|
FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("NotificationView.fxml"));
|
||||||
|
@ -110,6 +110,7 @@ public class MainSettings {
|
|||||||
XmlMapper xmlMapper = new XmlMapper();
|
XmlMapper xmlMapper = new XmlMapper();
|
||||||
xmlMapper.registerModule(new JavaTimeModule());
|
xmlMapper.registerModule(new JavaTimeModule());
|
||||||
xmlMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
|
xmlMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
|
||||||
|
xmlMapper.enable(SerializationFeature.INDENT_OUTPUT);
|
||||||
try {
|
try {
|
||||||
Path filePath = getSettingsFilePath();
|
Path filePath = getSettingsFilePath();
|
||||||
Path directoryPath = filePath.getParent();
|
Path directoryPath = filePath.getParent();
|
||||||
|
@ -3,6 +3,7 @@ package name.nathanmcrae.numbersstation;
|
|||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
import javafx.application.Platform;
|
||||||
import javafx.event.Event;
|
import javafx.event.Event;
|
||||||
import javafx.fxml.FXML;
|
import javafx.fxml.FXML;
|
||||||
import javafx.scene.control.Alert;
|
import javafx.scene.control.Alert;
|
||||||
@ -54,6 +55,7 @@ public class NotificationController {
|
|||||||
Node node = (Node) event.getSource();
|
Node node = (Node) event.getSource();
|
||||||
Stage stage = (Stage) node.getScene().getWindow();
|
Stage stage = (Stage) node.getScene().getWindow();
|
||||||
stage.close();
|
stage.close();
|
||||||
|
Platform.exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
public record NotificationParameters(String title,
|
public record NotificationParameters(String title,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user