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

make javabean getters/setter not visible as properties temporarily

Browse Source 
fixes KT-1432
This commit is contained in:
Stepan Koltsov
2012-03-02 18:05:10 +04:00
parent 5882c10368
commit 7b574e8b49
8 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolverHelper.java
+2 -2
View File
@@ -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);
compiler/testData/readJavaBinaryClass/ClassDoesNotOverrideMethod.txt
-9
View File
@@ -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
}
compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.kt
+1 -1
View File
@@ -2,5 +2,5 @@ package test
open class JavaBeanVal() {
open fun getColor(): String? = ""
val color: String? = ""
//val color: String? = ""
}
compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.txt
-1
View File
@@ -3,5 +3,4 @@ namespace test
open class test.JavaBeanVal : jet.Any {
final /*constructor*/ fun <init>(): test.JavaBeanVal
open fun getColor(): jet.String?
val color: jet.String?
}
compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.kt
+1 -1
View File
@@ -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? = ""
}
compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.txt
-1
View File
@@ -4,5 +4,4 @@ open class test.JavaBeanVal : jet.Any {
final /*constructor*/ fun <init>(): test.JavaBeanVal
open fun getColor(): jet.String?
open fun setColor(/*0*/ p0: jet.String?): jet.Tuple0
var color: jet.String?
}
compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.kt
+1 -1
View File
@@ -5,5 +5,5 @@ import java.util.ArrayList
open class JavaBeanVarOfGenericType<erased P> {
open fun getCharacters(): ArrayList<P>? = null
open fun setCharacters(p0: ArrayList<P>?) { }
var characters: ArrayList<P>? = null
//var characters: ArrayList<P>? = null
}
compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.txt
-1
View File
@@ -4,5 +4,4 @@ open class test.JavaBeanVarOfGenericType</*0*/ P : jet.Any?> : jet.Any {
final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.JavaBeanVarOfGenericType</*0*/ P : jet.Any?>
open fun getCharacters(): java.util.ArrayList</*0*/ P : jet.Any?>?
open fun setCharacters(/*0*/ p0: java.util.ArrayList<P>?): jet.Tuple0
var characters: java.util.ArrayList</*0*/ P : jet.Any?>?
}