From b55114055ef0647a731129e490b6083d1f8a0e0b Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Thu, 20 Nov 2014 14:14:14 +0300 Subject: [PATCH] Change usage "v == Visibilities.PRIVATE" to Visibilities.isPrivate(v) --- compiler/backend/src/org/jetbrains/jet/codegen/AsmUtil.java | 2 +- .../src/org/jetbrains/jet/codegen/FunctionCodegen.java | 4 ++-- .../backend/src/org/jetbrains/jet/codegen/JvmCodegenUtil.java | 4 ++-- .../src/org/jetbrains/jet/codegen/PropertyCodegen.java | 4 ++-- .../src/org/jetbrains/jet/codegen/state/JetTypeMapper.java | 2 +- .../org/jetbrains/jet/lang/resolve/DescriptorResolver.java | 4 ++-- .../resolve/calls/NeedSyntheticCallResolverExtension.java | 2 +- .../jet/lang/resolve/extension/InlineAnalyzerExtension.java | 2 +- .../org/jetbrains/jet/lang/resolve/java/JavaVisibilities.java | 4 ++-- .../src/org/jetbrains/jet/lang/resolve/OverridingUtil.java | 2 +- .../org/jetbrains/jet/plugin/JetDescriptorIconProvider.java | 2 +- .../jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java | 2 +- .../org/jetbrains/k2js/translate/context/StaticContext.java | 2 +- .../org/jetbrains/k2js/translate/utils/TranslationUtils.java | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/AsmUtil.java b/compiler/backend/src/org/jetbrains/jet/codegen/AsmUtil.java index c1757152eee..d583faf0bfd 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/AsmUtil.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/AsmUtil.java @@ -324,7 +324,7 @@ public class AsmUtil { if (memberDescriptor instanceof ConstructorDescriptor && isAnonymousObject(memberDescriptor.getContainingDeclaration())) { return NO_FLAG_PACKAGE_PRIVATE; } - if (memberVisibility != Visibilities.PRIVATE) { + if (!Visibilities.isPrivate(memberVisibility)) { return null; } // the following code is only for PRIVATE visibility of member diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java index 56c34c76c98..f1e68a5abc5 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java @@ -754,8 +754,8 @@ public class FunctionCodegen extends ParentCodegenAware { if (CodegenBinding.canHaveOuter(context, classDescriptor)) return false; - if (classDescriptor.getVisibility() == Visibilities.PRIVATE || - constructorDescriptor.getVisibility() == Visibilities.PRIVATE) return false; + if (Visibilities.isPrivate(classDescriptor.getVisibility()) || + Visibilities.isPrivate(constructorDescriptor.getVisibility())) return false; if (constructorDescriptor.getValueParameters().isEmpty()) return false; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/JvmCodegenUtil.java b/compiler/backend/src/org/jetbrains/jet/codegen/JvmCodegenUtil.java index 52cdadebfbe..960d6aff212 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/JvmCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/JvmCodegenUtil.java @@ -166,7 +166,7 @@ public class JvmCodegenUtil { if (JetTypeMapper.isAccessor(property)) return false; // Inline functions can't use direct access because a field may not be visible at the call site - if (context.isInlineFunction() && property.getVisibility() != Visibilities.PRIVATE) return false; + if (context.isInlineFunction() && !Visibilities.isPrivate(property.getVisibility())) return false; // Only properties of the same class can be directly accessed, except when we are evaluating expressions in the debugger if (!isCallInsideSameClassAsDeclared(property, context) && !isDebuggerContext(context)) return false; @@ -186,7 +186,7 @@ public class JvmCodegenUtil { if (accessor.hasBody()) return false; // If the accessor is private or final, it can't be overridden in the subclass and thus we can use direct access - return property.getVisibility() == Visibilities.PRIVATE || accessor.getModality() == FINAL; + return Visibilities.isPrivate(property.getVisibility()) || accessor.getModality() == FINAL; } private static boolean isDebuggerContext(@NotNull MethodContext context) { diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java index b0f66609d98..10dc6ed6592 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java @@ -149,7 +149,7 @@ public class PropertyCodegen { if (isClassObject(descriptor.getContainingDeclaration())) return true; // Private class properties have accessors only in cases when those accessors are non-trivial - if (kind == OwnerKind.IMPLEMENTATION && descriptor.getVisibility() == Visibilities.PRIVATE) { + if (kind == OwnerKind.IMPLEMENTATION && Visibilities.isPrivate(descriptor.getVisibility())) { return !isDefaultAccessor; } @@ -158,7 +158,7 @@ public class PropertyCodegen { public void generatePrimaryConstructorProperty(JetParameter p, PropertyDescriptor descriptor) { generateBackingField(p, descriptor); - if (descriptor.getVisibility() != Visibilities.PRIVATE) { + if (!Visibilities.isPrivate(descriptor.getVisibility())) { generateGetter(p, descriptor, null); if (descriptor.isVar()) { generateSetter(p, descriptor, null); diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java index bacc65d3568..be45a17e4eb 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java @@ -493,7 +493,7 @@ public class JetTypeMapper { invokeOpcode = INVOKEINTERFACE; } else { - boolean isPrivateFunInvocation = functionDescriptor.getVisibility() == Visibilities.PRIVATE; + boolean isPrivateFunInvocation = Visibilities.isPrivate(functionDescriptor.getVisibility()); invokeOpcode = superCall || isPrivateFunInvocation ? INVOKESPECIAL : INVOKEVIRTUAL; } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java index 9c6723a7822..0154bfeb9ba 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java @@ -889,7 +889,7 @@ public class DescriptorResolver { private static void initializeWithDefaultGetterSetter(PropertyDescriptorImpl propertyDescriptor) { PropertyGetterDescriptorImpl getter = propertyDescriptor.getGetter(); - if (getter == null && propertyDescriptor.getVisibility() != Visibilities.PRIVATE) { + if (getter == null && !Visibilities.isPrivate(propertyDescriptor.getVisibility())) { getter = DescriptorFactory.createDefaultGetter(propertyDescriptor); getter.initialize(propertyDescriptor.getType()); } @@ -1144,7 +1144,7 @@ public class DescriptorResolver { boolean isLocal = DescriptorUtils.isLocal(descriptor); Visibility visibility = descriptor.getVisibility(); boolean transformNeeded = !isLocal && !visibility.isPublicAPI() - && !(definedInClass && Visibilities.PRIVATE.equals(visibility)); + && !(definedInClass && Visibilities.isPrivate(visibility)); if (transformNeeded) { if (type.getConstructor().getSupertypes().size() == 1) { assert type.getArguments().isEmpty() : "Object expression couldn't have any type parameters!"; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/NeedSyntheticCallResolverExtension.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/NeedSyntheticCallResolverExtension.java index 395edf25d85..034d5081674 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/NeedSyntheticCallResolverExtension.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/NeedSyntheticCallResolverExtension.java @@ -44,7 +44,7 @@ public class NeedSyntheticCallResolverExtension implements CallResolverExtension // e.g.: from class to classobject) controlled via NEED_SYNTHETIC_ACCESSOR slice private boolean needSyntheticAccessor(JetScope invokationScope, CallableDescriptor targetDescriptor) { return targetDescriptor instanceof CallableMemberDescriptor && - targetDescriptor.getVisibility() == Visibilities.PRIVATE && + Visibilities.isPrivate(targetDescriptor.getVisibility()) && targetDescriptor.getContainingDeclaration() != invokationScope.getContainingDeclaration().getContainingDeclaration(); } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/extension/InlineAnalyzerExtension.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/extension/InlineAnalyzerExtension.java index 8a9a638bdbf..323d9810d05 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/extension/InlineAnalyzerExtension.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/extension/InlineAnalyzerExtension.java @@ -98,7 +98,7 @@ public class InlineAnalyzerExtension implements FunctionAnalyzerExtension.Analyz @NotNull JetFunction function, @NotNull BindingTrace trace ) { - if (functionDescriptor.getVisibility() == Visibilities.PRIVATE || functionDescriptor.getModality() == Modality.FINAL) { + if (Visibilities.isPrivate(functionDescriptor.getVisibility()) || functionDescriptor.getModality() == Modality.FINAL) { return; } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaVisibilities.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaVisibilities.java index 401a3af2a74..4aaa15095d8 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaVisibilities.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaVisibilities.java @@ -34,7 +34,7 @@ public class JavaVisibilities { @Override protected Integer compareTo(@NotNull Visibility visibility) { if (this == visibility) return 0; - if (visibility == Visibilities.PRIVATE) return 1; + if (Visibilities.isPrivate(visibility)) return 1; return -1; } @@ -105,7 +105,7 @@ public class JavaVisibilities { protected Integer compareTo(@NotNull Visibility visibility) { if (this == visibility) return 0; if (visibility == Visibilities.INTERNAL) return null; - if (visibility == Visibilities.PRIVATE) return 1; + if (Visibilities.isPrivate(visibility)) return 1; return -1; } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java index 5153a696d78..e35e128774a 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java @@ -378,7 +378,7 @@ public class OverridingUtil { @Override public Boolean invoke(CallableMemberDescriptor descriptor) { //nested class could capture private member, so check for private visibility added - return descriptor.getVisibility() != Visibilities.PRIVATE && Visibilities.isVisible(descriptor, current); + return !Visibilities.isPrivate(descriptor.getVisibility()) && Visibilities.isVisible(descriptor, current); } }); } diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java index 6ef8baec4b4..ffe09d693de 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java @@ -68,7 +68,7 @@ public final class JetDescriptorIconProvider { return PlatformIcons.PROTECTED_ICON; } - if (visibility == Visibilities.PRIVATE) { + if (Visibilities.isPrivate(visibility)) { return PlatformIcons.PRIVATE_ICON; } diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java index f3c7d87a448..335d1775914 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java @@ -81,7 +81,7 @@ public class JetRefactoringUtil { else if (visibility == Visibilities.INTERNAL) { return JetTokens.INTERNAL_KEYWORD; } - else if (visibility == Visibilities.PRIVATE) { + else if (Visibilities.isPrivate(visibility)) { return JetTokens.PRIVATE_KEYWORD; } diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/context/StaticContext.java b/js/js.translator/src/org/jetbrains/k2js/translate/context/StaticContext.java index 2a06ba4f38d..0a21961eb82 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/context/StaticContext.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/context/StaticContext.java @@ -285,7 +285,7 @@ public final class StaticContext { String propertyName = getSuggestedName(propertyDescriptor); if (!isExtension(propertyDescriptor)) { - if (propertyDescriptor.getVisibility() == Visibilities.PRIVATE) { + if (Visibilities.isPrivate(propertyDescriptor.getVisibility())) { propertyName = getMangledName(propertyDescriptor, propertyName); } return declarePropertyOrPropertyAccessorName(descriptor, propertyName, false); diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java b/js/js.translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java index 1e7ce95216b..ef1d1e51041 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java @@ -178,7 +178,7 @@ public final class TranslationUtils { JsName backingFieldName = context.getNameForDescriptor(descriptor); if(!JsDescriptorUtils.isSimpleFinalProperty(descriptor)) { String backingFieldMangledName; - if (descriptor.getVisibility() != Visibilities.PRIVATE) { + if (!Visibilities.isPrivate(descriptor.getVisibility())) { backingFieldMangledName = getMangledName(descriptor, getKotlinBackingFieldName(backingFieldName.getIdent())); } else { backingFieldMangledName = getKotlinBackingFieldName(backingFieldName.getIdent());