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

Fixed mapping generic type with multiple bounds from Java to Kotlin.

Browse Source 
#KT-3480 fixed
This commit is contained in:
Evgeny Gerashchenko
2014-01-22 17:16:12 +04:00
committed by Zalim Bashorov
parent e47c84f40f
commit d3570153ef
12 changed files with 67 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jdk-annotations/java/util/annotations.xml
+2 -2
View File
@@ -1259,7 +1259,7 @@
<item name="java.util.Collections T max(java.util.Collection&lt;? extends T&gt;)">
<annotation name="org.jetbrains.annotations.NotNull"/>
<annotation name="jet.runtime.typeinfo.KotlinSignature">
<val name="value" val="&quot;fun &lt;T: Comparable&lt;T&gt;&gt; max(coll : Collection&lt;T&gt;) : T&quot;"/>
<val name="value" val="&quot;fun &lt;T: Any&gt; max(coll : Collection&lt;T&gt;) : T where T: Comparable&lt;T&gt;&quot;"/>
</annotation>
</item>
<item name="java.util.Collections T max(java.util.Collection&lt;? extends T&gt;) 0">
@@ -1281,7 +1281,7 @@
<item name="java.util.Collections T min(java.util.Collection&lt;? extends T&gt;)">
<annotation name="org.jetbrains.annotations.NotNull"/>
<annotation name="jet.runtime.typeinfo.KotlinSignature">
<val name="value" val="&quot;fun &lt;T: Comparable&lt;T&gt;&gt; min(coll : Collection&lt;T&gt;) : T&quot;"/>
<val name="value" val="&quot;fun &lt;T: Any&gt; min(coll : Collection&lt;T&gt;) : T where T: Comparable&lt;T&gt;&quot;"/>
</annotation>
</item>
<item name="java.util.Collections T min(java.util.Collection&lt;? extends T&gt;) 0">