replace Nullable with CheckForNull

JMRI · Sep 12, 2019 · e0f6c7c · e0f6c7c
1 parent 7d0ef66
commit e0f6c7c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/java/test/jmri/configurexml/ConfigXmlHandleXml.java b/java/test/jmri/configurexml/ConfigXmlHandleXml.java
@@ -1,7 +1,7 @@
 package jmri.configurexml;
 
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import javax.annotation.CheckForNull;
 import org.jdom2.Element;
 
 /**
@@ -56,10 +56,10 @@ public int loadOrder() {
     @Override
     public void handleException(
             @Nonnull String description,
-            @Nullable String operation,
-            @Nullable String systemName,
-            @Nullable String userName,
-            @Nullable Exception exception) throws JmriConfigureXmlException {
+            @CheckForNull String operation,
+            @CheckForNull String systemName,
+            @CheckForNull String userName,
+            @CheckForNull Exception exception) throws JmriConfigureXmlException {
     }
 
     @Override

diff --git a/java/test/jmri/util/managers/MemoryManagerThrowExceptionScaffold.java b/java/test/jmri/util/managers/MemoryManagerThrowExceptionScaffold.java
@@ -1,7 +1,7 @@
 package jmri.util.managers;
 
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import javax.annotation.CheckForNull;
 import jmri.InstanceManager;
 import jmri.Memory;
 import jmri.jmrix.internal.InternalSystemConnectionMemo;
@@ -52,7 +52,7 @@ public Memory getByUserName(String key) {
 
     /** {@inheritDoc} */
     @Override
-    public Memory newMemory(@Nonnull String systemName, @Nullable String userName) {
+    public Memory newMemory(@Nonnull String systemName, @CheckForNull String userName) {
         throw new IllegalArgumentException("Illegal argument");
     }
 

diff --git a/java/test/jmri/util/managers/SensorManagerThrowExceptionScaffold.java b/java/test/jmri/util/managers/SensorManagerThrowExceptionScaffold.java
@@ -1,7 +1,7 @@
 package jmri.util.managers;
 
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import javax.annotation.CheckForNull;
 import jmri.InstanceManager;
 import jmri.Sensor;
 import jmri.jmrix.internal.InternalSensorManager;
@@ -52,7 +52,7 @@ public Sensor getByUserName(String key) {
 
     /** {@inheritDoc} */
     @Override
-    public Sensor newSensor(@Nonnull String systemName, @Nullable String userName) {
+    public Sensor newSensor(@Nonnull String systemName, @CheckForNull String userName) {
         throw new IllegalArgumentException("Illegal argument");
     }
 

diff --git a/java/test/jmri/util/managers/TurnoutManagerThrowExceptionScaffold.java b/java/test/jmri/util/managers/TurnoutManagerThrowExceptionScaffold.java
@@ -1,7 +1,7 @@
 package jmri.util.managers;
 
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import javax.annotation.CheckForNull;
 import jmri.InstanceManager;
 import jmri.Turnout;
 import jmri.jmrix.internal.InternalSystemConnectionMemo;
@@ -52,7 +52,7 @@ public Turnout getByUserName(String key) {
 
     /** {@inheritDoc} */
     @Override
-    public Turnout newTurnout(@Nonnull String systemName, @Nullable String userName) {
+    public Turnout newTurnout(@Nonnull String systemName, @CheckForNull String userName) {
         throw new IllegalArgumentException("Illegal argument");
     }