From fdf4c431e421312e67dbe926205d982b8bb4d5ee Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 25 Dec 2012 21:15:07 +0400 Subject: [PATCH] Renamed MemberComparator and converted it to singleton. --- .../jet/plugin/libraries/DecompiledDataFactory.java | 2 +- ...tionDescriptorComparator.java => MemberComparator.java} | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) rename idea/src/org/jetbrains/jet/plugin/libraries/{DeclarationDescriptorComparator.java => MemberComparator.java} (94%) diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java b/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java index 025d76d2d56..aa5133913c0 100644 --- a/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java +++ b/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java @@ -125,7 +125,7 @@ public class DecompiledDataFactory { private static List sortDeclarations(Collection input) { ArrayList r = new ArrayList(input); - Collections.sort(r, new DeclarationDescriptorComparator()); + Collections.sort(r, MemberComparator.INSTANCE); return r; } diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/DeclarationDescriptorComparator.java b/idea/src/org/jetbrains/jet/plugin/libraries/MemberComparator.java similarity index 94% rename from idea/src/org/jetbrains/jet/plugin/libraries/DeclarationDescriptorComparator.java rename to idea/src/org/jetbrains/jet/plugin/libraries/MemberComparator.java index cb404862df6..fff68669656 100644 --- a/idea/src/org/jetbrains/jet/plugin/libraries/DeclarationDescriptorComparator.java +++ b/idea/src/org/jetbrains/jet/plugin/libraries/MemberComparator.java @@ -25,7 +25,12 @@ import java.util.Comparator; * @author Evgeny Gerashchenko * @since 4/8/12 */ -class DeclarationDescriptorComparator implements Comparator { +public class MemberComparator implements Comparator { + public static final MemberComparator INSTANCE = new MemberComparator(); + + private MemberComparator() { + } + private static int getDeclarationPriority(DeclarationDescriptor descriptor) { if (descriptor instanceof ClassDescriptor) { return 4;