Skip to content

Commit 7c1e8e1

Browse files
committed
Fix usages of javax's Nullable annotation
1 parent b03546a commit 7c1e8e1

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

projects/common/src/main/java/dan200/computercraft/shared/media/MountMedia.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import net.minecraft.network.chat.Component;
1515
import net.minecraft.server.level.ServerLevel;
1616
import net.minecraft.world.item.ItemStack;
17+
import org.jspecify.annotations.Nullable;
1718

18-
import javax.annotation.Nullable;
1919
import java.util.function.Supplier;
2020
import java.util.function.ToIntFunction;
2121

projects/common/src/main/java/dan200/computercraft/shared/media/items/TreasureDiskMedia.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import dan200.computercraft.core.filesystem.SubMount;
1111
import net.minecraft.server.level.ServerLevel;
1212
import net.minecraft.world.item.ItemStack;
13+
import org.jspecify.annotations.Nullable;
1314

14-
import javax.annotation.Nullable;
1515
import java.io.IOException;
1616

1717
/**

projects/lints/src/main/kotlin/cc/tweaked/linter/ForbiddenImport.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class ForbiddenImport : BugChecker(), BugChecker.ImportTreeMatcher {
3838
companion object {
3939
private val ALTERNATIVE_IMPORTS = mapOf(
4040
// Ban JSR 305 and JetBrains @Nullable, and prefer the JSpecify one.
41-
"org.javax.annotation.Nullable" to "org.jspecify.annotations.Nullable",
41+
"javax.annotation.Nullable" to "org.jspecify.annotations.Nullable",
4242
"org.jetbrains.annotations.Nullable" to "org.jspecify.annotations.Nullable",
4343
// Prefer ErrorProne annotations over JSR ones.
4444
"javax.annotation.CheckReturnValue" to "com.google.errorprone.annotations.CheckReturnValue",

0 commit comments

Comments
 (0)