From f53f3e17c982201b4301f8823972bc679f7382e1 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Tue, 27 Nov 2012 18:12:01 +0400
Subject: [PATCH] Fixed problems in jdk-annotations.

---
 jdk-annotations/java/awt/geom/annotations.xml     | 12 ++++++++++++
 jdk-annotations/java/io/annotations.xml           | 12 ++++++------
 jdk-annotations/java/lang/annotations.xml         |  2 +-
 jdk-annotations/java/util/zip/annotations.xml     |  6 ++++++
 jdk-annotations/javax/swing/annotations.xml       |  3 +++
 jdk-annotations/javax/swing/event/annotations.xml |  5 +++++
 6 files changed, 33 insertions(+), 7 deletions(-)
 create mode 100644 jdk-annotations/java/awt/geom/annotations.xml
 create mode 100644 jdk-annotations/javax/swing/event/annotations.xml

diff --git a/jdk-annotations/java/awt/geom/annotations.xml b/jdk-annotations/java/awt/geom/annotations.xml
new file mode 100644
index 00000000000..c596b0859dc
--- /dev/null
+++ b/jdk-annotations/java/awt/geom/annotations.xml
@@ -0,0 +1,12 @@
+<root>
+  <item name='java.awt.geom.Rectangle2D java.awt.geom.Rectangle2D createIntersection(java.awt.geom.Rectangle2D)'>
+    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
+      <val name="value" val="&quot;fun createIntersection(r : Rectangle2D) : Rectangle2D&quot;"/>
+    </annotation>
+  </item>
+  <item name='java.awt.geom.Rectangle2D java.awt.geom.Rectangle2D createUnion(java.awt.geom.Rectangle2D)'>
+    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
+      <val name="value" val="&quot;fun createUnion(r : Rectangle2D) : Rectangle2D&quot;"/>
+    </annotation>
+  </item>
+</root>
diff --git a/jdk-annotations/java/io/annotations.xml b/jdk-annotations/java/io/annotations.xml
index 2c3506cd35e..f9bc2b15f3d 100644
--- a/jdk-annotations/java/io/annotations.xml
+++ b/jdk-annotations/java/io/annotations.xml
@@ -252,6 +252,12 @@
   <item name='java.io.DataOutput void write(byte[], int, int) 0'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>
+  <item name='java.io.DataOutput void writeBytes(java.lang.String) 0'>
+    <annotation name='org.jetbrains.annotations.NotNull'/>
+  </item>
+  <item name='java.io.DataOutput void writeChars(java.lang.String) 0'>
+    <annotation name='org.jetbrains.annotations.NotNull'/>
+  </item>
   <item name='java.io.DataOutput void writeUTF(java.lang.String) 0'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>
@@ -682,15 +688,9 @@
   <item name='java.io.PrintWriter java.io.PrintWriter append(char)'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>
-  <item name='java.io.PrintWriter java.io.PrintWriter append(java.lang.CharSequence, int, int) 0'>
-    <annotation name='org.jetbrains.annotations.NotNull'/>
-  </item>
   <item name='java.io.PrintWriter java.io.PrintWriter append(java.lang.CharSequence, int, int)'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>
-  <item name='java.io.PrintWriter java.io.PrintWriter append(java.lang.CharSequence) 0'>
-    <annotation name='org.jetbrains.annotations.NotNull'/>
-  </item>
   <item name='java.io.PrintWriter java.io.PrintWriter append(java.lang.CharSequence)'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>
diff --git a/jdk-annotations/java/lang/annotations.xml b/jdk-annotations/java/lang/annotations.xml
index c2679f8ddde..9139a4f63b6 100644
--- a/jdk-annotations/java/lang/annotations.xml
+++ b/jdk-annotations/java/lang/annotations.xml
@@ -929,7 +929,7 @@
   <item name='java.lang.Class A getAnnotation(java.lang.Class&lt;A&gt;)'>
       <annotation name='jet.runtime.typeinfo.KotlinSignature'>
           <val name="value"
-               val="&quot;fun &lt;A : Annotation?&gt; getAnnotation(annotationClass : Class&lt;A&gt;) : A?&quot;"/>
+               val="&quot;fun &lt;A : Annotation&gt; getAnnotation(annotationClass : Class&lt;A&gt;) : A?&quot;"/>
       </annotation>
       <annotation name='org.jetbrains.annotations.Nullable'/>
   </item>
diff --git a/jdk-annotations/java/util/zip/annotations.xml b/jdk-annotations/java/util/zip/annotations.xml
index a2ac50835f1..68deb877ee4 100644
--- a/jdk-annotations/java/util/zip/annotations.xml
+++ b/jdk-annotations/java/util/zip/annotations.xml
@@ -1,4 +1,10 @@
 <root>
+    <item name='java.util.zip.Checksum void update(byte[], int, int) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='java.util.zip.Checksum void update(byte[]) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name='java.util.zip.Adler32 void update(byte[], int, int) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
diff --git a/jdk-annotations/javax/swing/annotations.xml b/jdk-annotations/javax/swing/annotations.xml
index f2b843456dc..7a89d0daae3 100644
--- a/jdk-annotations/javax/swing/annotations.xml
+++ b/jdk-annotations/javax/swing/annotations.xml
@@ -1,4 +1,7 @@
 <root>
+  <item name='javax.swing.JComponent java.lang.String getToolTipText(java.awt.event.MouseEvent) 0'>
+    <annotation name='org.jetbrains.annotations.NotNull'/>
+  </item>
   <item name='javax.swing.JTable void setModel(javax.swing.table.TableModel) 0'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>
diff --git a/jdk-annotations/javax/swing/event/annotations.xml b/jdk-annotations/javax/swing/event/annotations.xml
new file mode 100644
index 00000000000..0d0e2b3dc01
--- /dev/null
+++ b/jdk-annotations/javax/swing/event/annotations.xml
@@ -0,0 +1,5 @@
+<root>
+  <item name='javax.swing.event.RowSorterListener void sorterChanged(javax.swing.event.RowSorterEvent) 0'>
+    <annotation name='org.jetbrains.annotations.NotNull'/>
+  </item>
+</root>