From b37c57cf2bd294f5cedcc82783ce188b5ce2442c Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Wed, 12 Feb 2014 13:02:23 +0400
Subject: [PATCH] Minor: remove redundant implementations of
 ResolutionContext#self

---
 .../resolve/calls/context/BasicCallResolutionContext.java | 5 -----
 .../calls/context/CallCandidateResolutionContext.java     | 5 -----
 .../jet/lang/resolve/calls/context/ResolutionContext.java | 8 ++++++--
 .../resolve/calls/context/SimpleResolutionContext.java    | 5 -----
 .../jet/lang/resolve/calls/tasks/ResolutionTask.java      | 5 -----
 .../lang/types/expressions/ExpressionTypingContext.java   | 5 -----
 6 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/BasicCallResolutionContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/BasicCallResolutionContext.java
index 55ecd9c9f6e..a8de8be4b38 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/BasicCallResolutionContext.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/BasicCallResolutionContext.java
@@ -90,9 +90,4 @@ public class BasicCallResolutionContext extends CallResolutionContext<BasicCallR
         return create(trace, scope, call, expectedType, dataFlowInfo, contextDependency, checkArguments, resolutionResultsCache,
                       labelResolver, dataFlowInfoForArguments, callResolverExtension, isAnnotationContext);
     }
-
-    @Override
-    protected BasicCallResolutionContext self() {
-        return this;
-    }
 }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallCandidateResolutionContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallCandidateResolutionContext.java
index aa8fd6c1534..16c036a8abd 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallCandidateResolutionContext.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallCandidateResolutionContext.java
@@ -98,9 +98,4 @@ public final class CallCandidateResolutionContext<D extends CallableDescriptor>
                 candidateCall, tracing, trace, scope, call, expectedType, dataFlowInfo, contextDependency, checkArguments,
                 resolutionResultsCache, labelResolver, dataFlowInfoForArguments, callResolverExtension, isAnnotationContext);
     }
-
-    @Override
-    protected CallCandidateResolutionContext<D> self() {
-        return this;
-    }
 }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/ResolutionContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/ResolutionContext.java
index 3c219b8cc2d..0bc186c8643 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/ResolutionContext.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/ResolutionContext.java
@@ -68,8 +68,12 @@ public abstract class ResolutionContext<Context extends ResolutionContext<Contex
             @NotNull ResolutionResultsCache resolutionResultsCache,
             @NotNull LabelResolver labelResolver
     );
-    
-    protected abstract Context self();
+
+    @NotNull
+    private Context self() {
+        //noinspection unchecked
+        return (Context) this;
+    }
 
     @NotNull
     public Context replaceBindingTrace(@NotNull BindingTrace trace) {
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/SimpleResolutionContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/SimpleResolutionContext.java
index e3a8be29beb..e9f7b950abc 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/SimpleResolutionContext.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/SimpleResolutionContext.java
@@ -54,9 +54,4 @@ public class SimpleResolutionContext extends ResolutionContext<SimpleResolutionC
                 trace, scope, expectedType, dataFlowInfo, contextDependency, resolutionResultsCache, labelResolver, callResolverExtension,
                 isAnnotationContext);
     }
-
-    @Override
-    protected SimpleResolutionContext self() {
-        return this;
-    }
 }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTask.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTask.java
index 0d773859520..28c9e32457b 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTask.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTask.java
@@ -119,11 +119,6 @@ public class ResolutionTask<D extends CallableDescriptor, F extends D> extends C
         return newTask;
     }
 
-    @Override
-    protected ResolutionTask<D, F> self() {
-        return this;
-    }
-
     public ResolutionTask<D, F> replaceCall(@NotNull Call newCall) {
         return new ResolutionTask<D, F>(
                 candidates, reference, tracing, trace, scope, newCall, expectedType, dataFlowInfo, contextDependency, checkArguments,
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingContext.java
index baff7561900..3aef0dfa006 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingContext.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingContext.java
@@ -111,11 +111,6 @@ public class ExpressionTypingContext extends ResolutionContext<ExpressionTypingC
                                            isAnnotationContext);
     }
 
-    @Override
-    protected ExpressionTypingContext self() {
-        return this;
-    }
-
 ///////////// LAZY ACCESSORS
 
     public CompileTimeConstantChecker getCompileTimeConstantChecker() {