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

JDR: move *Wrapper classes to wrapper package

Browse Source
This commit is contained in:
Pavel V. Talanov
2012-10-03 21:25:21 +04:00
parent c5b29354c0
commit 9d2446ab9a
12 changed files with 25 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/AlternativeSignatureData.java
+1
View File
@@ -30,6 +30,7 @@ import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.java.wrapper.PsiMethodWrapper;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.lang.types.*;
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorPropertiesResolver.java
+9 -8
View File
@@ -29,6 +29,7 @@ import org.jetbrains.jet.lang.resolve.OverrideResolver;
import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolveData.ResolverScopeData;
import org.jetbrains.jet.lang.resolve.java.kt.DescriptorKindUtils;
import org.jetbrains.jet.lang.resolve.java.kt.JetMethodAnnotation;
import org.jetbrains.jet.lang.resolve.java.wrapper.PsiMethodWrapper;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.resolve.scopes.JetScope;
@@ -103,12 +104,12 @@ public final class JavaDescriptorPropertiesResolver {
PropertyAccessorData characteristicMember = getCharacteristicMember(members);
Visibility visibility = JavaDescriptorResolver.resolveVisibility(characteristicMember.getMember().psiMember, null);
Visibility visibility = JavaDescriptorResolver.resolveVisibility(characteristicMember.getMember().getPsiMember(), null);
CallableMemberDescriptor.Kind kind = CallableMemberDescriptor.Kind.DECLARATION;
if (members.getter != null && members.getter.getMember() instanceof PsiMethodWrapper) {
JetMethodAnnotation jetMethod = ((PsiMethodWrapper) members.getter.getMember()).getJetMethod();
visibility = JavaDescriptorResolver.resolveVisibility(characteristicMember.getMember().psiMember, jetMethod);
visibility = JavaDescriptorResolver.resolveVisibility(characteristicMember.getMember().getPsiMember(), jetMethod);
kind = DescriptorKindUtils.flagsToKind(jetMethod.kind());
}
@@ -117,7 +118,7 @@ public final class JavaDescriptorPropertiesResolver {
boolean isEnumEntry = DescriptorUtils.isEnumClassObject(realOwner);
PropertyDescriptor propertyDescriptor = new PropertyDescriptor(
realOwner,
javaDescriptorResolver.resolveAnnotations(characteristicMember.getMember().psiMember),
javaDescriptorResolver.resolveAnnotations(characteristicMember.getMember().getPsiMember()),
JavaDescriptorResolver.resolveModality(characteristicMember.getMember(), isFinal || isEnumEntry),
visibility,
isVar,
@@ -144,7 +145,7 @@ public final class JavaDescriptorPropertiesResolver {
if (members.getter != null) {
getterDescriptor = new PropertyGetterDescriptor(
propertyDescriptor,
javaDescriptorResolver.resolveAnnotations(members.getter.getMember().psiMember),
javaDescriptorResolver.resolveAnnotations(members.getter.getMember().getPsiMember()),
Modality.OPEN,
visibility,
true,
@@ -153,16 +154,16 @@ public final class JavaDescriptorPropertiesResolver {
}
if (members.setter != null) {
Visibility setterVisibility = JavaDescriptorResolver.resolveVisibility(members.setter.getMember().psiMember, null);
Visibility setterVisibility = JavaDescriptorResolver.resolveVisibility(members.setter.getMember().getPsiMember(), null);
if (members.setter.getMember() instanceof PsiMethodWrapper) {
setterVisibility = JavaDescriptorResolver.resolveVisibility(
members.setter.getMember().psiMember,
members.setter.getMember().getPsiMember(),
((PsiMethodWrapper) members.setter.getMember())
.getJetMethod());
}
setterDescriptor = new PropertySetterDescriptor(
propertyDescriptor,
javaDescriptorResolver.resolveAnnotations(members.setter.getMember().psiMember),
javaDescriptorResolver.resolveAnnotations(members.setter.getMember().getPsiMember()),
Modality.OPEN,
setterVisibility,
true,
@@ -202,7 +203,7 @@ public final class JavaDescriptorPropertiesResolver {
}
if (kind == CallableMemberDescriptor.Kind.DECLARATION) {
trace.record(BindingContext.VARIABLE, characteristicMember.getMember().psiMember, propertyDescriptor);
trace.record(BindingContext.VARIABLE, characteristicMember.getMember().getPsiMember(), propertyDescriptor);
}
propertiesFromCurrent.add(propertyDescriptor);
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+4
View File
@@ -38,6 +38,10 @@ import org.jetbrains.jet.lang.resolve.java.kt.JetClassAnnotation;
import org.jetbrains.jet.lang.resolve.java.kt.PsiAnnotationWithFlags;
import org.jetbrains.jet.lang.resolve.java.scope.JavaClassMembersScope;
import org.jetbrains.jet.lang.resolve.java.scope.JavaPackageScope;
import org.jetbrains.jet.lang.resolve.java.wrapper.PsiClassWrapper;
import org.jetbrains.jet.lang.resolve.java.wrapper.PsiMemberWrapper;
import org.jetbrains.jet.lang.resolve.java.wrapper.PsiMethodWrapper;
import org.jetbrains.jet.lang.resolve.java.wrapper.PsiParameterWrapper;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.FqNameBase;
import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolverHelper.java
+1
View File
@@ -23,6 +23,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolveData.ResolverScopeData;
import org.jetbrains.jet.lang.resolve.java.prop.PropertyNameUtils;
import org.jetbrains.jet.lang.resolve.java.prop.PropertyParseResult;
import org.jetbrains.jet.lang.resolve.java.wrapper.*;
import org.jetbrains.jet.lang.resolve.name.Name;
import java.util.Collections;
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorSignatureResolver.java
+1
View File
@@ -28,6 +28,7 @@ import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptorImpl;
import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolveData.ResolverClassData;
import org.jetbrains.jet.lang.resolve.java.kt.JetClassAnnotation;
import org.jetbrains.jet.lang.resolve.java.wrapper.PsiMethodWrapper;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.Variance;
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/NamedMembers.java
+1
View File
@@ -19,6 +19,7 @@ package org.jetbrains.jet.lang.resolve.java;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
import org.jetbrains.jet.lang.descriptors.VariableDescriptor;
import org.jetbrains.jet.lang.resolve.java.wrapper.PsiMethodWrapper;
import java.util.ArrayList;
import java.util.List;
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PropertyAccessorData.java
+3 -1
View File
@@ -16,9 +16,11 @@
package org.jetbrains.jet.lang.resolve.java;
import com.intellij.psi.HierarchicalMethodSignature;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.resolve.java.wrapper.PsiFieldWrapper;
import org.jetbrains.jet.lang.resolve.java.wrapper.PsiMemberWrapper;
import org.jetbrains.jet.lang.resolve.java.wrapper.PsiMethodWrapper;
/**
* @author Stepan Koltsov
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassWrapper.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/wrapper/PsiClassWrapper.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java;
package org.jetbrains.jet.lang.resolve.java.wrapper;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiField;
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiFieldWrapper.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/wrapper/PsiFieldWrapper.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java;
package org.jetbrains.jet.lang.resolve.java.wrapper;
import com.intellij.psi.PsiField;
import com.intellij.psi.PsiMember;
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiMemberWrapper.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/wrapper/PsiMemberWrapper.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java;
package org.jetbrains.jet.lang.resolve.java.wrapper;
import com.intellij.psi.PsiMember;
import com.intellij.psi.PsiModifier;
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiMethodWrapper.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/wrapper/PsiMethodWrapper.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java;
package org.jetbrains.jet.lang.resolve.java.wrapper;
import com.intellij.psi.PsiMethod;
import com.intellij.psi.PsiModifier;
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiParameterWrapper.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/wrapper/PsiParameterWrapper.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java;
package org.jetbrains.jet.lang.resolve.java.wrapper;
import com.intellij.psi.PsiParameter;
import org.jetbrains.annotations.NotNull;