diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolverHelper.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolverHelper.java index ce430c6de7d..44bccd6542d 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolverHelper.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolverHelper.java @@ -145,7 +145,7 @@ class JavaDescriptorResolverHelper { TypeSource propertyType = new TypeSource(method.getJetMethod().propertyType(), method.getReturnType(), method.getPsiMethod()); members.addPropertyAccessor(new PropertyAccessorData(method, true, propertyType, receiverType)); - } else if (!kotlin) { + } else if (!kotlin && false) { if (method.getParameters().size() == 0) { TypeSource propertyType = new TypeSource("", method.getReturnType(), method.getPsiMethod()); members.addPropertyAccessor(new PropertyAccessorData(method, true, propertyType, null)); @@ -184,7 +184,7 @@ class JavaDescriptorResolverHelper { TypeSource propertyType = new TypeSource(method.getJetMethod().propertyType(), propertyTypeParameter.getPsiParameter().getType(), propertyTypeParameter.getPsiParameter()); members.addPropertyAccessor(new PropertyAccessorData(method, false, propertyType, receiverType)); - } else if (!kotlin) { + } else if (!kotlin && false) { if (method.getParameters().size() == 1) { PsiParameter psiParameter = method.getParameters().get(0).getPsiParameter(); TypeSource propertyType = new TypeSource("", psiParameter.getType(), psiParameter); diff --git a/compiler/testData/readJavaBinaryClass/ClassDoesNotOverrideMethod.txt b/compiler/testData/readJavaBinaryClass/ClassDoesNotOverrideMethod.txt index 9f5eedde86f..2388cc9b8c2 100644 --- a/compiler/testData/readJavaBinaryClass/ClassDoesNotOverrideMethod.txt +++ b/compiler/testData/readJavaBinaryClass/ClassDoesNotOverrideMethod.txt @@ -24,13 +24,4 @@ abstract class test.ClassDoesNotOverrideMethod : java.util.Date { open override /*1*/ fun setYear(/*0*/ p0: jet.Int): jet.Tuple0 open override /*1*/ fun toGMTString(): jet.String? open override /*1*/ fun toLocaleString(): jet.String? - val day: jet.Int - val timezoneOffset: jet.Int - var date: jet.Int - var hours: jet.Int - var minutes: jet.Int - var month: jet.Int - var seconds: jet.Int - var time: jet.Long - var year: jet.Int } diff --git a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.kt b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.kt index dbf5b93f564..e3a5fc773d4 100644 --- a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.kt +++ b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.kt @@ -2,5 +2,5 @@ package test open class JavaBeanVal() { open fun getColor(): String? = "" - val color: String? = "" + //val color: String? = "" } diff --git a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.txt b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.txt index 372e3dd4d00..798ac1b6009 100644 --- a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.txt +++ b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.txt @@ -3,5 +3,4 @@ namespace test open class test.JavaBeanVal : jet.Any { final /*constructor*/ fun (): test.JavaBeanVal open fun getColor(): jet.String? - val color: jet.String? } diff --git a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.kt b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.kt index fa2bd5feb4b..4d533d16120 100644 --- a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.kt +++ b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.kt @@ -3,5 +3,5 @@ package test open class JavaBeanVal() { open fun getColor(): String? = "" open fun setColor(p0: String?): Unit { } - var color: String? = "" + //var color: String? = "" } diff --git a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.txt b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.txt index 5509c13812c..fc23a45ae1e 100644 --- a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.txt +++ b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.txt @@ -4,5 +4,4 @@ open class test.JavaBeanVal : jet.Any { final /*constructor*/ fun (): test.JavaBeanVal open fun getColor(): jet.String? open fun setColor(/*0*/ p0: jet.String?): jet.Tuple0 - var color: jet.String? } diff --git a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.kt b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.kt index ed384b4b644..b71b7a89e00 100644 --- a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.kt +++ b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.kt @@ -5,5 +5,5 @@ import java.util.ArrayList open class JavaBeanVarOfGenericType { open fun getCharacters(): ArrayList

? = null open fun setCharacters(p0: ArrayList

?) { } - var characters: ArrayList

? = null + //var characters: ArrayList

? = null } diff --git a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.txt b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.txt index 40b549d5a64..d6cda384e3c 100644 --- a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.txt +++ b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.txt @@ -4,5 +4,4 @@ open class test.JavaBeanVarOfGenericType : jet.Any { final /*constructor*/ fun (): test.JavaBeanVarOfGenericType open fun getCharacters(): java.util.ArrayList? open fun setCharacters(/*0*/ p0: java.util.ArrayList

?): jet.Tuple0 - var characters: java.util.ArrayList? }