mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-03-10 09:20:04 +01:00
Code Issues Projects Releases Packages Wiki Activity

wallettemplate: migrate to Jakarta Annotations

Browse source 
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.
This commit is contained in:
Sean Gilligan 2023-11-17 18:37:47 -08:00 • committed by Andreas Schildbach
parent f298a49162
commit 69366caa9d
6 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
wallettemplate/build.gradle
View file

@ -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"

2
wallettemplate/src/main/java/org/bitcoinj/walletfx/application/WalletApplication.java
View file

@ -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;

2
wallettemplate/src/main/java/org/bitcoinj/walletfx/controls/NotificationBarPane.java
View file

@ -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

2
wallettemplate/src/main/java/org/bitcoinj/walletfx/overlay/OverlayableStackPaneController.java
View file

@ -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;

2
wallettemplate/src/main/java/org/bitcoinj/walletfx/utils/KeyDerivationTasks.java
View file

@ -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;

2
wallettemplate/src/main/java/wallettemplate/WalletSettingsController.java
View file

@ -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;