This is an automated email from the ASF dual-hosted git repository. junichi11 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push: new 7567fdb00c Sort overload methods in the Navigator new a0b7c0d7c2 Merge pull request #5797 from junichi11/java-navigator-sort-overload-methods 7567fdb00c is described below commit 7567fdb00cc9adf14a1c82a21e6cfd97211ccb3f Author: Junichi Yamamoto <junich...@apache.org> AuthorDate: Sat Apr 8 23:01:01 2023 +0900 Sort overload methods in the Navigator --- .../src/org/netbeans/modules/java/navigation/ElementNode.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/java/java.navigation/src/org/netbeans/modules/java/navigation/ElementNode.java b/java/java.navigation/src/org/netbeans/modules/java/navigation/ElementNode.java index 46213077b6..37e4524df1 100644 --- a/java/java.navigation/src/org/netbeans/modules/java/navigation/ElementNode.java +++ b/java/java.navigation/src/org/netbeans/modules/java/navigation/ElementNode.java @@ -673,7 +673,15 @@ public class ElementNode extends AbstractNode implements Iterable<ElementNode> { if (d1.posInKind != d2.posInKind) { return d1.posInKind - d2.posInKind; } - return d1.name.compareTo(d2.name); + int compareToName = d1.name.compareTo(d2.name); + if (compareToName == 0) { + // htmlHeader might stay uninitialized in ElementScanningTask + String htmlHeader1 = d1.htmlHeader != null ? d1.htmlHeader : ""; // NOI18N + String htmlHeader2 = d2.htmlHeader != null ? d2.htmlHeader : ""; // NOI18N + return htmlHeader1.compareTo(htmlHeader2); + } else { + return compareToName; + } } int k2i( ElementKind kind ) { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists