From 914db59ea083f32e0ef2d4b9fc856e5d7a949c3e Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Mon, 26 Nov 2012 20:37:23 +0400
Subject: [PATCH] Renamed SignaturesPropagation to SignaturesPropagationData.

---
 ...esPropagation.java => SignaturesPropagationData.java} | 4 ++--
 .../lang/resolve/java/resolver/JavaFunctionResolver.java | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)
 rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/{SignaturesPropagation.java => SignaturesPropagationData.java} (99%)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagation.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java
similarity index 99%
rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagation.java
rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java
index 69197269fd3..11a360428c7 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagation.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java
@@ -39,7 +39,7 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 
 import java.util.*;
 
-public class SignaturesPropagation {
+public class SignaturesPropagationData {
     public static JetType modifyReturnTypeAccordingToSuperMethods(
             @NotNull JetType autoType, // type built by JavaTypeTransformer
             @NotNull List<FunctionDescriptor> superFunctions,
@@ -439,7 +439,7 @@ public class SignaturesPropagation {
         return classifier;
     }
 
-    private SignaturesPropagation() {
+    private SignaturesPropagationData() {
     }
 
     private static class VarargCheckResult {
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
index 9915b2d746c..e50cb0376a8 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
@@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.resolve.*;
 import org.jetbrains.jet.lang.resolve.java.*;
 import org.jetbrains.jet.lang.resolve.java.kotlinSignature.AlternativeMethodSignatureData;
-import org.jetbrains.jet.lang.resolve.java.kotlinSignature.SignaturesPropagation;
+import org.jetbrains.jet.lang.resolve.java.kotlinSignature.SignaturesPropagationData;
 import org.jetbrains.jet.lang.resolve.java.kt.DescriptorKindUtils;
 import org.jetbrains.jet.lang.resolve.java.provider.ClassPsiDeclarationProvider;
 import org.jetbrains.jet.lang.resolve.java.provider.NamedMembers;
@@ -142,7 +142,7 @@ public final class JavaFunctionResolver {
 
         final List<String> signatureErrors = Lists.newArrayList();
 
-        List<FunctionDescriptor> superFunctions = SignaturesPropagation.getSuperFunctionsForMethod(method, trace);
+        List<FunctionDescriptor> superFunctions = SignaturesPropagationData.getSuperFunctionsForMethod(method, trace);
 
         Function1<String, Void> reportError = new Function1<String, Void>() {
             @Override
@@ -151,8 +151,9 @@ public final class JavaFunctionResolver {
                 return null;
             }
         };
-        returnType = SignaturesPropagation.modifyReturnTypeAccordingToSuperMethods(returnType, superFunctions, reportError);
-        valueParameterDescriptors = SignaturesPropagation.modifyValueParametersAccordingToSuperMethods(valueParameterDescriptors, superFunctions, reportError);
+        returnType = SignaturesPropagationData.modifyReturnTypeAccordingToSuperMethods(returnType, superFunctions, reportError);
+        valueParameterDescriptors = SignaturesPropagationData
+                .modifyValueParametersAccordingToSuperMethods(valueParameterDescriptors, superFunctions, reportError);
 
         // TODO consider better place for this check
         AlternativeMethodSignatureData alternativeMethodSignatureData =