This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 1947efd398f35c19c524c93749b42bf63813fd94 Merge: 98c78a55761 2fd7c4d0c77 Author: Matthias Bläsing <[email protected]> AuthorDate: Sun Jun 1 13:28:41 2025 +0200 Merge pull request #8489 from matthiasblaesing/xmlresolver Improve/fix handling of XML Catalogs .../xml/catalog/impl/XCatalogCustomizer.form | 15 +- .../xml/catalog/impl/XCatalogCustomizer.java | 33 +- .../modules/xml/catalog/impl/res/Bundle.java | 4 + .../modules/xml/catalog/impl/res/Bundle.properties | 2 + .../xml/catalog/impl/sun/CatalogCustomizer.form | 17 +- .../xml/catalog/impl/sun/CatalogCustomizer.java | 30 +- .../modules/xml/catalog/impl/sun/res/Bundle.java | 4 + .../xml/catalog/impl/sun/res/Bundle.properties | 1 + .../modules/xml/catalog/impl/AbstractCatalog.java | 155 +++++---- .../modules/xml/catalog/impl/XCatalog.java | 380 +++++++++++---------- .../modules/xml/catalog/impl/XCatalogProvider.java | 3 +- .../modules/xml/catalog/impl/sun/Catalog.java | 123 ++++--- .../xml/catalog/impl/sun/SunCatalogProvider.java | 3 +- .../xml/catalog/settings/CatalogSettings.java | 271 +++++++++------ .../modules/xml/catalog/impl/XCatalogTest.java | 52 +++ .../modules/xml/catalog/impl/sun/CatalogTest.java | 20 ++ .../netbeans/modules/xml/catalog/impl/xcatalog.xml | 27 ++ 17 files changed, 735 insertions(+), 405 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
