From 0a41e87b6678fddc678e1f57163abbee84d768b8 Mon Sep 17 00:00:00 2001
From: Wadeck Follonier <wadeck.follonier@gmail.com>
Date: Tue, 26 Jun 2018 14:51:25 +0200
Subject: [PATCH] Address Josh's comments

---
 core/src/main/java/hudson/Util.java                           | 1 -
 .../apitoken/LegacyApiTokenAdministrativeMonitor/manage.jelly | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/hudson/Util.java b/core/src/main/java/hudson/Util.java
index 87c78c62ce..70267c2c27 100644
--- a/core/src/main/java/hudson/Util.java
+++ b/core/src/main/java/hudson/Util.java
@@ -23,7 +23,6 @@
  */
 package hudson;
 
-import com.sun.istack.internal.NotNull;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 import hudson.model.TaskListener;
diff --git a/core/src/main/resources/jenkins/security/apitoken/LegacyApiTokenAdministrativeMonitor/manage.jelly b/core/src/main/resources/jenkins/security/apitoken/LegacyApiTokenAdministrativeMonitor/manage.jelly
index 550cb12d92..7740572ea5 100644
--- a/core/src/main/resources/jenkins/security/apitoken/LegacyApiTokenAdministrativeMonitor/manage.jelly
+++ b/core/src/main/resources/jenkins/security/apitoken/LegacyApiTokenAdministrativeMonitor/manage.jelly
@@ -63,7 +63,7 @@ THE SOFTWARE.
                                 <j:set var="creationDateValue" value="${%NoCreationDateValue}" />
                                 <j:if test="${legacyToken.creationDate != null}">
                                     <i:formatDate var="creationDateFormat" value="${legacyToken.creationDate}" type="both" dateStyle="medium" timeStyle="medium" />
-                                    <!--TODO convert to "Today", "Tomorrow", "4 days ago", "2 weeks ago", etc-->
+                                    <!--TODO convert to "Today", "Tomorrow", "4 days ago", "2 weeks ago", etc. -->
                                     <j:set var="creationDateValue" value="${legacyStats.numDaysCreation}" />
                                 </j:if>
                                 
@@ -71,7 +71,7 @@ THE SOFTWARE.
                                 <j:set var="lastUseDateValue" value="${%NoLastUseValue}" />
                                 <j:if test="${legacyStats.lastUseDate != null}">
                                     <i:formatDate var="lastUseDateFormat" value="${legacyStats.lastUseDate}" type="both" dateStyle="medium" timeStyle="medium" />
-                                    <!--TODO convert to "Today", "Tomorrow", "4 days ago", "2 weeks ago", etc-->
+                                    <!--TODO convert to "Today", "Tomorrow", "4 days ago", "2 weeks ago", etc. -->
                                     <j:set var="lastUseDateValue" value="${legacyStats.numDaysUse}" />
                                 </j:if>
                                 
-- 
GitLab