From a9845e3070f96255d000963ef7039e4a5b3165ad Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Wed, 29 Nov 2023 19:30:32 +0100 Subject: [PATCH] Update maven mirror generator action. None of the preset mirrors for maven central exist anymore, this updates the preset to the last known public mirrors and tweaks the UI a bit. Fixed possible NPE when the central list is checked before NotificationLineSupport was attached. --- .../modules/maven/codegen/Bundle.properties | 6 +- .../maven/codegen/MirrorGenerator.java | 2 +- .../modules/maven/codegen/NewMirrorPanel.form | 37 ++++---- .../modules/maven/codegen/NewMirrorPanel.java | 85 ++++++++----------- 4 files changed, 58 insertions(+), 72 deletions(-) diff --git a/java/maven.grammar/src/org/netbeans/modules/maven/codegen/Bundle.properties b/java/maven.grammar/src/org/netbeans/modules/maven/codegen/Bundle.properties index 418507d7b431..bd6cbb489967 100644 --- a/java/maven.grammar/src/org/netbeans/modules/maven/codegen/Bundle.properties +++ b/java/maven.grammar/src/org/netbeans/modules/maven/codegen/Bundle.properties @@ -30,9 +30,9 @@ NewMirrorPanel.lblUrl.text=Mirror &URL: NewMirrorPanel.btnLink.text=See Apache Maven documentation for details. LBL_Central=Central Repository LBL_All=All repositories, you have Repository Manager installed -LBL_NonLocal=All non local repositories (Maven 2.0.9+) -LBL_AllButFoo=All repositories, with exception of 'foo' (Maven 2.0.9+) -LBL_List=List of repositories (Maven 2.0.9+) +LBL_NonLocal=All non local repositories +LBL_AllButFoo=All repositories, with exception of 'foo' +LBL_List=List of repositories NewPluginPanel.chkConfig.text=Configuration Skeleton NewPluginPanel.lblQuery.text=Name Query: NewPluginPanel.tfQuery.text= diff --git a/java/maven.grammar/src/org/netbeans/modules/maven/codegen/MirrorGenerator.java b/java/maven.grammar/src/org/netbeans/modules/maven/codegen/MirrorGenerator.java index 2182d71834f6..c123120ba2fc 100644 --- a/java/maven.grammar/src/org/netbeans/modules/maven/codegen/MirrorGenerator.java +++ b/java/maven.grammar/src/org/netbeans/modules/maven/codegen/MirrorGenerator.java @@ -45,7 +45,7 @@ public static class Factory implements CodeGenerator.Factory { @Override public List create(Lookup context) { - ArrayList toRet = new ArrayList(); + ArrayList toRet = new ArrayList<>(); SettingsModel model = context.lookup(SettingsModel.class); JTextComponent component = context.lookup(JTextComponent.class); if (model != null) { diff --git a/java/maven.grammar/src/org/netbeans/modules/maven/codegen/NewMirrorPanel.form b/java/maven.grammar/src/org/netbeans/modules/maven/codegen/NewMirrorPanel.form index abb779e3bbec..2e999a779034 100644 --- a/java/maven.grammar/src/org/netbeans/modules/maven/codegen/NewMirrorPanel.form +++ b/java/maven.grammar/src/org/netbeans/modules/maven/codegen/NewMirrorPanel.form @@ -1,4 +1,4 @@ - +