rename replace->create method

This commit is contained in:
Svetlana Isakova
2013-02-07 20:59:44 +04:00
parent d418a16dd8
commit fe61d51c10
5 changed files with 10 additions and 10 deletions
@@ -44,7 +44,7 @@ public class BasicCallResolutionContext extends CallResolutionContext<BasicCallR
}
@Override
protected BasicCallResolutionContext replace(
protected BasicCallResolutionContext create(
@NotNull BindingTrace trace,
@NotNull JetScope scope,
@NotNull DataFlowInfo dataFlowInfo,
@@ -74,7 +74,7 @@ public final class CallCandidateResolutionContext<D extends CallableDescriptor>
}
@Override
protected CallCandidateResolutionContext<D> replace(
protected CallCandidateResolutionContext<D> create(
@NotNull BindingTrace trace,
@NotNull JetScope scope,
@NotNull DataFlowInfo dataFlowInfo,
@@ -47,7 +47,7 @@ public abstract class ResolutionContext<Context extends 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<Context extends 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
@@ -78,7 +78,7 @@ public class ResolutionTask<D extends CallableDescriptor, F extends D> extends C
}
@Override
protected ResolutionTask<D, F> replace(
protected ResolutionTask<D, F> create(
@NotNull BindingTrace trace,
@NotNull JetScope scope,
@NotNull DataFlowInfo dataFlowInfo,
@@ -76,7 +76,7 @@ public class ExpressionTypingContext extends ResolutionContext<ExpressionTypingC
}
@Override
protected ExpressionTypingContext replace(
protected ExpressionTypingContext create(
@NotNull BindingTrace trace,
@NotNull JetScope scope,
@NotNull DataFlowInfo dataFlowInfo,