From feb484cccbfdd78088ee0c4e501619a89b0772c1 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Mon, 10 Dec 2012 17:59:35 +0400
Subject: [PATCH] Fixed JdkAnnotationsSanityTest.

---
 .../jet/lang/resolve/java/resolver/RawTypesCheck.java |  2 +-
 .../jet/jvm/compiler/JdkAnnotationsSanityTest.java    |  9 +++++++--
 jdk-annotations/java/util/concurrent/annotations.xml  | 11 +++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/RawTypesCheck.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/RawTypesCheck.java
index a97b238718c..44f4f80f0de 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/RawTypesCheck.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/RawTypesCheck.java
@@ -95,7 +95,7 @@ public class RawTypesCheck {
         }
 
         for (HierarchicalMethodSignature superSignature : method.getHierarchicalMethodSignature().getSuperSignatures()) {
-            if (hasRawTypesInSignature(superSignature.getMethod())) {
+            if (superSignature.isRaw() || hasRawTypesInSignature(superSignature.getMethod())) {
                 return true;
             }
         }
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsSanityTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsSanityTest.java
index d43125c2885..0be08a51546 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsSanityTest.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsSanityTest.java
@@ -91,7 +91,9 @@ public class JdkAnnotationsSanityTest extends KotlinTestWithEnvironment {
         for (FqName javaClass : affectedClasses) {
             ClassDescriptor topLevelClass = javaDescriptorResolver.resolveClass(javaClass);
             NamespaceDescriptor topLevelNamespace = javaDescriptorResolver.resolveNamespace(javaClass);
-            assertNotNull("Class has annotation, but it is not found: " + javaClass, topLevelClass);
+            if (topLevelClass == null) {
+                continue;
+            }
 
             topLevelClass.acceptVoid(visitor);
 
@@ -256,7 +258,10 @@ public class JdkAnnotationsSanityTest extends KotlinTestWithEnvironment {
 
         private Void visitDeclarationRecursively(@NotNull DeclarationDescriptor descriptor, @NotNull JetScope memberScope) {
             for (DeclarationDescriptor member : memberScope.getAllDescriptors()) {
-                member.acceptVoid(this);
+                if (member instanceof DeclarationDescriptorWithVisibility
+                    && ((DeclarationDescriptorWithVisibility) member).getVisibility().isPublicAPI()) {
+                    member.acceptVoid(this);
+                }
             }
 
             return visitDeclaration(descriptor);
diff --git a/jdk-annotations/java/util/concurrent/annotations.xml b/jdk-annotations/java/util/concurrent/annotations.xml
index 3f952d15539..f07cf472514 100644
--- a/jdk-annotations/java/util/concurrent/annotations.xml
+++ b/jdk-annotations/java/util/concurrent/annotations.xml
@@ -1,4 +1,15 @@
 <root>
+  <item name='java.util.concurrent.BlockingQueue int drainTo(java.util.Collection&lt;? super E&gt;, int)'>
+    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
+      <val name="value" val="&quot;fun drainTo(c : MutableCollection<in E>, maxElements: Int) : Int&quot;"/>
+    </annotation>
+  </item>
+  <item name='java.util.concurrent.BlockingQueue int drainTo(java.util.Collection&lt;? super E&gt;)'>
+    <annotation name='jet.runtime.typeinfo.KotlinSignature'>
+      <val name="value" val="&quot;fun drainTo(c : MutableCollection<in E>) : Int&quot;"/>
+    </annotation>
+  </item>
+
     <item name='java.util.concurrent.ConcurrentNavigableMap java.util.concurrent.ConcurrentNavigableMap&lt;K,V&gt; headMap(K, boolean) 0'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>