From 9776a17ff3fbeafa11c1a58a0e688093784be624 Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Tue, 10 May 2022 22:11:37 +0200
Subject: [PATCH 1/2] Update install4j files for Java 17 RTE

---
 install4j/22.xx/openrocket-22.xx.install4j | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install4j/22.xx/openrocket-22.xx.install4j b/install4j/22.xx/openrocket-22.xx.install4j
index 3cabc7c4e..83dafc0f5 100644
--- a/install4j/22.xx/openrocket-22.xx.install4j
+++ b/install4j/22.xx/openrocket-22.xx.install4j
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <install4j version="9.0.6" transformSequenceNumber="9">
   <directoryPresets config="./macOS_resources" />
-  <application name="OpenRocket 22.02.beta.03" applicationId="8434-9327-1469-6373" mediaDir="media" shortName="OpenRocket" publisher="OpenRocket" publisherWeb="http://openrocket.info" version="22.02.beta.03" allPathsRelative="true" macVolumeId="5f58a2be20d8e22f" javaMinVersion="11.0" javaMaxVersion="13.0" jdkMode="jdk" jdkName="JDK 11.0">
-    <jreBundles jdkProviderId="Liberica" release="11/11.0.14.1+1">
+  <application name="OpenRocket 22.02.beta.03" applicationId="8434-9327-1469-6373" mediaDir="media" shortName="OpenRocket" publisher="OpenRocket" publisherWeb="http://openrocket.info" version="22.02.beta.03" allPathsRelative="true" macVolumeId="5f58a2be20d8e22f" javaMinVersion="17" javaMaxVersion="17" jdkMode="jdk" jdkName="JDK 11.0">
+    <jreBundles jdkProviderId="Liberica" release="17/17+35">
       <modules>
         <defaultModules set="jre" />
         <module name="java.scripting" />

From c895dde4a33d544e2ea4c11ed7eaefde30c07c83 Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Tue, 10 May 2022 22:58:02 +0200
Subject: [PATCH 2/2] Clear Transition preset on shape and type change

---
 .../src/net/sf/openrocket/rocketcomponent/Transition.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/core/src/net/sf/openrocket/rocketcomponent/Transition.java b/core/src/net/sf/openrocket/rocketcomponent/Transition.java
index 710cf55ec..18cffea6d 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/Transition.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/Transition.java
@@ -262,6 +262,10 @@ public class Transition extends SymmetricComponent implements InsideColorCompone
 		this.type = type;
 		this.clipped = type.isClippable();
 		this.shapeParameter = type.defaultParameter();
+
+		// Need to clearPreset when shape type changes.
+		clearPreset();
+
 		fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);
 	}
 
@@ -279,6 +283,10 @@ public class Transition extends SymmetricComponent implements InsideColorCompone
 		if (shapeParameter == n)
 			return;
 		this.shapeParameter = MathUtil.clamp(n, type.minParameter(), type.maxParameter());
+
+		// Need to clearPreset when shape type changes.
+		clearPreset();
+
 		fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);
 	}