merge bug fix

Gubaer · Gubaer · commit ab0a199e9fd7 · 2025-01-29T10:53:04.000+01:00
diff --git a/releases.yml b/releases.yml
@@ -3,7 +3,7 @@ releases:
   - label: v0.3.3
     minJosmVersion: 18905
     description: |
-      testing 
+      **Bug fix**: fix NPE in Scripting Engine Dialog
 
   # current release
   - label: v0.3.2
diff --git a/src/main/java/org/openstreetmap/josm/plugins/scripting/ui/ScriptEngineSelectionDialog.java b/src/main/java/org/openstreetmap/josm/plugins/scripting/ui/ScriptEngineSelectionDialog.java
@@ -363,7 +363,7 @@ private class OKAction extends AbstractAction implements ListSelectionListener,
         public void execute() {
            if (rbPluggableScriptingEngine.isSelected()) {
                 selectedEngine = lstPluggedEngines.getSelectedValue();
-            } else if (rbGraalVMScriptingEngine.isSelected()) {
+            } else if (rbGraalVMScriptingEngine != null && rbGraalVMScriptingEngine.isSelected()) {
                 selectedEngine = lstGraalVMEngines.getSelectedValue();
             }
             setVisible(false);
diff --git a/src/main/resources/release-notes/release-notes.properties b/src/main/resources/release-notes/release-notes.properties
@@ -2,6 +2,7 @@
 #
 # comma-separated list of available release notes
 release-notes=\
+  v0.3.3, \
   v0.3.1, \
   v0.3.0, \
   v0.2.10, \
diff --git a/src/main/resources/release-notes/v0.3.3.html b/src/main/resources/release-notes/v0.3.3.html
@@ -0,0 +1,14 @@
+<html lang="">
+<head>
+    <title>Release notes</title></head>
+<body>
+<h1>Release v0.3.3</h1>
+
+See <a href="https://github.com/Gubaer/josm-scripting-plugin/releases/tag/v0.3.3">GitHub release v0.3.3</a>
+
+<ul>
+    <li><strong>Bug fix</strong>: fix NullPointerException in Scripting Engine Dialog</li>
+</ul>
+
+</body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,7 @@ private class OKAction extends AbstractAction implements ListSelectionListener,`
`363`	`363`	`public void execute() {`
`364`	`364`	`if (rbPluggableScriptingEngine.isSelected()) {`
`365`	`365`	`selectedEngine = lstPluggedEngines.getSelectedValue();`
`366`		`- } else if (rbGraalVMScriptingEngine.isSelected()) {`
	`366`	`+ } else if (rbGraalVMScriptingEngine != null && rbGraalVMScriptingEngine.isSelected()) {`
`367`	`367`	`selectedEngine = lstGraalVMEngines.getSelectedValue();`
`368`	`368`	`}`
`369`	`369`	`setVisible(false);`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`#`
`3`	`3`	`# comma-separated list of available release notes`
`4`	`4`	`release-notes=\`
	`5`	`+ v0.3.3, \`
`5`	`6`	`v0.3.1, \`
`6`	`7`	`v0.3.0, \`
`7`	`8`	`v0.2.10, \`