Merge branch 'unstable' into issue-2225

.github/workflows/build.yml

@@ -17,10 +17,10 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: recursive
-      - name: Setup JDK 11
+      - name: Setup JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
       - name: Ant build
         run: ant -noinput -buildfile build.xml clean check jar unittest

.idea/ant.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="AntConfiguration">
-    <buildFile url="file://$PROJECT_DIR$/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/build.xml">
+      <customJdkName value="17" />
+    </buildFile>
   </component>
 </project>

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

.idea/runConfigurations/All_tests.xml

@@ -1,25 +1,10 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="All tests" type="JUnit" factoryName="JUnit">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <module name="" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" />
-    <option name="PACKAGE_NAME" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="class" />
-    <option name="VM_PARAMETERS" value="-ea" />
     <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$MODULE_DIR$" />
+    <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-    <option name="ENV_VARIABLES" />
+    <method v="2" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="singleModule" />
-    </option>
-    <envs />
-    <patterns />
-    <method>
-      <option name="Make" enabled="false" />
-    </method>
   </configuration>
 </component>

.idea/runConfigurations/Openrocket_UI_Jar.xml

@@ -2,7 +2,7 @@
   <configuration default="false" name="Openrocket UI Jar" type="JarApplication">
     <option name="JAR_PATH" value="$PROJECT_DIR$/build/jar/OpenRocket.jar" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-    <option name="ALTERNATIVE_JRE_PATH" value="11" />
+    <option name="ALTERNATIVE_JRE_PATH" value="17" />
     <method v="2">
       <option name="BuildArtifacts" enabled="true">
         <artifact name="openrocket:jar" />

.idea/workspace.xml

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AnalysisUIOptions">
+    <option name="ANALYZE_INJECTED_CODE" value="false" />
+  </component>
+  <component name="ArtifactsWorkspaceSettings">
+    <artifacts-to-build>
+      <artifact name="openrocket:jar" />
+    </artifacts-to-build>
+  </component>
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Interface" />
+        <option value="Class" />
+      </list>
+    </option>
+  </component>
+  <component name="GitSEFilterConfiguration">
+    <file-type-list>
+      <filtered-out-file-type name="LOCAL_BRANCH" />
+      <filtered-out-file-type name="REMOTE_BRANCH" />
+      <filtered-out-file-type name="TAG" />
+      <filtered-out-file-type name="COMMIT_BY_MESSAGE" />
+    </file-type-list>
+  </component>
+  <component name="HighlightingSettingsPerFile">
+    <setting file="file://$PROJECT_DIR$/core/resources/l10n/messages.properties" root0="SKIP_INSPECTION" />
+  </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
+  <component name="ProblemsViewState">
+    <option name="selectedTabId" value="CurrentFile" />
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="RunManager" selected="Application.SwingStartup">
+    <configuration name="jar" type="AntRunConfiguration">
+      <antsettings antfile="file://$PROJECT_DIR$/build.xml" target="jar">
+        <property name="source" value="17" />
+        <property name="target" value="17" />
+      </antsettings>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="SwingStartup" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="ALTERNATIVE_JRE_PATH" value="17" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
+      <option name="MAIN_CLASS_NAME" value="net.sf.openrocket.startup.SwingStartup" />
+      <module name="OpenRocket Swing" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="net.sf.openrocket.startup.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <list>
+      <item itemvalue="Ant Target.jar" />
+      <item itemvalue="Application.SwingStartup" />
+      <item itemvalue="JAR Application.Openrocket UI Jar" />
+      <item itemvalue="JUnit.All tests" />
+    </list>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Application.SwingStartup" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+    <changelist id="2ecf826f-1227-4870-b9d4-17215cf24a1b" name="Changes" comment="Fix transition config layout" />
+    <created>1625095153807</created>
+    <option name="number" value="Default" />
+    <option name="presentableId" value="Default" />
+    <updated>1625095153807</updated>
+  </component>
+</project>

ReleaseNotes.md

@@ -13,6 +13,15 @@ Release Notes
 
 </div>
 
+<div id="23.xx">
+
+OpenRocket 23.xx
+------------------------
+
+Here, the release notes for the next release will be documented.
+
+</div>
+
 <div id="22.02">
 
 OpenRocket 22.02 (2023-02-08)

core/build.xml

@@ -59,7 +59,7 @@
 		<echo level="info">Java/JVM detail version: ${java.version}</echo>
 		<mkdir dir="${classes.dir}"/>
 		<echo level="info">Compiling main classes</echo>
-		<javac debug="true" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath" includeantruntime="false" source="1.8" target="1.8"/>
+		<javac debug="true" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath" includeantruntime="false" source="17" target="17"/>
 	</target>
 	
 	<!-- Executable Eclipse-Jar-In-Jar style JAR -->

core/resources/build.properties

@@ -1,6 +1,6 @@
 
 # The OpenRocket build version
-build.version=22.02
+build.version=23.xx
 
 # The copyright year for the build. Displayed in the about dialog.
 # Will show as Copyright 2013-${build.copyright}

