From 67b8d3a875e75753c053df4f7f72d16612ac394b Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Thu, 29 May 2014 21:14:09 +0400 Subject: [PATCH] Minor. Methods reordered --- .../jet/lang/resolve/OverridingUtil.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java index 26926f71487..410f5c99c6a 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java @@ -68,18 +68,6 @@ public class OverridingUtil { return isOverridableByImpl(superDescriptor, subDescriptor, true); } - private static List compiledValueParameters(CallableDescriptor callableDescriptor) { - ReceiverParameterDescriptor receiverParameter = callableDescriptor.getReceiverParameter(); - ArrayList parameters = new ArrayList(); - if (receiverParameter != null) { - parameters.add(receiverParameter.getType()); - } - for (ValueParameterDescriptor valueParameterDescriptor : callableDescriptor.getValueParameters()) { - parameters.add(valueParameterDescriptor.getType()); - } - return parameters; - } - /** * @param forOverride true for override, false for overload */ @@ -169,7 +157,7 @@ public class OverridingUtil { return OverrideCompatibilityInfo.valueParameterTypeMismatch(superValueParameterType, subValueParameterType, OverrideCompatibilityInfo.Result.INCOMPATIBLE); } } - + return OverrideCompatibilityInfo.success(); } @@ -178,7 +166,19 @@ public class OverridingUtil { return OverrideCompatibilityInfo.success(); } - + + private static List compiledValueParameters(CallableDescriptor callableDescriptor) { + ReceiverParameterDescriptor receiverParameter = callableDescriptor.getReceiverParameter(); + ArrayList parameters = new ArrayList(); + if (receiverParameter != null) { + parameters.add(receiverParameter.getType()); + } + for (ValueParameterDescriptor valueParameterDescriptor : callableDescriptor.getValueParameters()) { + parameters.add(valueParameterDescriptor.getType()); + } + return parameters; + } + private static JetType getUpperBound(JetType type) { if (type.getConstructor().getDeclarationDescriptor() instanceof ClassDescriptor) { return type;