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

Move isEnumClassObject from JavaDescriptorResolver to DescriptorUtils

Browse Source
This commit is contained in:
Natalia.Ukhorskaya
2012-08-22 12:59:18 +04:00
parent b7966f4512
commit aeb297d417
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+1 -7
View File
@@ -1364,7 +1364,7 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
functions.addAll(functionsFromCurrent); functions.addAll(functionsFromCurrent);
if (isEnumClassObject(owner)) { if (DescriptorUtils.isEnumClassObject(owner)) {
for (FunctionDescriptor functionDescriptor : Lists.newArrayList(functions)) { for (FunctionDescriptor functionDescriptor : Lists.newArrayList(functions)) {
if (isEnumSpecialMethod(functionDescriptor)) { if (isEnumSpecialMethod(functionDescriptor)) {
functions.remove(functionDescriptor); functions.remove(functionDescriptor);
@@ -1545,12 +1545,6 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
return (methodName.equals("values") && methodTypeParameters.isEmpty()); return (methodName.equals("values") && methodTypeParameters.isEmpty());
} }
private static boolean isEnumClassObject(@NotNull DeclarationDescriptor classObjectDescriptor) {
DeclarationDescriptor containingDeclaration = classObjectDescriptor.getContainingDeclaration();
return ((containingDeclaration instanceof ClassDescriptor) &&
((ClassDescriptor) containingDeclaration).getKind() == ClassKind.ENUM_CLASS);
}
private List<AnnotationDescriptor> resolveAnnotations(PsiModifierListOwner owner, @NotNull List<Runnable> tasks) { private List<AnnotationDescriptor> resolveAnnotations(PsiModifierListOwner owner, @NotNull List<Runnable> tasks) {
PsiAnnotation[] psiAnnotations = getAllAnnotations(owner); PsiAnnotation[] psiAnnotations = getAllAnnotations(owner);
List<AnnotationDescriptor> r = Lists.newArrayListWithCapacity(psiAnnotations.length); List<AnnotationDescriptor> r = Lists.newArrayListWithCapacity(psiAnnotations.length);
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java
+6
View File
@@ -375,4 +375,10 @@ public class DescriptorUtils {
public static Name getClassObjectName(@NotNull String className) { public static Name getClassObjectName(@NotNull String className) {
return Name.special("<class-object-for-" + className + ">"); return Name.special("<class-object-for-" + className + ">");
} }
public static boolean isEnumClassObject(@NotNull DeclarationDescriptor classObjectDescriptor) {
DeclarationDescriptor containingDeclaration = classObjectDescriptor.getContainingDeclaration();
return ((containingDeclaration instanceof ClassDescriptor) &&
((ClassDescriptor) containingDeclaration).getKind() == ClassKind.ENUM_CLASS);
}
} }