From 29dc1d85745e40fab220bab7a9243f3782598aa2 Mon Sep 17 00:00:00 2001
From: Bas Leijdekkers <basleijdekkers@gmail.com>
Date: Thu, 24 Oct 2013 22:14:04 +0200
Subject: [PATCH] SimpleDateFormat and TimeZone @NonNls

---
 java/jdkAnnotations/java/text/annotations.xml | 6 ++++++
 java/jdkAnnotations/java/util/annotations.xml | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/java/jdkAnnotations/java/text/annotations.xml b/java/jdkAnnotations/java/text/annotations.xml
index 44cf7daebd28..c1514c8cfd02 100644
--- a/java/jdkAnnotations/java/text/annotations.xml
+++ b/java/jdkAnnotations/java/text/annotations.xml
@@ -33,5 +33,11 @@
   <item name="java.text.SimpleDateFormat SimpleDateFormat(java.lang.String) 0">
     <annotation name="org.jetbrains.annotations.NonNls" />
   </item>
+  <item name="java.text.SimpleDateFormat SimpleDateFormat(java.lang.String, java.util.Locale) 0">
+    <annotation name="org.jetbrains.annotations.NonNls" />
+  </item>
+  <item name="java.text.SimpleDateFormat SimpleDateFormat(java.lang.String, java.text.DateFormatSymbols) 0">
+    <annotation name="org.jetbrains.annotations.NonNls" />
+  </item>
 </root>
 
diff --git a/java/jdkAnnotations/java/util/annotations.xml b/java/jdkAnnotations/java/util/annotations.xml
index 35a2203415b8..88ec995ced64 100644
--- a/java/jdkAnnotations/java/util/annotations.xml
+++ b/java/jdkAnnotations/java/util/annotations.xml
@@ -1092,6 +1092,9 @@
   <item name="java.util.SortedSet java.util.SortedSet&lt;E&gt; tailSet(E)">
     <annotation name="org.jetbrains.annotations.NotNull" />
   </item>
+  <item name="java.util.TimeZone java.util.TimeZone getTimeZone(java.lang.String) 0">
+    <annotation name="org.jetbrains.annotations.NonNls" />
+  </item>
   <item name='java.util.TreeSet TreeSet(java.util.Collection&lt;? extends E&gt;) 0'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
     <annotation name='org.intellij.lang.annotations.Flow'>