From 69366caa9da40a4ad0d20cb9ae5c911bb44c14df Mon Sep 17 00:00:00 2001
From: Sean Gilligan <sean@msgilligan.com>
Date: Fri, 17 Nov 2023 18:37:47 -0800
Subject: [PATCH] wallettemplate: migrate to Jakarta Annotations

Migrate `@Nullable` from JSR 250 (Common Annotations) to Jakarta
Annotations.

Jakarta Annotations supports Java modules, so this is necessary
to migrate to running `wallettemplate` on the module path.
---
 wallettemplate/build.gradle                                     | 1 +
 .../org/bitcoinj/walletfx/application/WalletApplication.java    | 2 +-
 .../org/bitcoinj/walletfx/controls/NotificationBarPane.java     | 2 +-
 .../walletfx/overlay/OverlayableStackPaneController.java        | 2 +-
 .../java/org/bitcoinj/walletfx/utils/KeyDerivationTasks.java    | 2 +-
 .../src/main/java/wallettemplate/WalletSettingsController.java  | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/wallettemplate/build.gradle b/wallettemplate/build.gradle
index 09012f287..b003ec3bc 100644
--- a/wallettemplate/build.gradle
+++ b/wallettemplate/build.gradle
@@ -10,6 +10,7 @@ dependencies {
     implementation 'de.jensd:fontawesomefx:8.0.0'
     implementation 'com.google.zxing:core:3.5.1'
     implementation 'org.slf4j:slf4j-jdk14:2.0.9'
+    implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1'
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.0"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.0"
diff --git a/wallettemplate/src/main/java/org/bitcoinj/walletfx/application/WalletApplication.java b/wallettemplate/src/main/java/org/bitcoinj/walletfx/application/WalletApplication.java
index c0e35bab5..5b64aa592 100644
--- a/wallettemplate/src/main/java/org/bitcoinj/walletfx/application/WalletApplication.java
+++ b/wallettemplate/src/main/java/org/bitcoinj/walletfx/application/WalletApplication.java
@@ -34,7 +34,7 @@ import org.bitcoinj.wallet.KeyChainGroupStructure;
 import org.bitcoinj.walletfx.utils.GuiUtils;
 import wallettemplate.WalletSetPasswordController;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
 
diff --git a/wallettemplate/src/main/java/org/bitcoinj/walletfx/controls/NotificationBarPane.java b/wallettemplate/src/main/java/org/bitcoinj/walletfx/controls/NotificationBarPane.java
index c1cd5b2b7..bd3255e7b 100644
--- a/wallettemplate/src/main/java/org/bitcoinj/walletfx/controls/NotificationBarPane.java
+++ b/wallettemplate/src/main/java/org/bitcoinj/walletfx/controls/NotificationBarPane.java
@@ -36,7 +36,7 @@ import org.bitcoinj.walletfx.utils.GuiUtils;
 import org.bitcoinj.walletfx.utils.easing.EasingMode;
 import org.bitcoinj.walletfx.utils.easing.ElasticInterpolator;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * Wraps the given Node in a BorderPane and allows a thin bar to slide in from the bottom or top, squeezing the content
diff --git a/wallettemplate/src/main/java/org/bitcoinj/walletfx/overlay/OverlayableStackPaneController.java b/wallettemplate/src/main/java/org/bitcoinj/walletfx/overlay/OverlayableStackPaneController.java
index 2bbde26b6..2844495cf 100644
--- a/wallettemplate/src/main/java/org/bitcoinj/walletfx/overlay/OverlayableStackPaneController.java
+++ b/wallettemplate/src/main/java/org/bitcoinj/walletfx/overlay/OverlayableStackPaneController.java
@@ -21,7 +21,7 @@ import javafx.scene.layout.Pane;
 import javafx.scene.layout.StackPane;
 import org.bitcoinj.walletfx.utils.GuiUtils;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import java.io.IOException;
 import java.net.URL;
diff --git a/wallettemplate/src/main/java/org/bitcoinj/walletfx/utils/KeyDerivationTasks.java b/wallettemplate/src/main/java/org/bitcoinj/walletfx/utils/KeyDerivationTasks.java
index d45c1f3b9..1df3c6275 100644
--- a/wallettemplate/src/main/java/org/bitcoinj/walletfx/utils/KeyDerivationTasks.java
+++ b/wallettemplate/src/main/java/org/bitcoinj/walletfx/utils/KeyDerivationTasks.java
@@ -23,7 +23,7 @@ import javafx.concurrent.Task;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.*;
+import jakarta.annotation.*;
 import java.time.Duration;
 
 import static org.bitcoinj.walletfx.utils.GuiUtils.checkGuiThread;
diff --git a/wallettemplate/src/main/java/wallettemplate/WalletSettingsController.java b/wallettemplate/src/main/java/wallettemplate/WalletSettingsController.java
index 1c478ed28..fd6538662 100644
--- a/wallettemplate/src/main/java/wallettemplate/WalletSettingsController.java
+++ b/wallettemplate/src/main/java/wallettemplate/WalletSettingsController.java
@@ -35,7 +35,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.bitcoinj.walletfx.utils.TextFieldValidator;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.ZoneId;