From 38a10bfb86fcfad546b9d2996ed3f4c854ea0183 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <Pavel.Talanov@jetbrains.com>
Date: Sat, 6 Oct 2012 18:46:05 +0400
Subject: [PATCH] Rename: JavaDescriptorPropertiesResolver ->
 PropertiesResolver

---
 .../lang/resolve/java/JavaDescriptorResolver.java  | 14 +++++++-------
 ...ertiesResolver.java => PropertiesResolver.java} |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)
 rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/{JavaDescriptorPropertiesResolver.java => PropertiesResolver.java} (99%)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
index d0f2b6395c2..60619cbd66a 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
@@ -42,7 +42,7 @@ import org.jetbrains.jet.lang.resolve.java.kotlinSignature.AlternativeMethodSign
 import org.jetbrains.jet.lang.resolve.java.kt.DescriptorKindUtils;
 import org.jetbrains.jet.lang.resolve.java.kt.PsiAnnotationWithFlags;
 import org.jetbrains.jet.lang.resolve.java.resolver.ClassResolver;
-import org.jetbrains.jet.lang.resolve.java.resolver.JavaDescriptorPropertiesResolver;
+import org.jetbrains.jet.lang.resolve.java.resolver.PropertiesResolver;
 import org.jetbrains.jet.lang.resolve.java.scope.JavaClassMembersScope;
 import org.jetbrains.jet.lang.resolve.java.scope.JavaPackageScope;
 import org.jetbrains.jet.lang.resolve.java.wrapper.PsiClassWrapper;
@@ -123,7 +123,7 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
     private BindingTrace trace;
     private PsiClassFinder psiClassFinder;
     private JavaDescriptorSignatureResolver javaDescriptorSignatureResolver;
-    private JavaDescriptorPropertiesResolver javaDescriptorPropertiesResolver = new JavaDescriptorPropertiesResolver(this);
+    private PropertiesResolver propertiesResolver = new PropertiesResolver(this);
     private final ClassResolver classResolver = new ClassResolver(this);
 
     @Inject
@@ -134,13 +134,13 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
     @Inject
     public void setSemanticServices(JavaSemanticServices semanticServices) {
         this.semanticServices = semanticServices;
-        this.javaDescriptorPropertiesResolver.setSemanticServices(semanticServices);
+        this.propertiesResolver.setSemanticServices(semanticServices);
     }
 
     @Inject
     public void setTrace(BindingTrace trace) {
         this.trace = trace;
-        this.javaDescriptorPropertiesResolver.setTrace(trace);
+        this.propertiesResolver.setTrace(trace);
     }
 
     @Inject
@@ -151,7 +151,7 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
     @Inject
     public void setJavaDescriptorSignatureResolver(JavaDescriptorSignatureResolver javaDescriptorSignatureResolver) {
         this.javaDescriptorSignatureResolver = javaDescriptorSignatureResolver;
-        this.javaDescriptorPropertiesResolver.setJavaDescriptorSignatureResolver(javaDescriptorSignatureResolver);
+        this.propertiesResolver.setJavaDescriptorSignatureResolver(javaDescriptorSignatureResolver);
     }
 
 
@@ -831,7 +831,7 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
 
         //noinspection ConstantConditions
         String qualifiedName = psiClass == null ? scopeData.getPsiPackage().getQualifiedName() : psiClass.getQualifiedName();
-        javaDescriptorPropertiesResolver.resolveNamedGroupProperties(scopeData.getClassOrNamespaceDescriptor(), scopeData, namedMembers, fieldName,
+        propertiesResolver.resolveNamedGroupProperties(scopeData.getClassOrNamespaceDescriptor(), scopeData, namedMembers, fieldName,
                 "class or namespace " + qualifiedName);
 
         return namedMembers.getPropertyDescriptors();
@@ -850,7 +850,7 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
             NamedMembers namedMembers = entry.getValue();
             Name propertyName = entry.getKey();
 
-            javaDescriptorPropertiesResolver.resolveNamedGroupProperties(
+            propertiesResolver.resolveNamedGroupProperties(
                     scopeData.getClassOrNamespaceDescriptor(), scopeData, namedMembers, propertyName,
                     "class or namespace " + psiClass.getQualifiedName());
             descriptors.addAll(namedMembers.getPropertyDescriptors());
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaDescriptorPropertiesResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PropertiesResolver.java
similarity index 99%
rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaDescriptorPropertiesResolver.java
rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PropertiesResolver.java
index 945cf504dc3..b133e24b3d5 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaDescriptorPropertiesResolver.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PropertiesResolver.java
@@ -41,7 +41,7 @@ import org.jetbrains.jet.lang.types.TypeUtils;
 
 import java.util.*;
 
-public final class JavaDescriptorPropertiesResolver {
+public final class PropertiesResolver {
 
     private static class GroupingValue {
         PropertyAccessorData getter;
@@ -56,7 +56,7 @@ public final class JavaDescriptorPropertiesResolver {
     private BindingTrace trace;
 
     /* internal */
-    public JavaDescriptorPropertiesResolver(JavaDescriptorResolver resolver) {
+    public PropertiesResolver(JavaDescriptorResolver resolver) {
         this.javaDescriptorResolver = resolver;
     }