From c701da85060eb7bd4c86bea00f6491fbc5d95f49 Mon Sep 17 00:00:00 2001
From: Aleksi Majander <aleksi.majander@cs.helsinki.fi>
Date: Fri, 8 Feb 2013 10:03:36 +0200
Subject: [PATCH] Renamed myParamList to starParamList and fixed tests

---
 src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt           | 6 +++---
 tests/testData/ast/constructors/file/genericIdentifier.kt   | 4 ++--
 tests/testData/ast/issues/file/kt-638.kt                    | 4 ++--
 .../ast/newClassExpression/file/fullQualifiedName.kt        | 2 +-
 .../ast/newClassExpression/file/fullQualifiedName2.kt       | 2 +-
 .../testData/ast/rawGenerics/file/kt-540-rawGenericClass.kt | 6 +++---
 tests/testData/ast/rawGenerics/file/kt-540.kt               | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt b/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt
index 08167d0d4b3..8e83c1cc092 100644
--- a/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt
+++ b/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt
@@ -43,11 +43,11 @@ public open class TypeVisitor(private val myConverter : Converter) : PsiTypeVisi
         val identifier : Identifier = constructClassTypeIdentifier(classType)
         val resolvedClassTypeParams : List<Type> = createRawTypesForResolvedReference(classType)
         if (classType.getParameterCount() == 0 && resolvedClassTypeParams.size() > 0) {
-            val myParamList : ArrayList<Type> = ArrayList<Type>()
+            val starParamList : ArrayList<Type> = ArrayList<Type>()
             if (resolvedClassTypeParams.size() == 1) {
                 if ((resolvedClassTypeParams.get(0) as ClassType).`type`.name == "Any") {
-                    myParamList.add(StarProjectionType())
-                    myResult = ClassType(identifier, myParamList, true)
+                    starParamList.add(StarProjectionType())
+                    myResult = ClassType(identifier, starParamList, true)
                 }
                 else {
                     myResult = ClassType(identifier, resolvedClassTypeParams, true)
diff --git a/tests/testData/ast/constructors/file/genericIdentifier.kt b/tests/testData/ast/constructors/file/genericIdentifier.kt
index 5646289bdfd..e237eeee52d 100644
--- a/tests/testData/ast/constructors/file/genericIdentifier.kt
+++ b/tests/testData/ast/constructors/file/genericIdentifier.kt
@@ -30,8 +30,8 @@ public open class User() {
 class object {
 public open fun main() : Unit {
 var i1 : Identifier<*>? = Identifier.init<String?>("name", false, true)
-var i2 : Identifier<Any?>? = Identifier.init<String?>("name", false)
-var i3 : Identifier<Any?>? = Identifier.init<String?>("name")
+var i2 : Identifier<*>? = Identifier.init<String?>("name", false)
+var i3 : Identifier<*>? = Identifier.init<String?>("name")
 }
 }
 }
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-638.kt b/tests/testData/ast/issues/file/kt-638.kt
index a59d69c7f08..6a38806f16a 100644
--- a/tests/testData/ast/issues/file/kt-638.kt
+++ b/tests/testData/ast/issues/file/kt-638.kt
@@ -30,8 +30,8 @@ public open class User() {
 class object {
 public open fun main(args : Array<String?>?) : Unit {
 var i1 : Identifier<*>? = Identifier.init<String?>("name", false, true)
-var i2 : Identifier<Any?>? = Identifier.init<String?>("name", false)
-var i3 : Identifier<Any?>? = Identifier.init<String?>("name")
+var i2 : Identifier<*>? = Identifier.init<String?>("name", false)
+var i3 : Identifier<*>? = Identifier.init<String?>("name")
 }
 }
 }
diff --git a/tests/testData/ast/newClassExpression/file/fullQualifiedName.kt b/tests/testData/ast/newClassExpression/file/fullQualifiedName.kt
index d433f687e0b..411b1eb67b0 100644
--- a/tests/testData/ast/newClassExpression/file/fullQualifiedName.kt
+++ b/tests/testData/ast/newClassExpression/file/fullQualifiedName.kt
@@ -1,6 +1,6 @@
 package test
 open class User() {
 open fun main() : Unit {
-var list : List<Any?>? = java.util.LinkedList()
+var list : List<*>? = java.util.LinkedList()
 }
 }
\ No newline at end of file
diff --git a/tests/testData/ast/newClassExpression/file/fullQualifiedName2.kt b/tests/testData/ast/newClassExpression/file/fullQualifiedName2.kt
index 09e95bef826..bdcb458a76f 100644
--- a/tests/testData/ast/newClassExpression/file/fullQualifiedName2.kt
+++ b/tests/testData/ast/newClassExpression/file/fullQualifiedName2.kt
@@ -1,6 +1,6 @@
 package test
 open class User() {
 open fun main() : Unit {
-var list : java.util.List<Any?>? = java.util.LinkedList()
+var list : java.util.List<*>? = java.util.LinkedList()
 }
 }
\ No newline at end of file
diff --git a/tests/testData/ast/rawGenerics/file/kt-540-rawGenericClass.kt b/tests/testData/ast/rawGenerics/file/kt-540-rawGenericClass.kt
index 976f317b913..426b2190bc9 100644
--- a/tests/testData/ast/rawGenerics/file/kt-540-rawGenericClass.kt
+++ b/tests/testData/ast/rawGenerics/file/kt-540-rawGenericClass.kt
@@ -6,8 +6,8 @@ System.out?.println(e)
 }
 open class Test() {
 open fun main() : Unit {
-var raw1 : Collection<Any?>? = Collection(1)
-var raw2 : Collection<Any?>? = Collection<Int?>(1)
-var raw3 : Collection<Any?>? = Collection<String?>("1")
+var raw1 : Collection<*>? = Collection(1)
+var raw2 : Collection<*>? = Collection<Int?>(1)
+var raw3 : Collection<*>? = Collection<String?>("1")
 }
 }
\ No newline at end of file
diff --git a/tests/testData/ast/rawGenerics/file/kt-540.kt b/tests/testData/ast/rawGenerics/file/kt-540.kt
index 8aa33d1132f..3390cdda745 100644
--- a/tests/testData/ast/rawGenerics/file/kt-540.kt
+++ b/tests/testData/ast/rawGenerics/file/kt-540.kt
@@ -3,7 +3,7 @@ import java.util.LinkedList
 open class Test() {
 open fun main() : Unit {
 var common : List<String?>? = LinkedList<String?>()
-var raw : List<Any?>? = LinkedList<String?>()
-var superRaw : List<Any?>? = LinkedList()
+var raw : List<*>? = LinkedList<String?>()
+var superRaw : List<*>? = LinkedList()
 }
 }
\ No newline at end of file