Change usage "v == Visibilities.PRIVATE" to Visibilities.isPrivate(v)

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

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 ||
+        if (Visibilities.isPrivate(classDescriptor.getVisibility()) ||
-            constructorDescriptor.getVisibility() == Visibilities.PRIVATE) return false;
+            Visibilities.isPrivate(constructorDescriptor.getVisibility())) return false;
 
         if (constructorDescriptor.getValueParameters().isEmpty()) return false;
 

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) {

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);

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;
                 }
 

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!";

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();
     }
 }

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;
         }
 

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;
         }
 

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);
             }
         });
     }

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;
             }
 

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;
         }
 

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);

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());