nathanmcrae/numbers-station
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: nathanmcrae:7ba68c5ec131c1019dcf2ff33892c0cc81ae2c0e
Branches Tags
nathanmcrae:master
..
compare: nathanmcrae:cb3f0b0938f870cf44ee77f31238774c20747dd6
Branches Tags
nathanmcrae:master

No commits in common. "7ba68c5ec131c1019dcf2ff33892c0cc81ae2c0e" and "cb3f0b0938f870cf44ee77f31238774c20747dd6" have entirely different histories.
7ba68c5ec1 ... cb3f0b0938

5 changed files with 2 additions and 11 deletions
Show Stats Expand all files Collapse all files

3
build.ps1
View File

@ -1,9 +1,8 @@
$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;$PSScriptRoot\lib" $modulePath = "$Env:PATH_TO_FX;P:\personal_root\projects\number-station\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
View File

@ -2,9 +2,8 @@ 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;$PSScriptRoot\lib" $modulePath = "$Env:PATH_TO_FX;P:\personal_root\projects\number-station\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",

4
src/main/java/name/nathanmcrae/numbersstation/Main.java
View File

@ -51,10 +51,6 @@ 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"));

1
src/main/java/name/nathanmcrae/numbersstation/MainSettings.java
View File

@ -110,7 +110,6 @@ 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();

2
src/main/java/name/nathanmcrae/numbersstation/NotificationController.java
View File

@ -3,7 +3,6 @@ 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;
@ -55,7 +54,6 @@ 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,