From 2ee2f6b0ae2b6f546c57eb0b227a4e1b1f84312e Mon Sep 17 00:00:00 2001 From: nik Date: Mon, 11 Feb 2019 18:50:37 +0300 Subject: [PATCH] simplification: replaces Collections.sort with List.sort in intellij.platform.util module --- .../openapi/diff/impl/fragments/FragmentListImpl.java | 3 +-- .../util/src/com/intellij/openapi/util/text/StringUtil.java | 2 +- .../util/src/com/intellij/util/containers/ContainerUtil.java | 2 +- .../util/src/com/intellij/util/containers/JBIterable.java | 2 +- platform/util/src/com/intellij/util/graph/DFSTBuilder.java | 2 +- .../com/intellij/util/io/PersistentHashMapValueStorage.java | 3 ++- .../util/src/com/intellij/util/io/zip/ReorderJarsMain.java | 2 +- platform/util/src/com/intellij/util/text/TextRangeUtil.java | 2 +- platform/util/src/com/intellij/util/ui/FontInfo.java | 4 ++-- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/platform/util/src/com/intellij/openapi/diff/impl/fragments/FragmentListImpl.java b/platform/util/src/com/intellij/openapi/diff/impl/fragments/FragmentListImpl.java index 831584921e9b..5db2f43df911 100644 --- a/platform/util/src/com/intellij/openapi/diff/impl/fragments/FragmentListImpl.java +++ b/platform/util/src/com/intellij/openapi/diff/impl/fragments/FragmentListImpl.java @@ -21,7 +21,6 @@ import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.TextRange; import java.util.ArrayList; -import java.util.Collections; import java.util.Comparator; import java.util.Iterator; @@ -34,7 +33,7 @@ public class FragmentListImpl implements FragmentList { } private void init() { - Collections.sort(myFragments, FRAGMENT_COMPARATOR); + myFragments.sort(FRAGMENT_COMPARATOR); myFragments.trimToSize(); } diff --git a/platform/util/src/com/intellij/openapi/util/text/StringUtil.java b/platform/util/src/com/intellij/openapi/util/text/StringUtil.java index d5bc9eb0c902..07572ab47076 100644 --- a/platform/util/src/com/intellij/openapi/util/text/StringUtil.java +++ b/platform/util/src/com/intellij/openapi/util/text/StringUtil.java @@ -109,7 +109,7 @@ public class StringUtil extends StringUtilRt { public static List getWordsInStringLongestFirst(@NotNull String find) { List words = getWordsIn(find); // hope long words are rare - Collections.sort(words, (o1, o2) -> o2.length() - o1.length()); + words.sort((o1, o2) -> o2.length() - o1.length()); return words; } diff --git a/platform/util/src/com/intellij/util/containers/ContainerUtil.java b/platform/util/src/com/intellij/util/containers/ContainerUtil.java index 224f81a4c5d5..5640072c32be 100644 --- a/platform/util/src/com/intellij/util/containers/ContainerUtil.java +++ b/platform/util/src/com/intellij/util/containers/ContainerUtil.java @@ -1808,7 +1808,7 @@ public class ContainerUtil extends ContainerUtilRt { } } else { - Collections.sort(list, comparator); + list.sort(comparator); } } diff --git a/platform/util/src/com/intellij/util/containers/JBIterable.java b/platform/util/src/com/intellij/util/containers/JBIterable.java index a46393f40caa..11d776e51308 100644 --- a/platform/util/src/com/intellij/util/containers/JBIterable.java +++ b/platform/util/src/com/intellij/util/containers/JBIterable.java @@ -805,7 +805,7 @@ public abstract class JBIterable implements Iterable { @NotNull public final JBIterable sort(@NotNull Comparator comparator) { ArrayList list = addAllTo(ContainerUtilRt.newArrayList()); - Collections.sort(list, comparator); + list.sort(comparator); return from(list); } diff --git a/platform/util/src/com/intellij/util/graph/DFSTBuilder.java b/platform/util/src/com/intellij/util/graph/DFSTBuilder.java index 677854eae46d..9a3e8f45dc7f 100644 --- a/platform/util/src/com/intellij/util/graph/DFSTBuilder.java +++ b/platform/util/src/com/intellij/util/graph/DFSTBuilder.java @@ -370,7 +370,7 @@ public class DFSTBuilder { @NotNull public List getSortedNodes() { List result = new ArrayList<>(myGraph.getNodes()); - Collections.sort(result, comparator()); + result.sort(comparator()); return result; } } \ No newline at end of file diff --git a/platform/util/src/com/intellij/util/io/PersistentHashMapValueStorage.java b/platform/util/src/com/intellij/util/io/PersistentHashMapValueStorage.java index ecaeb84525d7..76489ef6367c 100644 --- a/platform/util/src/com/intellij/util/io/PersistentHashMapValueStorage.java +++ b/platform/util/src/com/intellij/util/io/PersistentHashMapValueStorage.java @@ -280,7 +280,8 @@ public class PersistentHashMapValueStorage { private long compactValuesWithoutChunks(@NotNull List infos, @NotNull PersistentHashMapValueStorage storage) throws IOException { //infos = new ArrayList(infos); - Collections.sort(infos, (Comparator)(info, info2) -> Comparing.compare(info.valueAddress, info2.valueAddress)); + infos + .sort((Comparator)(info, info2) -> Comparing.compare(info.valueAddress, info2.valueAddress)); final int fileBufferLength = 256 * 1024; final byte[] buffer = new byte[fileBufferLength]; diff --git a/platform/util/src/com/intellij/util/io/zip/ReorderJarsMain.java b/platform/util/src/com/intellij/util/io/zip/ReorderJarsMain.java index a6c205716b7e..ff5ec1e1256c 100644 --- a/platform/util/src/com/intellij/util/io/zip/ReorderJarsMain.java +++ b/platform/util/src/com/intellij/util/io/zip/ReorderJarsMain.java @@ -53,7 +53,7 @@ public class ReorderJarsMain { final List entries = zipFile.getEntries(); final List orderedEntries = toReorder.get(jarUrl); assert orderedEntries.size() <= Short.MAX_VALUE : jarUrl; - Collections.sort(entries, (o1, o2) -> { + entries.sort((o1, o2) -> { if ("META-INF/plugin.xml".equals(o2.getName())) return Integer.MAX_VALUE; if ("META-INF/plugin.xml".equals(o1.getName())) return -Integer.MAX_VALUE; if (orderedEntries.contains(o1.getName())) { diff --git a/platform/util/src/com/intellij/util/text/TextRangeUtil.java b/platform/util/src/com/intellij/util/text/TextRangeUtil.java index 89f54544ee46..d5abe2282e9a 100644 --- a/platform/util/src/com/intellij/util/text/TextRangeUtil.java +++ b/platform/util/src/com/intellij/util/text/TextRangeUtil.java @@ -49,7 +49,7 @@ public class TextRangeUtil { public static Iterable excludeRanges(@NotNull TextRange original, @NotNull List excludedRanges) { if (!excludedRanges.isEmpty()) { if (excludedRanges.size() > 1) { - Collections.sort(excludedRanges, RANGE_COMPARATOR); + excludedRanges.sort(RANGE_COMPARATOR); } int enabledRangeStart = original.getStartOffset(); List enabledRanges = new ArrayList<>(); diff --git a/platform/util/src/com/intellij/util/ui/FontInfo.java b/platform/util/src/com/intellij/util/ui/FontInfo.java index d7bf05924d5e..9d93d43243ad 100644 --- a/platform/util/src/com/intellij/util/ui/FontInfo.java +++ b/platform/util/src/com/intellij/util/ui/FontInfo.java @@ -126,7 +126,7 @@ public final class FontInfo { if (info != null) list.add(info); } } - Collections.sort(list, COMPARATOR); + list.sort(COMPARATOR); return Collections.unmodifiableList(list); } @@ -145,7 +145,7 @@ public final class FontInfo { FontInfo info = find(list, name); if (info != null) list.remove(info); } - Collections.sort(list, COMPARATOR); + list.sort(COMPARATOR); return Collections.unmodifiableList(list); }