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

Renamed class.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2014-01-09 23:10:57 +04:00
parent 7041a10ecf
commit 2189fce64b
21 changed files with 49 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamConstructorDescriptor.java
+2 -2
View File
@@ -17,7 +17,7 @@
package org.jetbrains.jet.lang.resolve.java.descriptor;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.descriptors.ClassOrNamespaceDescriptor;
import org.jetbrains.jet.lang.descriptors.ClassOrPackageFragmentDescriptor;
import org.jetbrains.jet.lang.descriptors.SynthesizedCallableMemberDescriptor;
import org.jetbrains.jet.lang.descriptors.impl.SimpleFunctionDescriptorImpl;
@@ -26,7 +26,7 @@ public class SamConstructorDescriptor extends SimpleFunctionDescriptorImpl
private final JavaClassDescriptor samInterface;
public SamConstructorDescriptor(
@NotNull ClassOrNamespaceDescriptor containingDeclaration,
@NotNull ClassOrPackageFragmentDescriptor containingDeclaration,
@NotNull JavaClassDescriptor samInterface
) {
super(containingDeclaration, samInterface.getAnnotations(), samInterface.getName(), Kind.SYNTHESIZED);
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java
+1 -1
View File
@@ -130,7 +130,7 @@ public final class DescriptorResolverUtils {
"valueOf(java.lang.String)".equals(signature);
}
public static boolean isCorrectOwnerForEnumMethod(@NotNull ClassOrNamespaceDescriptor ownerDescriptor, @NotNull JavaMethod method) {
public static boolean isCorrectOwnerForEnumMethod(@NotNull ClassOrPackageFragmentDescriptor ownerDescriptor, @NotNull JavaMethod method) {
return isEnumClassObject(ownerDescriptor) == shouldBeInEnumClassObject(method);
}
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java
+3 -3
View File
@@ -208,7 +208,7 @@ public final class JavaClassResolver {
return alreadyResolved;
}
ClassOrNamespaceDescriptor containingDeclaration = resolveParentDescriptor(qualifiedName, javaClass.getOuterClass());
ClassOrPackageFragmentDescriptor containingDeclaration = resolveParentDescriptor(qualifiedName, javaClass.getOuterClass());
// class may be resolved during resolution of parent
ClassDescriptor cachedDescriptor = classDescriptorCache.get(javaClassToKotlinFqName(qualifiedName));
if (cachedDescriptor != null) {
@@ -242,7 +242,7 @@ public final class JavaClassResolver {
@NotNull FqName fqName,
@NotNull JavaClass javaClass,
@NotNull PostponedTasks taskList,
@NotNull ClassOrNamespaceDescriptor containingDeclaration
@NotNull ClassOrPackageFragmentDescriptor containingDeclaration
) {
ClassDescriptorFromJvmBytecode classDescriptor =
new ClassDescriptorFromJvmBytecode(containingDeclaration, javaClass.getName(), determineClassKind(javaClass), isInnerClass(javaClass));
@@ -374,7 +374,7 @@ public final class JavaClassResolver {
}
@NotNull
private ClassOrNamespaceDescriptor resolveParentDescriptor(@NotNull FqName childClassFQName, JavaClass parentClass) {
private ClassOrPackageFragmentDescriptor resolveParentDescriptor(@NotNull FqName childClassFQName, JavaClass parentClass) {
if (parentClass != null) {
FqName parentFqName = parentClass.getFqName();
ClassDescriptor parentClassDescriptor = resolveClass(parentFqName, INCLUDE_KOTLIN_SOURCES);
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
+3 -3
View File
@@ -87,14 +87,14 @@ public final class JavaFunctionResolver {
}
@Nullable
SimpleFunctionDescriptor resolveFunctionMutely(@NotNull JavaMethod method, @NotNull ClassOrNamespaceDescriptor owner) {
SimpleFunctionDescriptor resolveFunctionMutely(@NotNull JavaMethod method, @NotNull ClassOrPackageFragmentDescriptor owner) {
return resolveMethodToFunctionDescriptor(method, owner, false);
}
@Nullable
private SimpleFunctionDescriptor resolveMethodToFunctionDescriptor(
@NotNull JavaMethod method,
@NotNull ClassOrNamespaceDescriptor ownerDescriptor,
@NotNull ClassOrPackageFragmentDescriptor ownerDescriptor,
boolean record
) {
if (!DescriptorResolverUtils.isCorrectOwnerForEnumMethod(ownerDescriptor, method)) {
@@ -179,7 +179,7 @@ public final class JavaFunctionResolver {
}
@NotNull
public Set<FunctionDescriptor> resolveFunctionGroupForClass(@NotNull NamedMembers members, @NotNull ClassOrNamespaceDescriptor owner) {
public Set<FunctionDescriptor> resolveFunctionGroupForClass(@NotNull NamedMembers members, @NotNull ClassOrPackageFragmentDescriptor owner) {
Name methodName = members.getName();
Set<SimpleFunctionDescriptor> functionsFromCurrent = new HashSet<SimpleFunctionDescriptor>();
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaMemberResolver.java
+2 -2
View File
@@ -60,12 +60,12 @@ public class JavaMemberResolver {
}
@NotNull
public Set<FunctionDescriptor> resolveFunctionGroupForClass(@NotNull NamedMembers members, @NotNull ClassOrNamespaceDescriptor owner) {
public Set<FunctionDescriptor> resolveFunctionGroupForClass(@NotNull NamedMembers members, @NotNull ClassOrPackageFragmentDescriptor owner) {
return functionResolver.resolveFunctionGroupForClass(members, owner);
}
@NotNull
public Set<VariableDescriptor> resolveFieldGroup(@NotNull NamedMembers members, @NotNull ClassOrNamespaceDescriptor ownerDescriptor) {
public Set<VariableDescriptor> resolveFieldGroup(@NotNull NamedMembers members, @NotNull ClassOrPackageFragmentDescriptor ownerDescriptor) {
return propertyResolver.resolveFieldGroup(members, ownerDescriptor);
}
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java
+2 -3
View File
@@ -30,7 +30,6 @@ import org.jetbrains.jet.lang.types.TypeUtils;
import javax.inject.Inject;
import java.util.*;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isEnumClass;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isEnumClassObject;
import static org.jetbrains.jet.lang.resolve.java.resolver.DescriptorResolverUtils.resolveOverrides;
@@ -67,7 +66,7 @@ public final class JavaPropertyResolver {
}
@NotNull
public Set<VariableDescriptor> resolveFieldGroup(@NotNull NamedMembers members, @NotNull ClassOrNamespaceDescriptor owner) {
public Set<VariableDescriptor> resolveFieldGroup(@NotNull NamedMembers members, @NotNull ClassOrPackageFragmentDescriptor owner) {
if (isEnumClassObject(owner)) {
return Collections.emptySet();
}
@@ -101,7 +100,7 @@ public final class JavaPropertyResolver {
}
@NotNull
private PropertyDescriptor resolveProperty(@NotNull ClassOrNamespaceDescriptor owner, @NotNull Name name, @NotNull JavaField field) {
private PropertyDescriptor resolveProperty(@NotNull ClassOrPackageFragmentDescriptor owner, @NotNull Name name, @NotNull JavaField field) {
assert !field.isEnumEntry() : "Enum entries are resolved into classes, not into properties: " + name;
boolean isVar = !field.isFinal();
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java
+1 -1
View File
@@ -133,7 +133,7 @@ public class SingleAbstractMethodUtils {
@NotNull
public static SamConstructorDescriptor createSamConstructorFunction(
@NotNull ClassOrNamespaceDescriptor owner,
@NotNull ClassOrPackageFragmentDescriptor owner,
@NotNull JavaClassDescriptor samInterface
) {
assert isSamInterface(samInterface) : samInterface;
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java
+2 -2
View File
@@ -40,13 +40,13 @@ public abstract class JavaBaseScope extends JetScopeImpl {
@Nullable
private Collection<DeclarationDescriptor> allDescriptors = null;
@NotNull
protected final ClassOrNamespaceDescriptor descriptor;
protected final ClassOrPackageFragmentDescriptor descriptor;
private Collection<ClassDescriptor> innerClasses = null;
protected JavaBaseScope(
@NotNull ClassOrNamespaceDescriptor descriptor,
@NotNull ClassOrPackageFragmentDescriptor descriptor,
@NotNull JavaMemberResolver memberResolver,
@NotNull MembersProvider membersProvider
) {
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassMembersScope.java
+1 -1
View File
@@ -28,7 +28,7 @@ public abstract class JavaClassMembersScope extends JavaBaseScope {
private Map<Name, ClassDescriptor> innerClassesMap = null;
protected JavaClassMembersScope(
@NotNull ClassOrNamespaceDescriptor descriptor,
@NotNull ClassOrPackageFragmentDescriptor descriptor,
@NotNull MembersProvider membersProvider,
@NotNull JavaMemberResolver memberResolver
) {
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaEnumClassObjectScope.java
+2 -2
View File
@@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.java.scope;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.descriptors.ClassOrNamespaceDescriptor;
import org.jetbrains.jet.lang.descriptors.ClassOrPackageFragmentDescriptor;
import org.jetbrains.jet.lang.resolve.java.resolver.JavaMemberResolver;
import org.jetbrains.jet.lang.resolve.java.structure.JavaClass;
@@ -27,7 +27,7 @@ import java.util.Collections;
public class JavaEnumClassObjectScope extends JavaClassMembersScope {
public JavaEnumClassObjectScope(
@NotNull ClassOrNamespaceDescriptor descriptor,
@NotNull ClassOrPackageFragmentDescriptor descriptor,
@NotNull JavaClass javaClass,
@NotNull JavaMemberResolver memberResolver
) {
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorDeserializer.java
+6 -6
View File
@@ -110,7 +110,7 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer
}
@Nullable
private KotlinJvmBinaryClass findKotlinClassByDescriptor(@NotNull ClassOrNamespaceDescriptor descriptor) {
private KotlinJvmBinaryClass findKotlinClassByDescriptor(@NotNull ClassOrPackageFragmentDescriptor descriptor) {
if (descriptor instanceof ClassDescriptor) {
return kotlinClassFinder.findKotlinClass(kotlinFqNameToJavaFqName(naiveKotlinFqName((ClassDescriptor) descriptor)));
}
@@ -218,7 +218,7 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer
@NotNull
@Override
public List<AnnotationDescriptor> loadCallableAnnotations(
@NotNull ClassOrNamespaceDescriptor container,
@NotNull ClassOrPackageFragmentDescriptor container,
@NotNull ProtoBuf.Callable proto,
@NotNull NameResolver nameResolver,
@NotNull AnnotatedCallableKind kind
@@ -231,7 +231,7 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer
@NotNull
private List<AnnotationDescriptor> findClassAndLoadMemberAnnotations(
@NotNull ClassOrNamespaceDescriptor container,
@NotNull ClassOrPackageFragmentDescriptor container,
@NotNull ProtoBuf.Callable proto,
@NotNull NameResolver nameResolver,
@NotNull AnnotatedCallableKind kind,
@@ -249,7 +249,7 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer
@Nullable
private KotlinJvmBinaryClass findClassWithMemberAnnotations(
@NotNull ClassOrNamespaceDescriptor container,
@NotNull ClassOrPackageFragmentDescriptor container,
@NotNull ProtoBuf.Callable proto,
@NotNull NameResolver nameResolver,
@NotNull AnnotatedCallableKind kind
@@ -259,7 +259,7 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer
}
else if (isClassObject(container) && isStaticFieldInOuter(proto)) {
// Backing fields of properties of a class object are generated in the outer class
return findKotlinClassByDescriptor((ClassOrNamespaceDescriptor) container.getContainingDeclaration());
return findKotlinClassByDescriptor((ClassOrPackageFragmentDescriptor) container.getContainingDeclaration());
}
else if (isTrait(container) && kind == AnnotatedCallableKind.PROPERTY) {
PackageFragmentDescriptor containingPackage = DescriptorUtils.getParentOfType(container, PackageFragmentDescriptor.class);
@@ -497,7 +497,7 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer
@NotNull
@Override
public List<AnnotationDescriptor> loadValueParameterAnnotations(
@NotNull ClassOrNamespaceDescriptor container,
@NotNull ClassOrPackageFragmentDescriptor container,
@NotNull ProtoBuf.Callable callable,
@NotNull NameResolver nameResolver,
@NotNull AnnotatedCallableKind kind,