From fe61d51c10546976acc79c1391d79b2154303969 Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Thu, 7 Feb 2013 20:59:44 +0400 Subject: [PATCH] rename replace->create method --- .../calls/context/BasicCallResolutionContext.java | 2 +- .../context/CallCandidateResolutionContext.java | 2 +- .../resolve/calls/context/ResolutionContext.java | 12 ++++++------ .../jet/lang/resolve/calls/tasks/ResolutionTask.java | 2 +- .../types/expressions/ExpressionTypingContext.java | 2 +- 5 files changed, 10 insertions(+), 10 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 4fd9a92ea6a..8d7ff82af82 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 @@ -44,7 +44,7 @@ public class BasicCallResolutionContext extends CallResolutionContext } @Override - protected CallCandidateResolutionContext replace( + protected CallCandidateResolutionContext create( @NotNull BindingTrace trace, @NotNull JetScope scope, @NotNull DataFlowInfo dataFlowInfo, 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 14a46480f93..0806345b7f4 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 @@ -47,7 +47,7 @@ public abstract class ResolutionContext { this.namespacesAllowed = namespacesAllowed; } - protected abstract Context replace( + protected abstract Context create( @NotNull BindingTrace trace, @NotNull JetScope scope, @NotNull DataFlowInfo dataFlowInfo, @@ -59,32 +59,32 @@ public abstract class ResolutionContext { public Context replaceBindingTrace(@NotNull BindingTrace trace) { if (this.trace == trace) return self(); - return replace(trace, scope, dataFlowInfo, expectedType, namespacesAllowed); + return create(trace, scope, dataFlowInfo, expectedType, namespacesAllowed); } @NotNull public Context replaceNamespacesAllowed(boolean namespacesAllowed) { if (namespacesAllowed == this.namespacesAllowed) return self(); - return replace(trace, scope, dataFlowInfo, expectedType, namespacesAllowed); + return create(trace, scope, dataFlowInfo, expectedType, namespacesAllowed); } @NotNull public Context replaceDataFlowInfo(DataFlowInfo newDataFlowInfo) { if (newDataFlowInfo == dataFlowInfo) return self(); - return replace(trace, scope, newDataFlowInfo, expectedType, namespacesAllowed); + return create(trace, scope, newDataFlowInfo, expectedType, namespacesAllowed); } @NotNull public Context replaceExpectedType(@Nullable JetType newExpectedType) { if (newExpectedType == null) return replaceExpectedType(TypeUtils.NO_EXPECTED_TYPE); if (expectedType == newExpectedType) return self(); - return replace(trace, scope, dataFlowInfo, newExpectedType, namespacesAllowed); + return create(trace, scope, dataFlowInfo, newExpectedType, namespacesAllowed); } @NotNull public Context replaceScope(@NotNull JetScope newScope) { if (newScope == scope) return self(); - return replace(trace, newScope, dataFlowInfo, expectedType, namespacesAllowed); + return create(trace, newScope, dataFlowInfo, expectedType, namespacesAllowed); } @NotNull 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 2468db6f3b1..762013ad00f 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 @@ -78,7 +78,7 @@ public class ResolutionTask extends C } @Override - protected ResolutionTask replace( + protected ResolutionTask create( @NotNull BindingTrace trace, @NotNull JetScope scope, @NotNull DataFlowInfo dataFlowInfo, 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 31a2abd2262..479cca0acda 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 @@ -76,7 +76,7 @@ public class ExpressionTypingContext extends ResolutionContext