From 2aaafc4569b3d5c33846d0f3bafd177701430747 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <Pavel.Talanov@jetbrains.com>
Date: Mon, 15 Oct 2012 15:23:29 +0400
Subject: [PATCH] Minor refactorings in JavaNamespaceResolver

---
 .../java/resolver/JavaNamespaceResolver.java  | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaNamespaceResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaNamespaceResolver.java
index 0da28f19ad3..e2d192f9239 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaNamespaceResolver.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaNamespaceResolver.java
@@ -74,7 +74,7 @@ public final class JavaNamespaceResolver {
             return searchRule.processFoundInKotlin(kotlinNamespaceDescriptor);
         }
 
-        ResolverNamespaceData namespaceData = namespaceDescriptorCacheByFqn.get(qualifiedName);
+        ResolverNamespaceData namespaceData = lookUpCache(qualifiedName);
         if (namespaceData != null) {
             return namespaceData.getNamespaceDescriptor();
         }
@@ -102,13 +102,17 @@ public final class JavaNamespaceResolver {
         return scopeData.getNamespaceDescriptor();
     }
 
+    private ResolverNamespaceData lookUpCache(FqName qualifiedName) {
+        return namespaceDescriptorCacheByFqn.get(qualifiedName);
+    }
+
     @Nullable
     public NamespaceDescriptor resolveNamespace(@NotNull FqName qualifiedName) {
         return resolveNamespace(qualifiedName, DescriptorSearchRule.ERROR_IF_FOUND_IN_KOTLIN);
     }
 
     @Nullable
-    private NamespaceDescriptorParent resolveParentNamespace(FqName fqName) {
+    private NamespaceDescriptorParent resolveParentNamespace(@NotNull FqName fqName) {
         if (fqName.isRoot()) {
             return FAKE_ROOT_MODULE;
         }
@@ -140,31 +144,29 @@ public final class JavaNamespaceResolver {
                 break lookingForPsi;
             }
 
-            ResolverNamespaceData oldValue =
-                    namespaceDescriptorCacheByFqn.put(fqName, ResolverNamespaceData.NEGATIVE);
-            if (oldValue != null) {
-                throw new IllegalStateException("rewrite at " + fqName);
-            }
+            cache(fqName, ResolverNamespaceData.NEGATIVE);
             return null;
         }
 
-        ResolverNamespaceData namespaceData =
-                new ResolverNamespaceData(psiClass, psiPackage, fqName, ns);
+        ResolverNamespaceData namespaceData = new ResolverNamespaceData(psiClass, psiPackage, fqName, ns);
 
         namespaceData.setMemberScope(new JavaPackageScope(fqName, javaSemanticServices, namespaceData));
 
-        ResolverNamespaceData oldValue =
-                namespaceDescriptorCacheByFqn.put(fqName, namespaceData);
-        if (oldValue != null) {
-            throw new IllegalStateException("rewrite at " + fqName);
-        }
+        cache(fqName, namespaceData);
 
         return namespaceData;
     }
 
+    private void cache(@NotNull FqName fqName, @NotNull ResolverNamespaceData namespaceData) {
+        ResolverNamespaceData oldValue = namespaceDescriptorCacheByFqn.put(fqName, namespaceData);
+        if (oldValue != null) {
+            throw new IllegalStateException("rewrite at " + fqName);
+        }
+    }
+
     @Nullable
     public JavaPackageScope getJavaPackageScope(@NotNull FqName fqName, @NotNull NamespaceDescriptor ns) {
-        ResolverNamespaceData resolverNamespaceData = namespaceDescriptorCacheByFqn.get(fqName);
+        ResolverNamespaceData resolverNamespaceData = lookUpCache(fqName);
         if (resolverNamespaceData == null) {
             resolverNamespaceData = createNamespaceResolverScopeData(fqName, ns);
         }