From 12bdf557fa56c79317642f5229caedaeeeee08cb Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Wed, 30 Oct 2013 19:06:52 +0400
Subject: [PATCH] More annotations for Idea 132.844 (cherry picked from commit
 cd01ed95de1ae36236f5ae3f4c99854e0fe9fe14)

---
 jdk-annotations/java/lang/annotations.xml |  6 +++
 jdk-annotations/java/text/annotations.xml | 62 +++++++++++++++++------
 2 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/jdk-annotations/java/lang/annotations.xml b/jdk-annotations/java/lang/annotations.xml
index b05b0030a80..b8d080e1b39 100644
--- a/jdk-annotations/java/lang/annotations.xml
+++ b/jdk-annotations/java/lang/annotations.xml
@@ -1716,6 +1716,12 @@
   <item name="java.lang.System java.util.Map&lt;java.lang.String,java.lang.String&gt; getenv()">
     <annotation name="org.jetbrains.annotations.NotNull"/>
   </item>
+  <item name="java.lang.System void arraycopy(java.lang.Object, int, java.lang.Object, int, int) 0">
+    <annotation name="org.jetbrains.annotations.NotNull" />
+  </item>
+  <item name="java.lang.System void arraycopy(java.lang.Object, int, java.lang.Object, int, int) 2">
+    <annotation name="org.jetbrains.annotations.NotNull" />
+  </item>
   <item name="java.lang.System void loadLibrary(java.lang.String) 0">
     <annotation name="org.jetbrains.annotations.NotNull"/>
   </item>
diff --git a/jdk-annotations/java/text/annotations.xml b/jdk-annotations/java/text/annotations.xml
index 499d5ac298b..fe3071582f4 100644
--- a/jdk-annotations/java/text/annotations.xml
+++ b/jdk-annotations/java/text/annotations.xml
@@ -153,14 +153,23 @@
   <item name="java.text.DateFormat java.lang.Object clone()">
         <annotation name="org.jetbrains.annotations.NotNull"/>
   </item>
+  <item name="java.text.DateFormat java.lang.Object parseObject(java.lang.String, java.text.ParsePosition) 1">
+        <annotation name="org.jetbrains.annotations.NotNull" />
+  </item>
   <item name="java.text.DateFormat java.lang.String format(java.util.Date)">
         <annotation name="org.jetbrains.annotations.NotNull"/>
   </item>
   <item name="java.text.DateFormat java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition) 0">
         <annotation name="org.jetbrains.annotations.NotNull"/>
   </item>
+  <item name="java.text.DateFormat java.lang.StringBuffer format(java.util.Date, java.lang.StringBuffer, java.text.FieldPosition) 0">
+    <annotation name="org.jetbrains.annotations.NotNull"/>
+  </item>
+  <item name="java.text.DateFormat java.lang.StringBuffer format(java.util.Date, java.lang.StringBuffer, java.text.FieldPosition) 1">
+    <annotation name="org.jetbrains.annotations.NotNull"/>
+  </item>
   <item name="java.text.DateFormat java.lang.StringBuffer format(java.util.Date, java.lang.StringBuffer, java.text.FieldPosition) 2">
-        <annotation name="org.jetbrains.annotations.NotNull"/>
+    <annotation name="org.jetbrains.annotations.NotNull"/>
   </item>
   <item name="java.text.DateFormat java.text.DateFormat getDateInstance()">
         <annotation name="org.jetbrains.annotations.NotNull"/>
@@ -318,6 +327,9 @@
   <item name="java.text.FieldPosition java.lang.String toString()">
         <annotation name="org.jetbrains.annotations.NotNull"/>
   </item>
+  <item name="java.text.Format java.lang.Object parseObject(java.lang.String, java.text.ParsePosition) 1">
+    <annotation name="org.jetbrains.annotations.NotNull" />
+  </item>
   <item name="java.text.Format java.lang.String format(java.lang.Object)">
         <annotation name="org.jetbrains.annotations.NotNull"/>
   </item>
@@ -327,6 +339,12 @@
   <item name="java.text.Format java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition) 0">
         <annotation name="org.jetbrains.annotations.NotNull"/>
   </item>
+  <item name="java.text.Format java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition) 1">
+        <annotation name="org.jetbrains.annotations.NotNull" />
+  </item>
+  <item name="java.text.Format java.lang.StringBuffer format(java.lang.Object, java.lang.StringBuffer, java.text.FieldPosition) 2">
+        <annotation name="org.jetbrains.annotations.NotNull" />
+  </item>
   <item name="java.text.Format java.text.AttributedCharacterIterator formatToCharacterIterator(java.lang.Object)">
         <annotation name="org.jetbrains.annotations.NotNull"/>
   </item>
