Replace types that are imported by default via typealiases such as java.util.ArrayList with something else as it conflicts now with kotlin.collections.ArrayList and has to imported explicitly.

2016-09-02 17:15:04 +03:00
parent b7e2649b91
commit a62cda8365
47 changed files with 68 additions and 72 deletions
@@ -1,3 +1,3 @@
 class A {
-    val x = <selection>java.util.HashMap<java.util.ArrayList<java.io.File>, String>()</selection>
+    val x = <selection>java.util.TreeMap<kotlin.collections.List<java.io.File>, String>()</selection>
 }
@@ -1,7 +1,6 @@
 import java.io.File
-import java.util.ArrayList
-import java.util.HashMap
+import java.util.TreeMap

 class A {
-    val x = HashMap<ArrayList<File>, String>()
+    val x = TreeMap<List<File>, String>()
 }
@@ -1,9 +1,8 @@
-import java.util.Collections
-import java.util.ArrayList
+import java.util.concurrent.Executors

 fun foo() {
-    Collections.sort(
-            ArrayList<Int>(),
-            <selection>java.util.Comparator</selection> { x: Int, y: Int -> x - y }
+    Executors.callable(
+            <selection>java.lang.Runnable</selection> { -> },
+            Unit
    )
 }
@@ -1,10 +1,8 @@
-import java.util.Collections
-import java.util.ArrayList
-import java.util.Comparator
+import java.util.concurrent.Executors

 fun foo() {
-    Collections.sort(
-            ArrayList<Int>(),
-            Comparator { x: Int, y: Int -> x - y }
+    Executors.callable(
+            Runnable { -> },
+            Unit
    )
 }
@@ -1 +1 @@
-val x = <selection>java.util.HashMap</selection><java.util.Date, String>(1)
+val x = <selection>java.util.TreeMap</selection><java.util.Date, String>(1)
@@ -1,3 +1,3 @@
-import java.util.HashMap
+import java.util.TreeMap

-val x = HashMap<java.util.Date, String>(1)
+val x = TreeMap<java.util.Date, String>(1)