[netbeans] branch master updated (84068cd847 -> 7f4b8169cf)

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

matthiasblaesing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git


    from 84068cd847 Merge pull request #5160 from matthiasblaesing/GH-5134
     new e61af8441b Fix/enable unittests for editor.options
     new f7791e09de Add display name for Maven POM files (text/x-maven-pom+xml -> Maven POM)
     new 5b87b53aab Ensure languages in Options/Editor panels are alphabetically sorted
     new 7f4b8169cf Merge pull request #5164 from matthiasblaesing/ordering_languages_options

The 7836 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/main.yml                         |  3 +++
 .../options/editor/FolderBasedController.java      | 12 +++++++--
 .../completion/CodeCompletionOptionsPanel.java     | 16 ++----------
 .../options/indentation/FormattingPanel.form       |  5 ----
 .../options/indentation/FormattingPanel.java       | 17 ++-----------
 .../modules/options/util/LanguagesComparator.java} | 29 +++++++++++-----------
 .../modules/options/editor/EditorOptionsTest.java  | 11 ++++----
 .../modules/maven/grammar/Bundle.properties        |  1 +
 .../org/netbeans/modules/maven/grammar/layer.xml   |  3 +--
 .../modules/options/OptionsCategoryImpl.java       |  5 ++++
 10 files changed, 45 insertions(+), 57 deletions(-)
 copy ide/{bugtracking/src/org/netbeans/modules/bugtracking/ui/selectors/ConnectorComparator.java => options.editor/src/org/netbeans/modules/options/util/LanguagesComparator.java} (53%)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists