From 20b40aed44d12ddea4c5daede50e61ee4b7969ae Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Thu, 16 Jul 2026 14:33:31 +0200 Subject: [PATCH] Bump JavaFx maven archetype properties to more recent versions and small cleanup in related code --- .../maven/api/archetype/ArchetypeWizards.java | 2 -- .../maven/newproject/ArchetypeWizardUtils.java | 13 ++++--------- .../maven/newproject/MavenWizardIterator.java | 6 +++--- .../modules/javafx2/kit/JavaFXWizardIterator.java | 2 ++ 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/java/maven/src/org/netbeans/modules/maven/api/archetype/ArchetypeWizards.java b/java/maven/src/org/netbeans/modules/maven/api/archetype/ArchetypeWizards.java index 39b25af81fd3..e10f6238b82e 100644 --- a/java/maven/src/org/netbeans/modules/maven/api/archetype/ArchetypeWizards.java +++ b/java/maven/src/org/netbeans/modules/maven/api/archetype/ArchetypeWizards.java @@ -24,7 +24,6 @@ import java.util.Map; import java.util.Set; import org.netbeans.api.annotations.common.NullAllowed; -import org.netbeans.api.project.Project; import org.netbeans.api.templates.TemplateRegistration; import org.netbeans.modules.maven.model.ModelOperation; import org.netbeans.modules.maven.model.pom.POMModel; @@ -32,7 +31,6 @@ import org.netbeans.modules.maven.newproject.BasicWizardPanel; import org.netbeans.modules.maven.newproject.MavenWizardIterator; import org.netbeans.validation.api.ui.ValidationGroup; -import org.netbeans.validation.api.ui.ValidationGroupProvider; import org.openide.WizardDescriptor; import org.openide.filesystems.FileObject; diff --git a/java/maven/src/org/netbeans/modules/maven/newproject/ArchetypeWizardUtils.java b/java/maven/src/org/netbeans/modules/maven/newproject/ArchetypeWizardUtils.java index 6a787e10d966..58369f5d05a9 100644 --- a/java/maven/src/org/netbeans/modules/maven/newproject/ArchetypeWizardUtils.java +++ b/java/maven/src/org/netbeans/modules/maven/newproject/ArchetypeWizardUtils.java @@ -23,7 +23,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collections; -import java.util.Enumeration; import java.util.HashMap; import java.util.LinkedHashSet; import java.util.List; @@ -64,8 +63,6 @@ public class ArchetypeWizardUtils { /** {@code Map} of custom archetype properties to define. */ public static final String ADDITIONAL_PROPS = "additionalProps"; // NOI18N - private static final Logger LOG = Logger.getLogger(ArchetypeWizardUtils.class.getName()); - private ArchetypeWizardUtils() { } @@ -87,12 +84,12 @@ private static void runArchetype(File directory, ProjectInfo vi, Archetype arch, config.setProperty("artifactId", vi.artifactId); //NOI18N config.setProperty("version", vi.version); //NOI18N final String pack = vi.packageName; - if (pack != null && pack.trim().length() > 0) { + if (pack != null && !pack.isBlank()) { config.setProperty("package", pack); //NOI18N } config.setProperty("basedir", directory.getAbsolutePath());//NOI18N - Map baseprops = new HashMap(config.getProperties()); + Map baseprops = new HashMap<>(config.getProperties()); if (additional != null) { for (Map.Entry entry : additional.entrySet()) { @@ -163,7 +160,7 @@ public static void createFromArchetype(File projDir, ProjectInfo vi, Archetype a if (parent == null) { throw new IOException("no parent of " + projDir); } - if (updateLastUsedProjectDir && parent != null && parent.exists()) { + if (updateLastUsedProjectDir && parent.exists()) { ProjectChooser.setProjectsFolder(parent); } if (!parent.isDirectory() && !parent.mkdirs()) { @@ -217,9 +214,7 @@ private static void processProjectFolder(final FileObject fo) { if (watch != null) { watch.downloadDependencyAndJavadocSource(false); } - } catch (IOException ex) { - Exceptions.printStackTrace(ex); - } catch (IllegalArgumentException ex) { + } catch (IOException | IllegalArgumentException ex) { Exceptions.printStackTrace(ex); } } diff --git a/java/maven/src/org/netbeans/modules/maven/newproject/MavenWizardIterator.java b/java/maven/src/org/netbeans/modules/maven/newproject/MavenWizardIterator.java index 84e8909343b5..118b92e2bceb 100644 --- a/java/maven/src/org/netbeans/modules/maven/newproject/MavenWizardIterator.java +++ b/java/maven/src/org/netbeans/modules/maven/newproject/MavenWizardIterator.java @@ -93,8 +93,8 @@ public void initialize(WizardDescriptor wiz) { } index = 0; ValidationGroup vg = ValidationGroup.create(new WizardDescriptorAdapter(wiz)); - panels = new ArrayList>(); - List steps = new ArrayList(); + panels = new ArrayList<>(); + List steps = new ArrayList<>(); if (archetype == null) { panels.add(new ChooseWizardPanel()); steps.add(LBL_CreateProjectStep()); @@ -104,7 +104,7 @@ public void initialize(WizardDescriptor wiz) { for (int i = 0; i < panels.size(); i++) { JComponent c = (JComponent) panels.get(i).getComponent(); c.putClientProperty(WizardDescriptor.PROP_CONTENT_SELECTED_INDEX, i); - c.putClientProperty(WizardDescriptor.PROP_CONTENT_DATA, steps.toArray(new String[0])); + c.putClientProperty(WizardDescriptor.PROP_CONTENT_DATA, steps.toArray(String[]::new)); } if (archetype != null) { wiz.putProperty(PROP_ARCHETYPE, archetype); diff --git a/javafx/javafx2.kit/src/org/netbeans/modules/javafx2/kit/JavaFXWizardIterator.java b/javafx/javafx2.kit/src/org/netbeans/modules/javafx2/kit/JavaFXWizardIterator.java index 3f9091d2f903..c22c39384517 100644 --- a/javafx/javafx2.kit/src/org/netbeans/modules/javafx2/kit/JavaFXWizardIterator.java +++ b/javafx/javafx2.kit/src/org/netbeans/modules/javafx2/kit/JavaFXWizardIterator.java @@ -53,6 +53,8 @@ public static WizardDescriptor.InstantiatingIterator openJFXSimple() { private static WizardDescriptor.InstantiatingIterator definedFXArchetype(String g, String a, String v, String name) { Map props = new HashMap<>(); props.put("add-debug-configuration", "Y"); + props.put("javafx-version", "21.0.9"); + props.put("javafx-maven-plugin-version", "0.0.8"); return ArchetypeWizards.definedArchetype(g, a, v, null, name, props); }