From c0eb894bd9885d38570a8b808bb47853936562c0 Mon Sep 17 00:00:00 2001
From: Svetlana Isakova <svetlana.isakova@jetbrains.com>
Date: Fri, 3 Oct 2014 14:32:38 +0400
Subject: [PATCH] Rename: NO_RECEIVER_ADMITTED -> NO_RECEIVER_ALLOWED

---
 .../frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java | 2 +-
 .../jet/lang/diagnostics/rendering/DefaultErrorMessages.java    | 2 +-
 .../jet/lang/resolve/calls/tasks/AbstractTracingStrategy.java   | 2 +-
 .../testData/diagnostics/tests/FunctionCalleeExpressions.kt     | 2 +-
 .../resolve/invoke/errors/receiverPresenceErrorForInvoke.kt     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java
index 42890cf2f13..a0fb3bc848b 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java
@@ -357,7 +357,7 @@ public interface Errors {
     DiagnosticFactory1<JetElement, ValueParameterDescriptor> NO_VALUE_FOR_PARAMETER = DiagnosticFactory1.create(ERROR, VALUE_ARGUMENTS);
 
     DiagnosticFactory1<JetExpression, JetType> MISSING_RECEIVER = DiagnosticFactory1.create(ERROR);
-    DiagnosticFactory0<JetExpression> NO_RECEIVER_ADMITTED = DiagnosticFactory0.create(ERROR);
+    DiagnosticFactory0<JetExpression> NO_RECEIVER_ALLOWED = DiagnosticFactory0.create(ERROR);
 
     // Call resolution
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java
index fa1359ca174..b88a2df5e82 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java
@@ -459,7 +459,7 @@ public class DefaultErrorMessages {
 
         MAP.put(NO_VALUE_FOR_PARAMETER, "No value passed for parameter {0}", NAME);
         MAP.put(MISSING_RECEIVER, "A receiver of type {0} is required", RENDER_TYPE);
-        MAP.put(NO_RECEIVER_ADMITTED, "No receiver can be passed to this function or property");
+        MAP.put(NO_RECEIVER_ALLOWED, "No receiver can be passed to this function or property");
 
         MAP.put(CREATING_AN_INSTANCE_OF_ABSTRACT_CLASS, "Cannot create an instance of an abstract class");
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/AbstractTracingStrategy.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/AbstractTracingStrategy.java
index 6ce178b24ef..513ab1f8ba8 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/AbstractTracingStrategy.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/AbstractTracingStrategy.java
@@ -93,7 +93,7 @@ public abstract class AbstractTracingStrategy implements TracingStrategy {
 
     @Override
     public void noReceiverAllowed(@NotNull BindingTrace trace) {
-        trace.report(NO_RECEIVER_ADMITTED.on(reference));
+        trace.report(NO_RECEIVER_ALLOWED.on(reference));
     }
 
     @Override
diff --git a/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.kt b/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.kt
index f02c1b21a01..87e4cd62adc 100644
--- a/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.kt
+++ b/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.kt
@@ -78,5 +78,5 @@ fun test() {
     i<!UNSAFE_CALL!>.<!>{Int.() -> 1}();
     {}<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><Int><!>()
     1<!UNNECESSARY_SAFE_CALL!>?.<!>{Int.() -> 1}()
-    1.<!NO_RECEIVER_ADMITTED!>{}<!>()
+    1.<!NO_RECEIVER_ALLOWED!>{}<!>()
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/receiverPresenceErrorForInvoke.kt b/compiler/testData/diagnostics/tests/resolve/invoke/errors/receiverPresenceErrorForInvoke.kt
index d44d5d7801f..6c303dd98c7 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/receiverPresenceErrorForInvoke.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/receiverPresenceErrorForInvoke.kt
@@ -7,5 +7,5 @@ fun test1(f: String.() -> Unit) {
 fun test2(f: (Int) -> Int) {
     1.<!UNRESOLVED_REFERENCE!>f<!>(2)
 
-    2.<!NO_RECEIVER_ADMITTED!>(f)<!>(2)
+    2.<!NO_RECEIVER_ALLOWED!>(f)<!>(2)
 }
\ No newline at end of file