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

Fix compilation

Browse Source
This commit is contained in:
Natalia.Ukhorskaya
2013-02-13 21:06:09 +04:00
committed by Pavel V. Talanov
parent b45b0e6c3a
commit 60360cf22f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/jetbrains/jet/j2k/Converter.kt
+2 -2
View File
@@ -21,10 +21,10 @@ import java.text.MessageFormat
import com.intellij.psi.util.PsiUtil import com.intellij.psi.util.PsiUtil
import org.jetbrains.jet.lang.resolve.java.JavaToKotlinClassMap import org.jetbrains.jet.lang.resolve.java.JavaToKotlinClassMap
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
import org.jetbrains.jet.internal.com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import org.jetbrains.jet.config.CompilerConfiguration import org.jetbrains.jet.config.CompilerConfiguration
import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment
import org.jetbrains.jet.internal.com.intellij.openapi.Disposable import com.intellij.openapi.Disposable
import org.jetbrains.jet.lang.resolve.name.FqName import org.jetbrains.jet.lang.resolve.name.FqName
public open class Converter() { public open class Converter() {
src/org/jetbrains/jet/j2k/ast/types/ClassType.kt
+1 -1
View File
@@ -9,7 +9,7 @@ public open class ClassType(val `type` : Identifier, val parameters : List<Eleme
public override fun toKotlin() : String { public override fun toKotlin() : String {
// TODO change to map() when KT-2051 is fixed // TODO change to map() when KT-2051 is fixed
val parametersToKotlin = ArrayList<String>() val parametersToKotlin = ArrayList<String>()
for(val param in parameters) { for(param in parameters) {
parametersToKotlin.add(param.toKotlin()) parametersToKotlin.add(param.toKotlin())
} }
var params : String = if (parametersToKotlin.size() == 0) var params : String = if (parametersToKotlin.size() == 0)