core/src/net/sf/openrocket/rocketcomponent/StageSeparationConfiguration.java

@@ -60,6 +60,14 @@ public class StageSeparationConfiguration implements FlightConfigurableParameter
 				return (mount == ignition);
 			}
 		},
+		//// Launch
+		LAUNCH(trans.get("Stage.SeparationEvent.LAUNCH")) {
+			@Override
+			public boolean isSeparationEvent(FlightEvent e, AxialStage stage) {
+				return e.getType() == FlightEvent.Type.LAUNCH;
+			}
+		},
+		//// Never
 		NEVER(trans.get("Stage.SeparationEvent.NEVER")) {
 			@Override
 			public boolean isSeparationEvent(FlightEvent e, AxialStage stage) {

install4j/23.xx/.gitignore

@@ -20,4 +20,3 @@ media/
 .DS_Store
 
 code_signing/
-openrocket-22.xx.install4j~

install4j/23.xx/openrocket-23.xx.install4j

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <install4j version="10.0.4" transformSequenceNumber="10">
   <directoryPresets config="../../core/resources/pix/icon" />
-  <application name="OpenRocket" applicationId="8434-9327-1469-6373" mediaDir="media" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.version}_${compiler:sys.platform}" shortName="OpenRocket" publisher="OpenRocket" publisherWeb="http://openrocket.info" version="22.02" allPathsRelative="true" convertDotsToUnderscores="false" macVolumeId="5f58a2be20d8e22f" javaMinVersion="11" javaMaxVersion="11" jdkMode="jdk" jdkName="JDK 11.0">
+  <application name="OpenRocket" applicationId="8434-9327-1469-6373" mediaDir="media" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.version}_${compiler:sys.platform}" shortName="OpenRocket" publisher="OpenRocket" publisherWeb="http://openrocket.info" version="23.xx" allPathsRelative="true" convertDotsToUnderscores="false" macVolumeId="5f58a2be20d8e22f" javaMinVersion="17" javaMaxVersion="17" jdkMode="jdk" jdkName="JDK 11.0">
     <codeSigning macEnabled="true" macPkcs12File="./code_signing/OpenRocket_macOS.p12" windowsEnabled="true" windowsPkcs12File="./code_signing/OpenRocket_Windows.pfx" macNotarize="true" appleId="sibo.vangool@hotmail.com" />
-    <jreBundles jdkProviderId="Liberica" release="11/11.0.17+7">
+    <jreBundles jdkProviderId="Liberica" release="17/17.0.7+7">
       <modules>
         <defaultModules set="jre" />
         <module name="java.scripting" />
@@ -19,7 +19,7 @@
     </entries>
   </files>
   <launchers>
-    <launcher name="OpenRocket 22.02" id="59" icnsFile="../../core/resources/pix/icon/icon-macos.icns">
+    <launcher name="OpenRocket 23.xx" id="59" icnsFile="../../core/resources/pix/icon/icon-macos.icns">
       <executable name="OpenRocket" iconSet="true" iconFile="../../core/resources/pix/icon/icon-windows.ico" executableDir="." executableMode="gui">
         <versionInfo include="true" fileDescription="A model rocket flight-trajectory simulator." legalCopyright="Copyright 2007-2023 Sampo Niskanen and Others" internalName="${compiler:sys.shortName} ${compiler:sys.version}" />
       </executable>

swing/src/net/sf/openrocket/gui/main/BasicFrame.java

@@ -1259,7 +1259,11 @@ public class BasicFrame extends JFrame {
 	 */
 	public static BasicFrame open(File file, Window parent) {
 		OpenFileWorker worker = new OpenFileWorker(file);
-		return open(worker, file.getName(), parent, false);
+		BasicFrame frame = open(worker, file.getName(), parent, false);
+		if (frame != null) {
+			MRUDesignFile.getInstance().addFile(file.getAbsolutePath());
+		}
+		return frame;
 	}
 
 

swing/src/net/sf/openrocket/startup/OSXSetup.java

@@ -6,8 +6,10 @@ import java.awt.desktop.OpenFilesHandler;
 import java.awt.desktop.PreferencesHandler;
 import java.awt.desktop.QuitHandler;
 import java.awt.desktop.AppReopenedListener;
+import java.io.File;
 
 import net.sf.openrocket.communication.UpdateInfoRetriever;
+import net.sf.openrocket.gui.main.MRUDesignFile;
 import net.sf.openrocket.gui.util.DummyFrameMenuOSX;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,8 +42,9 @@ final class OSXSetup {
 	 * The handler for file associations
 	 */
 	public static final OpenFilesHandler OPEN_FILE_HANDLER = (e) -> {
-		log.info("Opening file from association: " + e.getFiles().get(0));
+		File associateFile = e.getFiles().get(0);
-		BasicFrame.open(e.getFiles().get(0), BasicFrame.lastFrameInstance);
+		log.info("Opening file from association: " + associateFile);
+		BasicFrame.open(associateFile, BasicFrame.lastFrameInstance);
 	};
 	
 	/**