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

Inner Java Enums

Browse Source 
KT-2691 Fixed
 KT-2686 Fixed
This commit is contained in:
Natalia.Ukhorskaya
2012-09-24 12:33:58 +04:00
parent bd22a94907
commit 32d707ca9b
5 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptorLite.java
+7 -6
View File
@@ -101,13 +101,14 @@ public abstract class MutableClassDescriptorLite extends ClassDescriptorBase
return this;
}
private static boolean isStatic(DeclarationDescriptor declarationDescriptor) {
if (declarationDescriptor instanceof NamespaceDescriptor) {
private static boolean isStatic(ClassDescriptor declarationClassDescriptor) {
DeclarationDescriptor containingDescriptor = declarationClassDescriptor.getContainingDeclaration();
if (containingDescriptor instanceof NamespaceDescriptor) {
return true;
}
else if (declarationDescriptor instanceof ClassDescriptor) {
ClassDescriptor classDescriptor = (ClassDescriptor) declarationDescriptor;
return classDescriptor.getKind().isObject() || classDescriptor.getKind() == ClassKind.ENUM_CLASS;
else if (containingDescriptor instanceof ClassDescriptor) {
ClassDescriptor containingClassDescriptor = (ClassDescriptor) containingDescriptor;
return containingClassDescriptor.getKind().isObject() || declarationClassDescriptor.getKind() == ClassKind.ENUM_CLASS;
}
else {
return false;
@@ -303,7 +304,7 @@ public abstract class MutableClassDescriptorLite extends ClassDescriptorBase
return ClassObjectStatus.DUPLICATE;
}
if (!isStatic(MutableClassDescriptorLite.this.getContainingDeclaration())) {
if (!isStatic(MutableClassDescriptorLite.this)) {
return ClassObjectStatus.NOT_ALLOWED;
}