stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8272992: Replace usages of Collections.sort with List.sort call in jdk.* modules

Browse Source 
Reviewed-by: cjplummer, prappo
This commit is contained in:
Andrey Turbanov 2021-10-13 11:34:24 +00:00 committed by Pavel Rappo
parent b8cb76ad21
commit 5ffb5d100f
5 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java
View File

@ -26,7 +26,6 @@
package jdk.javadoc.internal.doclets.formats.html;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -44,7 +43,6 @@ import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
import jdk.javadoc.internal.doclets.formats.html.markup.Text;
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.util.ClassTree;
import jdk.javadoc.internal.doclets.toolkit.util.ClassUseMapper;
@ -178,7 +176,7 @@ public class ClassUseWriter extends SubWriterHolderWriter {
Map<PackageElement, List<Element>> map = new HashMap<>();
List<? extends Element> elements = (List<? extends Element>) classMap.get(typeElement);
if (elements != null) {
Collections.sort(elements, comparators.makeClassUseComparator());
elements.sort(comparators.makeClassUseComparator());
for (Element e : elements) {
PackageElement pkg = utils.containingPackage(e);
pkgSet.add(pkg);

6
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Group.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -147,7 +147,7 @@ public class Group {
elementNameGroupMap.put(mdlPattern, groupname);
}
}
Collections.sort(sortedRegExpList, new MapKeyComparator());
sortedRegExpList.sort(new MapKeyComparator());
return true;
}
@ -193,7 +193,7 @@ public class Group {
elementNameGroupMap.put(pkgPattern, groupname);
}
}
Collections.sort(sortedRegExpList, new MapKeyComparator());
sortedRegExpList.sort(new MapKeyComparator());
return true;
}

7
src/jdk.jcmd/share/classes/sun/tools/jstat/JStatLogger.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -28,7 +28,6 @@ package sun.tools.jstat;
import java.util.*;
import java.io.*;
import sun.jvmstat.monitor.*;
import sun.jvmstat.monitor.event.*;
import java.util.regex.PatternSyntaxException;
/**
@ -56,7 +55,7 @@ public class JStatLogger {
// get the set of all monitors
List<Monitor> items = monitoredVm.findByPattern(names);
Collections.sort(items, comparator);
items.sort(comparator);
for (Monitor m: items) {
if (!(m.isSupported() || showUnsupported)) {
@ -76,7 +75,7 @@ public class JStatLogger {
// get the set of all monitors
List<Monitor> items = monitoredVm.findByPattern(names);
Collections.sort(items, comparator);
items.sort(comparator);
printList(items, verbose, showUnsupported, out);
}

4
src/jdk.jcmd/share/classes/sun/tools/jstat/Jstat.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -113,7 +113,7 @@ public class Jstat {
formatter = new OptionOutputFormatter(monitoredVm, format);
} else {
List<Monitor> logged = monitoredVm.findByPattern(arguments.counterNames());
Collections.sort(logged, arguments.comparator());
logged.sort(arguments.comparator());
List<Monitor> constants = new ArrayList<Monitor>();
for (Iterator<Monitor> i = logged.iterator(); i.hasNext(); /* empty */) {

4
src/jdk.jconsole/share/classes/sun/tools/jconsole/inspector/XOpenTypeViewer.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -281,7 +281,7 @@ public class XOpenTypeViewer extends JPanel implements ActionListener {
// Order tabular data elements using index names
List<CompositeData> data = new ArrayList<CompositeData>(
(Collection<CompositeData>) tabular.values());
Collections.sort(data, new TabularDataComparator(type));
data.sort(new TabularDataComparator(type));
elements = data.toArray();
loadCompositeData((CompositeData) elements[0]);
} else {