hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dependency Updates (#1483)

Browse Source 
* remove the resources\datafiles\presets folder as its is being built by the copy-orc-files build script

* Refactored from new Boolean and new Integer to Boolean.valueOf and Integer.valueOf due to deprecation warnings.   Value of is supported in Java 8 (https://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html)

* Removed non-atomic updates around deprecation

* updated test dependencies

* dependency updates

* dependency updates
This commit is contained in:
thzero 2022-06-26 11:58:18 -05:00 committed by GitHub
parent e82564af63
commit c2c22697cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 97 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.idea/artifacts/openrocket_jar.xml generated
View File

@ -12,7 +12,7 @@
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/miglayout-4.0-swing.jar" path-in-jar="/" /> <element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/miglayout-4.0-swing.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/jogl-all.jar" path-in-jar="/" /> <element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/jogl-all.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/iText-5.0.2.jar" path-in-jar="/" /> <element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/iText-5.0.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/rsyntaxtextarea-2.5.6.jar" path-in-jar="/" /> <element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/rsyntaxtextarea-3.2.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/javax.inject.jar" path-in-jar="/" /> <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/javax.inject.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jfreechart-1.0.15.jar" path-in-jar="/" /> <element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jfreechart-1.0.15.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/aopalliance.jar" path-in-jar="/" /> <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/aopalliance.jar" path-in-jar="/" />
@ -35,8 +35,8 @@
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/guava-26.0-jre.jar" path-in-jar="/" /> <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/guava-26.0-jre.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/opencsv-4.3.2.jar" path-in-jar="/" /> <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/opencsv-4.3.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/slf4j-api-1.7.30.jar" path-in-jar="/" /> <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/slf4j-api-1.7.30.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/logback-classic-1.2.3.jar" path-in-jar="/" /> <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/logback-classic-1.2.11.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/logback-core-1.2.3.jar" path-in-jar="/" /> <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/logback-core-1.2.11.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/istack-commons-runtime.jar" path-in-jar="/" /> <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/istack-commons-runtime.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/istack-commons-tools.jar" path-in-jar="/" /> <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/istack-commons-tools.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/javax.activation-api-2.3.1.jar" path-in-jar="/" /> <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/javax.activation-api-2.3.1.jar" path-in-jar="/" />
@ -45,7 +45,6 @@
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/jaxb-api.2.3.1.jar" path-in-jar="/" /> <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/jaxb-api.2.3.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/jaxb-runtime.2.3.1.jar" path-in-jar="/" /> <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/jaxb-runtime.2.3.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/script-api-1.0.jar" path-in-jar="/" /> <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/script-api-1.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/yasson-1.0.2.jar" path-in-jar="/" />
</root> </root>
</artifact> </artifact>
</component> </component>

16
core/.classpath
View File

@ -16,19 +16,19 @@
<classpathentry kind="lib" path="resources"/> <classpathentry kind="lib" path="resources"/>
<classpathentry kind="lib" path="lib/javax.inject.jar"/> <classpathentry kind="lib" path="lib/javax.inject.jar"/>
<classpathentry kind="lib" path="lib/aopalliance.jar"/> <classpathentry kind="lib" path="lib/aopalliance.jar"/>
<classpathentry kind="lib" path="lib/commonmark-0.18.1.jar"/> <classpathentry kind="lib" path="lib/commonmark-0.19.0.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.7.30.jar"/> <classpathentry kind="lib" path="lib/slf4j-api-1.7.30.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/test-plugin.jar"/> <classpathentry kind="lib" path="/OpenRocket Test Libraries/test-plugin.jar"/>
<classpathentry kind="lib" path="lib/annotation-detector-3.0.5.jar"/> <classpathentry kind="lib" path="lib/annotation-detector-3.0.5.jar"/>
<classpathentry kind="lib" path="lib/guice-4.2.3-no_aop.jar"/> <classpathentry kind="lib" path="lib/guice-4.2.3-no_aop.jar"/>
<classpathentry kind="lib" path="lib/logback-classic-1.2.3.jar"/> <classpathentry kind="lib" path="lib/logback-classic-1.2.11.jar"/>
<classpathentry kind="lib" path="lib/logback-core-1.2.3.jar"/> <classpathentry kind="lib" path="lib/logback-core-1.2.11.jar"/>
<classpathentry kind="lib" path="lib/opencsv-4.3.2.jar"/> <classpathentry kind="lib" path="lib/opencsv-4.3.2.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/hamcrest-core-1.3.jar"/> <classpathentry kind="lib" path="/OpenRocket Test Libraries/hamcrest-core-2.2.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/hamcrest-library-1.3.jar"/> <classpathentry kind="lib" path="/OpenRocket Test Libraries/hamcrest-2.2.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/jmock-2.9.0.jar"/> <classpathentry kind="lib" path="/OpenRocket Test Libraries/jmock-2.12.0.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/jmock-junit4-2.9.0.jar"/> <classpathentry kind="lib" path="/OpenRocket Test Libraries/jmock-junit4-2.12.0.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/junit-4.12.jar"/> <classpathentry kind="lib" path="/OpenRocket Test Libraries/junit-4.13.2.jar"/>
<classpathentry kind="lib" path="lib/jaxb-api.2.3.1.jar"/> <classpathentry kind="lib" path="lib/jaxb-api.2.3.1.jar"/>
<classpathentry kind="lib" path="lib/jaxb-runtime.2.3.1.jar"/> <classpathentry kind="lib" path="lib/jaxb-runtime.2.3.1.jar"/>
<classpathentry kind="lib" path="lib/guava-26.0-jre.jar"/> <classpathentry kind="lib" path="lib/guava-26.0-jre.jar"/>

48
core/OpenRocket Core.iml
View File

@ -10,11 +10,11 @@
<libelement value="jar://$MODULE_DIR$/lib/aopalliance.jar!/" /> <libelement value="jar://$MODULE_DIR$/lib/aopalliance.jar!/" />
<libelement value="jar://$MODULE_DIR$/lib/slf4j-api-1.7.5.jar!/" /> <libelement value="jar://$MODULE_DIR$/lib/slf4j-api-1.7.5.jar!/" />
<libelement value="jar://$MODULE_DIR$/lib/annotation-detector-3.0.2.jar!/" /> <libelement value="jar://$MODULE_DIR$/lib/annotation-detector-3.0.2.jar!/" />
<libelement value="jar://$MODULE_DIR$/../lib-test/hamcrest-core-1.3.0RC1.jar!/" /> <libelement value="jar://$MODULE_DIR$/../lib-test/hamcrest-core-2.2.jar!/" />
<libelement value="jar://$MODULE_DIR$/../lib-test/hamcrest-library-1.3.0RC1.jar!/" /> <libelement value="jar://$MODULE_DIR$/../lib-test/hamcrest-2.2.jar!/" />
<libelement value="jar://$MODULE_DIR$/../lib-test/jmock-2.6.0-RC2.jar!/" /> <libelement value="jar://$MODULE_DIR$/../lib-test/jmock-2.12.0.jar!/" />
<libelement value="jar://$MODULE_DIR$/../lib-test/jmock-junit4-2.6.0-RC2.jar!/" /> <libelement value="jar://$MODULE_DIR$/../lib-test/jmock-junit4-2.12.0.jar!/" />
<libelement value="jar://$MODULE_DIR$/../lib-test/junit-dep-4.8.2.jar!/" /> <libelement value="jar://$MODULE_DIR$/../lib-test/junit-4.13.2.jar!/" />
<libelement value="jar://$MODULE_DIR$/../lib-test/test-plugin.jar!/" /> <libelement value="jar://$MODULE_DIR$/../lib-test/test-plugin.jar!/" />
<libelement value="jar://$MODULE_DIR$/../lib-test/uispec4j-2.3-jdk16.jar!/" /> <libelement value="jar://$MODULE_DIR$/../lib-test/uispec4j-2.3-jdk16.jar!/" />
<src_description expected_position="0"> <src_description expected_position="0">
@ -38,7 +38,7 @@
<orderEntry type="module-library" scope="TEST"> <orderEntry type="module-library" scope="TEST">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/hamcrest-core-1.3.jar!/" /> <root url="jar://$MODULE_DIR$/../lib-test/hamcrest-core-2.2.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -47,7 +47,7 @@
<orderEntry type="module-library" scope="TEST"> <orderEntry type="module-library" scope="TEST">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/hamcrest-library-1.3.jar!/" /> <root url="jar://$MODULE_DIR$/../lib-test/hamcrest-2.2.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -56,7 +56,7 @@
<orderEntry type="module-library" scope="TEST"> <orderEntry type="module-library" scope="TEST">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/jmock-2.9.0.jar!/" /> <root url="jar://$MODULE_DIR$/../lib-test/jmock-2.12.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -65,16 +65,7 @@
<orderEntry type="module-library" scope="TEST"> <orderEntry type="module-library" scope="TEST">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/jmock-junit4-2.9.0.jar!/" /> <root url="jar://$MODULE_DIR$/../lib-test/jmock-junit4-2.12.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/junit-4.12.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -89,10 +80,10 @@
<SOURCES /> <SOURCES />
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="module-library"> <orderEntry type="module-library" scope="TEST">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/lib/annotation-detector-3.0.5.jar!/" /> <root url="jar://$MODULE_DIR$/../lib-test/junit-4.13.2.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -218,7 +209,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/lib/logback-classic-1.2.3.jar!/" /> <root url="jar://$MODULE_DIR$/lib/logback-classic-1.2.11.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -227,7 +218,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/lib/logback-core-1.2.3.jar!/" /> <root url="jar://$MODULE_DIR$/lib/logback-core-1.2.11.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -262,9 +253,18 @@
</orderEntry> </orderEntry>
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="commonmark" type="repository"> <library name="commonmark" type="repository">
<properties maven-id="org.commonmark:commonmark:0.18.1" /> <properties maven-id="org.commonmark:commonmark:0.19.0" />
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/lib/commonmark-0.18.1.jar!/" /> <root url="jar://$MODULE_DIR$/lib/commonmark-0.19.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/annotation-detector-3.0.5.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

6
core/build.xml
View File

@ -53,6 +53,8 @@
<!-- BUILD --> <!-- BUILD -->
<target name="build"> <target name="build">
<echo>Java/JVM version: ${ant.java.version}</echo>
<echo>Java/JVM detail version: ${java.version}</echo>
<mkdir dir="${classes.dir}"/> <mkdir dir="${classes.dir}"/>
<echo level="info">Compiling main classes</echo> <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="1.8" target="1.8"/>
@ -87,10 +89,14 @@
<!-- Unit tests --> <!-- Unit tests -->
<target name="unittest" description="Execute unit tests" depends="build"> <target name="unittest" description="Execute unit tests" depends="build">
<echo>Building unit tests</echo> <echo>Building unit tests</echo>
<echo>Java/JVM version: ${ant.java.version}</echo>
<echo>Java/JVM detail version: ${java.version}</echo>
<mkdir dir="${build-test.dir}"/> <mkdir dir="${build-test.dir}"/>
<javac debug="true" srcdir="${src-test.dir}" destdir="${build-test.dir}" classpathref="test-classpath" includeantruntime="false"/> <javac debug="true" srcdir="${src-test.dir}" destdir="${build-test.dir}" classpathref="test-classpath" includeantruntime="false"/>
<echo>Running unit tests</echo> <echo>Running unit tests</echo>
<echo>Java/JVM version: ${ant.java.version}</echo>
<echo>Java/JVM detail version: ${java.version}</echo>
<mkdir dir="${tmp.dir}/rawtestoutput"/> <mkdir dir="${tmp.dir}/rawtestoutput"/>
<junit fork="yes" forkmode="once" printsummary="false" failureproperty="junit.failure" dir="${basedir}"> <junit fork="yes" forkmode="once" printsummary="false" failureproperty="junit.failure" dir="${basedir}">
<classpath> <classpath>

BIN
core/lib/commonmark-0.18.1.jar → core/lib/commonmark-0.19.0.jar
View File

Binary file not shown.

BIN
core/lib/logback-classic-1.2.11.jar Normal file
View File

Binary file not shown.

BIN
core/lib/logback-classic-1.2.3.jar
View File

Binary file not shown.

BIN
core/lib/logback-core-1.2.11.jar Normal file
View File

Binary file not shown.

BIN
core/lib/logback-core-1.2.3.jar
View File

Binary file not shown.

BIN
core/lib/yasson-1.0.2.jar
View File

Binary file not shown.

10
lib-test/.classpath
View File

@ -6,10 +6,10 @@
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="lib" path="test-plugin.jar"/> <classpathentry kind="lib" path="test-plugin.jar"/>
<classpathentry kind="lib" path="hamcrest-core-1.3.jar"/> <classpathentry kind="lib" path="hamcrest-core-2.2.jar"/>
<classpathentry kind="lib" path="hamcrest-library-1.3.jar"/> <classpathentry kind="lib" path="hamcrest-2.2.jar"/>
<classpathentry kind="lib" path="jmock-2.9.0.jar"/> <classpathentry kind="lib" path="jmock-2.12.0.jar"/>
<classpathentry kind="lib" path="jmock-junit4-2.9.0.jar"/> <classpathentry kind="lib" path="jmock-junit4-2.12.0.jar"/>
<classpathentry kind="lib" path="junit-4.12.jar"/> <classpathentry kind="lib" path="junit-4.13.2.jar"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

20
lib-test/OpenRocket Test Libraries.iml
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4"> <module type="JAVA_MODULE" version="4">
<component name="EclipseModuleManager"> <component name="EclipseModuleManager">
<libelement value="jar://$MODULE_DIR$/hamcrest-core-1.3.0RC1.jar!/" /> <libelement value="jar://$MODULE_DIR$/hamcrest-core-2.2.jar!/" />
<libelement value="jar://$MODULE_DIR$/hamcrest-library-1.3.0RC1.jar!/" /> <libelement value="jar://$MODULE_DIR$/hamcrest-2.2.jar!/" />
<libelement value="jar://$MODULE_DIR$/jmock-2.6.0-RC2.jar!/" /> <libelement value="jar://$MODULE_DIR$/jmock-2.12.0.jar!/" />
<libelement value="jar://$MODULE_DIR$/jmock-junit4-2.6.0-RC2.jar!/" /> <libelement value="jar://$MODULE_DIR$/jmock-junit4-2.12.0.jar!/" />
<libelement value="jar://$MODULE_DIR$/junit-dep-4.8.2.jar!/" /> <libelement value="jar://$MODULE_DIR$/junit-4.13.2.jar!/" />
<libelement value="jar://$MODULE_DIR$/test-plugin.jar!/" /> <libelement value="jar://$MODULE_DIR$/test-plugin.jar!/" />
<libelement value="jar://$MODULE_DIR$/uispec4j-2.3-jdk16.jar!/" /> <libelement value="jar://$MODULE_DIR$/uispec4j-2.3-jdk16.jar!/" />
<src_description expected_position="0" /> <src_description expected_position="0" />
@ -19,7 +19,7 @@
<orderEntry type="module-library" scope="TEST"> <orderEntry type="module-library" scope="TEST">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/hamcrest-core-1.3.jar!/" /> <root url="jar://$MODULE_DIR$/hamcrest-core-2.2.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -28,7 +28,7 @@
<orderEntry type="module-library" scope="TEST"> <orderEntry type="module-library" scope="TEST">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/hamcrest-library-1.3.jar!/" /> <root url="jar://$MODULE_DIR$/hamcrest-2.2.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -37,7 +37,7 @@
<orderEntry type="module-library" scope="TEST"> <orderEntry type="module-library" scope="TEST">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/jmock-2.9.0.jar!/" /> <root url="jar://$MODULE_DIR$/jmock-2.12.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -46,7 +46,7 @@
<orderEntry type="module-library" scope="TEST"> <orderEntry type="module-library" scope="TEST">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/jmock-junit4-2.9.0.jar!/" /> <root url="jar://$MODULE_DIR$/jmock-junit4-2.12.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -55,7 +55,7 @@
<orderEntry type="module-library" scope="TEST"> <orderEntry type="module-library" scope="TEST">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/junit-4.12.jar!/" /> <root url="jar://$MODULE_DIR$/junit-jupiter-api-5.8.2.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

BIN
lib-test/hamcrest-2.2.jar Normal file
View File

Binary file not shown.

BIN
lib-test/hamcrest-core-1.3.jar
View File

Binary file not shown.

BIN
lib-test/hamcrest-core-2.2.jar Normal file
View File

Binary file not shown.

BIN
lib-test/hamcrest-library-1.3.jar
View File

Binary file not shown.

BIN
lib-test/jmock-2.12.0.jar Normal file
View File

Binary file not shown.

BIN
lib-test/jmock-2.9.0.jar
View File

Binary file not shown.

BIN
lib-test/jmock-junit4-2.12.0.jar Normal file
View File

Binary file not shown.

BIN
lib-test/jmock-junit4-2.9.0.jar
View File

Binary file not shown.

BIN
lib-test/junit-4.12.jar
View File

Binary file not shown.

BIN
lib-test/junit-4.13.2.jar Normal file
View File

Binary file not shown.

18
swing/.classpath
View File

@ -15,23 +15,23 @@
<classpathentry combineaccessrules="false" kind="src" path="/OpenRocket Core"/> <classpathentry combineaccessrules="false" kind="src" path="/OpenRocket Core"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/slf4j-api-1.7.30.jar"/> <classpathentry kind="lib" path="/OpenRocket Core/lib/slf4j-api-1.7.30.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/aopalliance.jar"/> <classpathentry kind="lib" path="/OpenRocket Core/lib/aopalliance.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/commonmark-0.18.1.jar"/> <classpathentry kind="lib" path="/OpenRocket Core/lib/commonmark-0.19.0.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/javax.inject.jar"/> <classpathentry kind="lib" path="/OpenRocket Core/lib/javax.inject.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/resources"/> <classpathentry kind="lib" path="/OpenRocket Core/resources"/>
<classpathentry kind="lib" path="resources"/> <classpathentry kind="lib" path="resources"/>
<classpathentry kind="lib" path="lib/miglayout-4.0-swing.jar" sourcepath="reference/miglayout-4.0-sources.jar"/> <classpathentry kind="lib" path="lib/miglayout-4.0-swing.jar" sourcepath="reference/miglayout-4.0-sources.jar"/>
<classpathentry kind="lib" path="lib/rsyntaxtextarea-2.5.6.jar"/> <classpathentry kind="lib" path="lib/rsyntaxtextarea-3.2.0.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/test-plugin.jar"/> <classpathentry kind="lib" path="/OpenRocket Test Libraries/test-plugin.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/annotation-detector-3.0.5.jar"/> <classpathentry kind="lib" path="/OpenRocket Core/lib/annotation-detector-3.0.5.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/guice-4.2.3-no_aop.jar"/> <classpathentry kind="lib" path="/OpenRocket Core/lib/guice-4.2.3-no_aop.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/logback-classic-1.2.3.jar"/> <classpathentry kind="lib" path="/OpenRocket Core/lib/logback-classic-1.2.11.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/logback-core-1.2.3.jar"/> <classpathentry kind="lib" path="/OpenRocket Core/lib/logback-core-1.2.11.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/hamcrest-core-1.3.jar"/> <classpathentry kind="lib" path="/OpenRocket Test Libraries/hamcrest-core-2.2.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/hamcrest-library-1.3.jar"/> <classpathentry kind="lib" path="/OpenRocket Test Libraries/hamcrest-2.2.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/opencsv-4.3.2.jar"/> <classpathentry kind="lib" path="/OpenRocket Core/lib/opencsv-4.3.2.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/jmock-2.9.0.jar"/> <classpathentry kind="lib" path="/OpenRocket Test Libraries/jmock-2.12.0.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/jmock-junit4-2.9.0.jar"/> <classpathentry kind="lib" path="/OpenRocket Test Libraries/jmock-junit4-2.12.0.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/junit-4.12.jar"/> <classpathentry kind="lib" path="/OpenRocket Test Libraries/junit-4.13.2.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/jaxb-api.2.3.1.jar"/> <classpathentry kind="lib" path="/OpenRocket Core/lib/jaxb-api.2.3.1.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/jaxb-runtime.2.3.1.jar"/> <classpathentry kind="lib" path="/OpenRocket Core/lib/jaxb-runtime.2.3.1.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/guava-26.0-jre.jar"/> <classpathentry kind="lib" path="/OpenRocket Core/lib/guava-26.0-jre.jar"/>

42
swing/OpenRocket Swing.iml
View File

@ -19,7 +19,7 @@
<libelement value="file://$MODULE_DIR$/resources" /> <libelement value="file://$MODULE_DIR$/resources" />
<libelement value="jar://$MODULE_DIR$/../core/lib/annotation-detector-3.0.2.jar!/" /> <libelement value="jar://$MODULE_DIR$/../core/lib/annotation-detector-3.0.2.jar!/" />
<libelement value="jar://$MODULE_DIR$/lib/miglayout-4.0-swing.jar!/" /> <libelement value="jar://$MODULE_DIR$/lib/miglayout-4.0-swing.jar!/" />
<libelement value="jar://$MODULE_DIR$/lib/rsyntaxtextarea-2.5.6.jar!/" /> <libelement value="jar://$MODULE_DIR$/lib/rsyntaxtextarea-3.2.0.jar!/" />
<src_description expected_position="0"> <src_description expected_position="0">
<src_folder value="file://$MODULE_DIR$/src" expected_position="0" /> <src_folder value="file://$MODULE_DIR$/src" expected_position="0" />
</src_description> </src_description>
@ -38,7 +38,7 @@
<orderEntry type="module-library" scope="TEST"> <orderEntry type="module-library" scope="TEST">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/hamcrest-core-1.3.jar!/" /> <root url="jar://$MODULE_DIR$/../lib-test/hamcrest-core-2.2.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -47,7 +47,7 @@
<orderEntry type="module-library" scope="TEST"> <orderEntry type="module-library" scope="TEST">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/hamcrest-library-1.3.jar!/" /> <root url="jar://$MODULE_DIR$/../lib-test/hamcrest-2.2.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -56,7 +56,7 @@
<orderEntry type="module-library" scope="TEST"> <orderEntry type="module-library" scope="TEST">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/jmock-2.9.0.jar!/" /> <root url="jar://$MODULE_DIR$/../lib-test/jmock-2.12.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -65,16 +65,7 @@
<orderEntry type="module-library" scope="TEST"> <orderEntry type="module-library" scope="TEST">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/jmock-junit4-2.9.0.jar!/" /> <root url="jar://$MODULE_DIR$/../lib-test/jmock-junit4-2.12.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/junit-4.12.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -89,10 +80,10 @@
<SOURCES /> <SOURCES />
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="module-library"> <orderEntry type="module-library" scope="TEST">
<library name="iText-5.0.2.jar"> <library>
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/lib/iText-5.0.2.jar!/" /> <root url="jar://$MODULE_DIR$/../lib-test/junit-4.13.2.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -164,9 +155,9 @@
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="rsyntaxtextarea-2.5.6.jar"> <library name="rsyntaxtextarea-3.2.0.jar">
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/lib/rsyntaxtextarea-2.5.6.jar!/" /> <root url="jar://$MODULE_DIR$/lib/rsyntaxtextarea-3.2.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -184,7 +175,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/../core/lib/logback-classic-1.2.3.jar!/" /> <root url="jar://$MODULE_DIR$/../core/lib/logback-classic-1.2.11.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -193,7 +184,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/../core/lib/logback-core-1.2.3.jar!/" /> <root url="jar://$MODULE_DIR$/../core/lib/logback-core-1.2.11.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -245,5 +236,14 @@
<SOURCES /> <SOURCES />
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="module-library">
<library name="iText-5.0.2.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/iText-5.0.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
</component> </component>
</module> </module>

14
swing/build.xml
View File

@ -70,6 +70,8 @@
<!-- BUILD --> <!-- BUILD -->
<target name="build"> <target name="build">
<echo>Java/JVM version: ${ant.java.version}</echo>
<echo>Java/JVM detail version: ${java.version}</echo>
<mkdir dir="${classes.dir}"/> <mkdir dir="${classes.dir}"/>
<echo level="info">Compiling main classes</echo> <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="1.8" target="1.8"/>
@ -96,7 +98,7 @@
<zipfileset src="${core.dir}/lib/guava-26.0-jre.jar" /> <zipfileset src="${core.dir}/lib/guava-26.0-jre.jar" />
<zipfileset src="${core.dir}/lib/guice-4.2.3-no_aop.jar" /> <zipfileset src="${core.dir}/lib/guice-4.2.3-no_aop.jar" />
<zipfileset src="${core.dir}/lib/aopalliance.jar"/> <zipfileset src="${core.dir}/lib/aopalliance.jar"/>
<zipfileset src="${core.dir}/lib/commonmark-0.18.1.jar"/> <zipfileset src="${core.dir}/lib/commonmark-0.19.0.jar"/>
<zipfileset src="${core.dir}/lib/script-api-1.0.jar"/> <zipfileset src="${core.dir}/lib/script-api-1.0.jar"/>
<zipfileset src="${lib.dir}/iText-5.0.2.jar"/> <zipfileset src="${lib.dir}/iText-5.0.2.jar"/>
<zipfileset src="${core.dir}/lib/istack-commons-runtime.jar"/> <zipfileset src="${core.dir}/lib/istack-commons-runtime.jar"/>
@ -112,9 +114,9 @@
<zipfileset src="${core.dir}/lib/opencsv-4.3.2.jar"/> <zipfileset src="${core.dir}/lib/opencsv-4.3.2.jar"/>
<zipfileset src="${core.dir}/lib/annotation-detector-3.0.5.jar"/> <zipfileset src="${core.dir}/lib/annotation-detector-3.0.5.jar"/>
<zipfileset src="${core.dir}/lib/slf4j-api-1.7.30.jar"/> <zipfileset src="${core.dir}/lib/slf4j-api-1.7.30.jar"/>
<zipfileset src="${core.dir}/lib/logback-classic-1.2.3.jar"/> <zipfileset src="${core.dir}/lib/logback-classic-1.2.11.jar"/>
<zipfileset src="${core.dir}/lib/logback-core-1.2.3.jar"/> <zipfileset src="${core.dir}/lib/logback-core-1.2.11.jar"/>
<zipfileset src="${lib.dir}/rsyntaxtextarea-2.5.6.jar"/> <zipfileset src="${lib.dir}/rsyntaxtextarea-3.2.0.jar"/>
<!-- JOGL libraries need to be jar-in-jar --> <!-- JOGL libraries need to be jar-in-jar -->
<zipfileset dir="${lib.dir}/jogl" prefix="lib"> <zipfileset dir="${lib.dir}/jogl" prefix="lib">
@ -311,10 +313,14 @@ ${nonascii}</fail>
<!-- Unit tests --> <!-- Unit tests -->
<target name="unittest" description="Execute unit tests" depends="build"> <target name="unittest" description="Execute unit tests" depends="build">
<echo>Building unit tests</echo> <echo>Building unit tests</echo>
<echo>Java/JVM version: ${ant.java.version}</echo>
<echo>Java/JVM detail version: ${java.version}</echo>
<mkdir dir="${build-test.dir}"/> <mkdir dir="${build-test.dir}"/>
<javac debug="true" srcdir="${src-test.dir}" destdir="${build-test.dir}" classpathref="test-classpath"/> <javac debug="true" srcdir="${src-test.dir}" destdir="${build-test.dir}" classpathref="test-classpath"/>
<echo>Running unit tests</echo> <echo>Running unit tests</echo>
<echo>Java/JVM version: ${ant.java.version}</echo>
<echo>Java/JVM detail version: ${java.version}</echo>
<mkdir dir="${tmp.dir}/rawtestoutput"/> <mkdir dir="${tmp.dir}/rawtestoutput"/>
<junit fork="yes" forkmode="once" printsummary="false" failureproperty="junit.failure"> <junit fork="yes" forkmode="once" printsummary="false" failureproperty="junit.failure">
<classpath> <classpath>

BIN
swing/lib/rsyntaxtextarea-2.5.6.jar
View File

Binary file not shown.

BIN
swing/lib/rsyntaxtextarea-3.2.0.jar Normal file
View File

Binary file not shown.

2
swing/resources-src/datafiles/components

@ -1 +1 @@
Subproject commit 860757167c4835a7bb960a4cbb52b06f3309791c Subproject commit 52e1e2c0800ebf62fd0e9cecd69aaaed6cddf80e

1
swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java
View File

@ -71,7 +71,6 @@ public class AboutDialog extends JDialog {
"Simple Logging Facade for Java" + href("http://www.slf4j.org", true, true) + "<br>" + "Simple Logging Facade for Java" + href("http://www.slf4j.org", true, true) + "<br>" +
"Java library for parsing and rendering CommonMark" + href("https://github.com/commonmark/commonmark-java", true, true) + "<br>" + "Java library for parsing and rendering CommonMark" + href("https://github.com/commonmark/commonmark-java", true, true) + "<br>" +
"RSyntaxTextArea" + href("http://bobbylight.github.io/RSyntaxTextArea", true, true) + "<br>" + "RSyntaxTextArea" + href("http://bobbylight.github.io/RSyntaxTextArea", true, true) + "<br>" +
"yasson" + href("https://eclipse-ee4j.github.io/yasson", true, true) + "<br>" +
"<br>" + "<br>" +
"<b>OpenRocket gratefully acknowledges our use of the following databases:</b><br>" + "<b>OpenRocket gratefully acknowledges our use of the following databases:</b><br>" +
"<br>" + "<br>" +