azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Erroneous annotations fixed/removed

Browse Source
This commit is contained in:
Andrey Breslav
2012-09-28 15:51:46 +04:00
parent 15a66dccef
commit 02d9683805
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jdk-annotations/java/util/annotations.xml
+3 -8
View File
@@ -124,11 +124,6 @@
<val name="value" val="&quot;fun iterator() : MutableIterator&lt;E&gt;&quot;"/>
</annotation>
</item>
<item name='java.util.ArrayList java.util.Iterator<E> iterator()'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun iterator() : MutableIterator&lt;E&gt;&quot;"/>
</annotation>
</item>
<item name='java.util.List java.util.ListIterator<E> listIterator()'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun listIterator() : MutableListIterator&lt;E&gt;&quot;"/>
@@ -389,7 +384,7 @@
<val name="value" val="&quot;fun add(e : E) : Boolean&quot;"/>
</annotation>
</item>
<item name='java.util.Queue E()'>
<item name='java.util.Queue E element()'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun element() : E&quot;"/>
</annotation>
@@ -449,7 +444,7 @@
<val name="value" val="&quot;fun descendingIterator() : MutableIterator&lt;E&gt;&quot;"/>
</annotation>
</item>
<item name='java.util.LinkedList E()'>
<item name='java.util.LinkedList E element()'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun element() : E&quot;"/>
</annotation>
@@ -589,7 +584,7 @@
<val name="value" val="&quot;fun descendingIterator() : MutableIterator&lt;E&gt;&quot;"/>
</annotation>
</item>
<item name='java.util.Deque E()'>
<item name='java.util.Deque E element()'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun element() : E&quot;"/>
</annotation>
jdk-annotations/java/util/concurrent/annotations.xml
+14 -2
View File
@@ -115,13 +115,19 @@
val="&quot;fun &lt;T&gt; invokeAll(tasks : Collection&lt;out Callable&lt;T&gt;&gt;) : MutableList&lt;Future&lt;T&gt;&gt;&quot;"/>
</annotation>
</item>
<item name='java.util.concurrent.ExecutorService java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt; invokeAll(java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;, long, java.util.concurrent.TimeUnit) 0 2'>
<item name='java.util.concurrent.ExecutorService java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt; invokeAll(java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;, long, java.util.concurrent.TimeUnit)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value"
val="&quot;fun &lt;T&gt; invokeAll(tasks : Collection&lt;out Callable&lt;T&gt;&gt;, timeout : Long, unit : TimeUnit) : MutableList&lt;Future&lt;T&gt;&gt;&quot;"/>
</annotation>
</item>
<item name='java.util.concurrent.ExecutorService java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt; invokeAll(java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;, long, java.util.concurrent.TimeUnit) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.concurrent.ExecutorService java.util.List&lt;java.util.concurrent.Future&lt;T&gt;&gt; invokeAll(java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;, long, java.util.concurrent.TimeUnit) 2'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.concurrent.ExecutorService T invokeAny(java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
@@ -131,11 +137,17 @@
val="&quot;fun &lt;T&gt; invokeAny(tasks : Collection&lt;out Callable&lt;T&gt;&gt;) : T?&quot;"/>
</annotation>
</item>
<item name='java.util.concurrent.ExecutorService T invokeAny(java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;, long, java.util.concurrent.TimeUnit) 0 2'>
<item name='java.util.concurrent.ExecutorService T invokeAny(java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;, long, java.util.concurrent.TimeUnit)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value"
val="&quot;fun &lt;T&gt; invokeAny(tasks : Collection&lt;out Callable&lt;T&gt;&gt;, timeout : Long, unit : TimeUnit) : T?&quot;"/>
</annotation>
</item>
<item name='java.util.concurrent.ExecutorService T invokeAny(java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;, long, java.util.concurrent.TimeUnit) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.concurrent.ExecutorService T invokeAny(java.util.Collection&lt;? extends java.util.concurrent.Callable&lt;T&gt;&gt;, long, java.util.concurrent.TimeUnit) 2'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
</root>