@@ -342,6 +360,11 @@
   <item name="java.text.MessageFormat java.lang.Object clone()">
         <annotation name="org.jetbrains.annotations.NotNull"/>
   </item>
+  <item name="java.text.MessageFormat java.lang.String format(java.lang.String, java.lang.Object...)">
+    <annotation name="jet.runtime.typeinfo.KotlinSignature">
+      <val name="value" val="&quot;fun format(pattern : String, vararg arguments : Any?) : String&quot;" />
+    </annotation>
+  </item>
   <item name="java.text.MessageFormat java.lang.String toPattern()">
         <annotation name="org.jetbrains.annotations.NotNull"/>
   </item>
@@ -376,9 +399,19 @@
       <val name="value" val="&quot;fun setFormatByArgumentIndex(argumentIndex : Int, newFormat : Format) : Unit&quot;" />
     </annotation>
   </item>
+  <item name='java.text.MessageFormat void setFormats(java.text.Format[])'>
+    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
+      <val name="value" val="&quot;fun setFormats(newFormats : Array&lt;out Format&gt;) : Unit&quot;"/>
+    </annotation>
+  </item>
   <item name="java.text.MessageFormat void setFormats(java.text.Format[]) 0">
         <annotation name="org.jetbrains.annotations.NotNull"/>
   </item>
+  <item name='java.text.MessageFormat void setFormatsByArgumentIndex(java.text.Format[])'>
+    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
+      <val name="value" val="&quot;fun setFormatsByArgumentIndex(newFormats : Array&lt;out Format&gt;) : Unit&quot;"/>
+    </annotation>
+  </item>
   <item name="java.text.MessageFormat.Field java.lang.Object readResolve()">
         <annotation name="org.jetbrains.annotations.NotNull"/>
   </item>
@@ -499,6 +532,12 @@
   <item name="java.text.SimpleDateFormat java.lang.String toLocalizedPattern()">
         <annotation name="org.jetbrains.annotations.NotNull"/>
   </item>
+  <item name="java.text.SimpleDateFormat java.lang.StringBuffer format(java.util.Date, java.lang.StringBuffer, java.text.FieldPosition) 0">
+        <annotation name="org.jetbrains.annotations.NotNull" />
+  </item>
+  <item name="java.text.SimpleDateFormat java.lang.StringBuffer format(java.util.Date, java.lang.StringBuffer, java.text.FieldPosition) 1">
+        <annotation name="org.jetbrains.annotations.NotNull" />
+  </item>
   <item name="java.text.SimpleDateFormat java.lang.StringBuffer format(java.util.Date, java.lang.StringBuffer, java.text.FieldPosition) 2">
         <annotation name="org.jetbrains.annotations.NotNull"/>
   </item>
@@ -514,6 +553,12 @@
   <item name="java.text.SimpleDateFormat java.util.Date parse(java.lang.String, java.text.ParsePosition) 1">
         <annotation name="org.jetbrains.annotations.NotNull"/>
   </item>
+  <item name="java.text.SimpleDateFormat void applyLocalizedPattern(java.lang.String) 0">
+        <annotation name="org.jetbrains.annotations.NotNull" />
+  </item>
+  <item name="java.text.SimpleDateFormat void applyPattern(java.lang.String) 0">
+        <annotation name="org.jetbrains.annotations.NotNull" />
+  </item>
   <item name="java.text.SimpleDateFormat void set2DigitYearStart(java.util.Date) 0">
         <annotation name="org.jetbrains.annotations.NotNull"/>
   </item>
@@ -529,20 +574,5 @@
   <item name="java.text.StringCharacterIterator void setText(java.lang.String) 0">
     <annotation name="org.jetbrains.annotations.NotNull" />
   </item>
-  <item name='java.text.MessageFormat void setFormats(java.text.Format[])'>
-    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-      <val name="value" val="&quot;fun setFormats(newFormats : Array&lt;out Format&gt;) : Unit&quot;"/>
-    </annotation>
-  </item>
-  <item name='java.text.MessageFormat void setFormatsByArgumentIndex(java.text.Format[])'>
-    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-      <val name="value" val="&quot;fun setFormatsByArgumentIndex(newFormats : Array&lt;out Format&gt;) : Unit&quot;"/>
-    </annotation>
-  </item>
-  <item name="java.text.MessageFormat java.lang.String format(java.lang.String, java.lang.Object...)">
-    <annotation name="jet.runtime.typeinfo.KotlinSignature">
-      <val name="value" val="&quot;fun format(pattern : String, vararg arguments : Any?) : String&quot;" />
-    </annotation>
-  </item>
 </root>