From e0f6c7ca04679fd3b5e8c509ae635d449c2c350a Mon Sep 17 00:00:00 2001
From: Bob Jacobsen <jacobsen@mac.com>
Date: Thu, 12 Sep 2019 06:22:09 -0700
Subject: [PATCH] replace Nullable with CheckForNull

---
 java/test/jmri/configurexml/ConfigXmlHandleXml.java    | 10 +++++-----
 .../managers/MemoryManagerThrowExceptionScaffold.java  |  4 ++--
 .../managers/SensorManagerThrowExceptionScaffold.java  |  4 ++--
 .../managers/TurnoutManagerThrowExceptionScaffold.java |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/java/test/jmri/configurexml/ConfigXmlHandleXml.java b/java/test/jmri/configurexml/ConfigXmlHandleXml.java
index 701bcd3d579..dac7c44d1ac 100644
--- 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
index cb7035d98c1..84c74f76391 100644
--- 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
index 60594351799..f6d3ce028fc 100644
--- 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
index b3b2061a8a6..034b50f26cb 100644
--- 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");
     }