diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java index 79ddc61790c..365a1d0f323 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java @@ -107,7 +107,8 @@ public final class JavaPropertyResolver { @NotNull Name propertyName, @NotNull String context ) { - Collection psiDataCollection = PropertyPsiData.collectGroupingValuesFromAccessors(namedMembers.getPropertyPsiDataElements()); + Collection psiDataCollection = PropertyPsiData.assemblePropertyPsiDataFromElements( + namedMembers.getPropertyPsiDataElements()); Set propertiesFromCurrent = new HashSet(1); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/wrapper/PropertyPsiData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/wrapper/PropertyPsiData.java index 82c76011a99..3cf91e1ac82 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/wrapper/PropertyPsiData.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/wrapper/PropertyPsiData.java @@ -29,10 +29,14 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + +/* +* Data from PSI related to one property used to resolve this property. +*/ public final class PropertyPsiData { @NotNull - public static Collection collectGroupingValuesFromAccessors(@NotNull List elements) { + public static Collection assemblePropertyPsiDataFromElements(@NotNull List elements) { Map map = new HashMap(); for (PropertyPsiDataElement element : elements) { String key = propertyKeyForGrouping(element); @@ -108,11 +112,6 @@ public final class PropertyPsiData { return setter; } - @Nullable - public PropertyPsiDataElement getField() { - return field; - } - @SuppressWarnings("ConstantConditions") @NotNull private Collection getElements() {