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

Refactoring: Tune isPropertyFinal()

Browse Source
This commit is contained in:
Nikolay Krasko
2012-10-01 13:46:15 +04:00
parent dc54bd673c
commit 93baf78779
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorPropertiesResolver.java
+10 -14
View File
@@ -326,24 +326,20 @@ public final class JavaDescriptorPropertiesResolver {
return members.setter != null; return members.setter != null;
} }
private static boolean isPropertyFinal(ResolverScopeData scopeData, GroupingValue propertyGrouping) { private static boolean isPropertyFinal(ResolverScopeData scopeData, GroupingValue members) {
boolean isFinal;
if (!scopeData.kotlin) { if (!scopeData.kotlin) {
isFinal = true; return true;
} }
else if (propertyGrouping.setter == null && propertyGrouping.getter == null) {
isFinal = false; if (members.getter != null) {
return members.getter.getMember().isFinal();
} }
else if (propertyGrouping.getter != null) {
isFinal = propertyGrouping.getter.getMember().isFinal(); if (members.setter != null) {
return members.setter.getMember().isFinal();
} }
else if (propertyGrouping.setter != null) {
isFinal = propertyGrouping.setter.getMember().isFinal(); return false;
}
else {
isFinal = false;
}
return isFinal;
} }
private static Set<PropertyDescriptor> getPropertiesFromSupertypes(ResolverScopeData scopeData, Name propertyName) { private static Set<PropertyDescriptor> getPropertiesFromSupertypes(ResolverScopeData scopeData, Name propertyName) {