From 76e407e168eeddb78e98029be05df95c5e77f0f8 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <Pavel.Talanov@jetbrains.com>
Date: Tue, 28 Aug 2012 20:10:34 +0400
Subject: [PATCH] INTERNAL_VISIBILITIES constant renamed to
 INVISIBLE_FROM_OTHER_MODULES in order not be confused with INTERNAL
 visibility.

The only usage in DataFlowValueFactory renamed accordingly.
---
 .../jetbrains/jet/lang/descriptors/Visibilities.java   |  2 +-
 .../resolve/calls/autocasts/DataFlowValueFactory.java  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/Visibilities.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/Visibilities.java
index dabf828e242..9ca209f0dbf 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/Visibilities.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/Visibilities.java
@@ -105,7 +105,7 @@ public class Visibilities {
         }
     };
 
-    public static final Set<Visibility> INTERNAL_VISIBILITIES = Sets.newHashSet(PRIVATE, INTERNAL, LOCAL);
+    public static final Set<Visibility> INVISIBLE_FROM_OTHER_MODULES = Sets.newHashSet(PRIVATE, INTERNAL, LOCAL);
 
     private Visibilities() {
     }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DataFlowValueFactory.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DataFlowValueFactory.java
index 6d2429f42c1..f2a80165b91 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DataFlowValueFactory.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DataFlowValueFactory.java
@@ -24,9 +24,9 @@ import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.JetModuleUtil;
 import org.jetbrains.jet.lang.resolve.scopes.receivers.ThisReceiverDescriptor;
-import org.jetbrains.jet.lang.types.lang.JetStandardClasses;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.TypeUtils;
+import org.jetbrains.jet.lang.types.lang.JetStandardClasses;
 
 import static org.jetbrains.jet.lang.resolve.BindingContext.REFERENCE_TARGET;
 
@@ -120,7 +120,7 @@ public class DataFlowValueFactory {
         if (variableDescriptor.isVar()) return false;
         if (variableDescriptor instanceof PropertyDescriptor) {
             PropertyDescriptor propertyDescriptor = (PropertyDescriptor) variableDescriptor;
-            if (!isInternal(propertyDescriptor)) return false;
+            if (!invisibleFromOtherModules(propertyDescriptor)) return false;
             if (!isFinal(propertyDescriptor)) return false;
             if (!hasDefaultGetter(propertyDescriptor)) return false;
         }
@@ -141,15 +141,15 @@ public class DataFlowValueFactory {
         return true;
     }
 
-    private static boolean isInternal(@NotNull DeclarationDescriptorWithVisibility descriptor) {
-        if (Visibilities.INTERNAL_VISIBILITIES.contains(descriptor.getVisibility())) return true;
+    private static boolean invisibleFromOtherModules(@NotNull DeclarationDescriptorWithVisibility descriptor) {
+        if (Visibilities.INVISIBLE_FROM_OTHER_MODULES.contains(descriptor.getVisibility())) return true;
 
         DeclarationDescriptor containingDeclaration = descriptor.getContainingDeclaration();
         if (!(containingDeclaration instanceof DeclarationDescriptorWithVisibility)) {
             return false;
         }
 
-        return isInternal((DeclarationDescriptorWithVisibility) containingDeclaration);
+        return invisibleFromOtherModules((DeclarationDescriptorWithVisibility) containingDeclaration);
     }
 
     private static boolean hasDefaultGetter(PropertyDescriptor propertyDescriptor) {