Refactored

jme3-templates/src/com/jme3/gde/templates/gradledesktop/GradleDesktopGameAdditionalLibrariesPanelVisual.java

@@ -32,6 +32,7 @@
 
 package com.jme3.gde.templates.gradledesktop;
 
+import com.jme3.gde.templates.gradledesktop.options.CachedOptionsContainer;
 import com.jme3.gde.templates.gradledesktop.options.TemplateLibrary;
 import java.awt.Dimension;
 import java.util.ArrayList;

jme3-templates/src/com/jme3/gde/templates/gradledesktop/GradleDesktopGameGuiPanelVisual.java

@@ -31,6 +31,7 @@
  */
 package com.jme3.gde.templates.gradledesktop;
 
+import com.jme3.gde.templates.gradledesktop.options.CachedOptionsContainer;
 import com.jme3.gde.templates.gradledesktop.options.TemplateLibrary;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

jme3-templates/src/com/jme3/gde/templates/gradledesktop/GradleDesktopGameJMEVersionPanelVisual.java

@@ -32,6 +32,7 @@
 
 package com.jme3.gde.templates.gradledesktop;
 
+import com.jme3.gde.templates.gradledesktop.options.CachedOptionsContainer;
 import com.jme3.gde.templates.gradledesktop.options.JMEVersion;
 import com.jme3.gde.templates.gradledesktop.options.LWJGLLibrary;
 import com.jme3.gde.templates.gradledesktop.options.LibraryVersion;

jme3-templates/src/com/jme3/gde/templates/gradledesktop/GradleDesktopGameWizardIterator.java

@@ -31,6 +31,7 @@
  */
 package com.jme3.gde.templates.gradledesktop;
 
+import com.jme3.gde.templates.gradledesktop.options.CachedOptionsContainer;
 import java.awt.Component;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;

jme3-templates/src/com/jme3/gde/templates/gradledesktop/CachedOptionsContainer.java → jme3-templates/src/com/jme3/gde/templates/gradledesktop/options/CachedOptionsContainer.java

@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package com.jme3.gde.templates.gradledesktop;
+package com.jme3.gde.templates.gradledesktop.options;
 
 import com.jme3.gde.templates.gradledesktop.options.AdditionalLibrary;
 import com.jme3.gde.templates.gradledesktop.options.GUILibrary;

jme3-templates/src/com/jme3/gde/templates/gradledesktop/options/JMEVersionComparator.java

@@ -31,69 +31,16 @@
  */
 package com.jme3.gde.templates.gradledesktop.options;
 
-import java.text.Collator;
 import java.util.Comparator;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * Compares jME versions, sorts them in descending order (newest first)
  */
 public class JMEVersionComparator implements Comparator<LibraryVersion> {
 
-    private static final Pattern VERSION_PATTERN = Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)-(.*)");
-
     @Override
     public int compare(LibraryVersion o1, LibraryVersion o2) {
         return -(new JMEVersionInfo(o1.getVersion()).compareTo(new JMEVersionInfo(o2.getVersion())));
     }
 
-    private static final class JMEVersionInfo implements Comparable<JMEVersionInfo> {
-
-        private final int major;
-
-        private final int minor;
-
-        private final int release;
-
-        private final String type;
-
-        public JMEVersionInfo(String versionString) {
-            Matcher m = VERSION_PATTERN.matcher(versionString);
-
-            if (m.find()) {
-                this.major = Integer.parseInt(m.group(1));
-                this.minor = Integer.parseInt(m.group(2));
-                this.release = Integer.parseInt(m.group(3));
-                this.type = m.group(4);
-            } else {
-                this.major = 0;
-                this.minor = 0;
-                this.release = 0;
-                this.type = "";
-            }
-        }
-
-        @Override
-        public int compareTo(JMEVersionInfo o) {
-            int result = Integer.compare(major, o.major);
-            if (result != 0) {
-                return result;
-            }
-
-            result = Integer.compare(minor, o.minor);
-            if (result != 0) {
-                return result;
-            }
-
-            result = Integer.compare(release, o.release);
-            if (result != 0) {
-                return result;
-            }
-
-            return Collator.getInstance().compare(type, o.type);
-        }
-
-    }
-
 }

jme3-templates/src/com/jme3/gde/templates/gradledesktop/options/JMEVersionInfo.java

@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2009-2023 jMonkeyEngine
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'jMonkeyEngine' nor the names of its contributors
+ *   may be used to endorse or promote products derived from this software
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.jme3.gde.templates.gradledesktop.options;
+
+import java.text.Collator;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * jMonkeyEngine version information
+ */
+public final class JMEVersionInfo implements Comparable<JMEVersionInfo> {
+
+    private static final Pattern VERSION_PATTERN = Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)-(.*)");
+
+    private final int major;
+    private final int minor;
+    private final int release;
+    private final String type;
+
+    public JMEVersionInfo(String versionString) {
+        Matcher m = VERSION_PATTERN.matcher(versionString);
+        if (m.find()) {
+            this.major = Integer.parseInt(m.group(1));
+            this.minor = Integer.parseInt(m.group(2));
+            this.release = Integer.parseInt(m.group(3));
+            this.type = m.group(4);
+        } else {
+            this.major = 0;
+            this.minor = 0;
+            this.release = 0;
+            this.type = "";
+        }
+    }
+
+    public int getMajor() {
+        return major;
+    }
+
+    public int getMinor() {
+        return minor;
+    }
+
+    public int getRelease() {
+        return release;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    @Override
+    public int compareTo(JMEVersionInfo o) {
+        int result = Integer.compare(major, o.major);
+        if (result != 0) {
+            return result;
+        }
+        result = Integer.compare(minor, o.minor);
+        if (result != 0) {
+            return result;
+        }
+        result = Integer.compare(release, o.release);
+        if (result != 0) {
+            return result;
+        }
+        return Collator.getInstance().compare(type, o.type);
+    }
+
+}