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

Upgrade codebase to Java 11

Browse Source
This commit is contained in:
Neil Balch 2019-10-28 08:56:05 -07:00
parent 0509f9e8ec
commit f26e3afcf3
4 changed files with 125 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml generated
View File

@ -46,7 +46,7 @@
</profile-state> </profile-state>
</entry> </entry>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" project-jdk-name="11" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
</project> </project>

9
.idea/runConfigurations/Openrocket_UI_Jar.xml generated
View File

@ -1,10 +1,9 @@
<component name="ProjectRunConfigurationManager"> <component name="ProjectRunConfigurationManager">
<configuration default="false" name="Openrocket UI Jar" type="JarApplication" factoryName="JAR Application"> <configuration default="false" name="Openrocket UI Jar" type="JarApplication">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="JAR_PATH" value="build/jar/OpenRocket.jar" /> <option name="JAR_PATH" value="build/jar/OpenRocket.jar" />
<option name="ALTERNATIVE_JRE_PATH" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<envs /> <option name="ALTERNATIVE_JRE_PATH" value="11" />
<method> <method v="2">
<option name="BuildArtifacts" enabled="true"> <option name="BuildArtifacts" enabled="true">
<artifact name="openrocket:jar" /> <artifact name="openrocket:jar" />
</option> </option>

2
core/src/net/sf/openrocket/rocketcomponent/InstanceMap.java
View File

@ -31,7 +31,7 @@ public class InstanceMap extends HashMap<RocketComponent, ArrayList<InstanceCont
final RocketComponent key = component; final RocketComponent key = component;
if(!containsKey(component)) { if(!containsKey(component)) {
put(key, new ArrayList<>()); put(key, new ArrayList<InstanceContext>());
} }
final InstanceContext context = new InstanceContext(component, active, number, xform); final InstanceContext context = new InstanceContext(component, active, number, xform);

22
core/test/net/sf/openrocket/rocketcomponent/FlightConfigurationTest.java
View File

@ -346,7 +346,7 @@ public class FlightConfigurationTest extends BaseTestCase {
{ // Core Stage { // Core Stage
final List<InstanceContext> coreStageContextList = instances.getInstanceContexts(coreStage); final List<InstanceContext> coreStageContextList = instances.getInstanceContexts(coreStage);
final InstanceContext coreStageContext = coreStageContextList.get(0); final InstanceContext coreStageContext = coreStageContextList.get(0);
assertThat(coreStageContext.component.getClass(), equalTo(AxialStage.class)); assertThat((Class<AxialStage>) coreStageContext.component.getClass(), equalTo(AxialStage.class));
assertThat(coreStageContext.component.getID(), equalTo(rocket.getChild(1).getID())); assertThat(coreStageContext.component.getID(), equalTo(rocket.getChild(1).getID()));
assertThat(coreStageContext.component.getInstanceCount(), equalTo(1)); assertThat(coreStageContext.component.getInstanceCount(), equalTo(1));
@ -363,7 +363,7 @@ public class FlightConfigurationTest extends BaseTestCase {
final ParallelStage boosterStage = (ParallelStage)coreStage.getChild(0).getChild(0); final ParallelStage boosterStage = (ParallelStage)coreStage.getChild(0).getChild(0);
final List<InstanceContext> boosterStageContextList = instances.getInstanceContexts(boosterStage); final List<InstanceContext> boosterStageContextList = instances.getInstanceContexts(boosterStage);
final InstanceContext boosterStage0Context = boosterStageContextList.get(0); final InstanceContext boosterStage0Context = boosterStageContextList.get(0);
assertThat(boosterStage0Context.component.getClass(), equalTo(ParallelStage.class)); assertThat((Class<ParallelStage>) boosterStage0Context.component.getClass(), equalTo(ParallelStage.class));
assertThat(boosterStage0Context.component.getID(), equalTo(boosterStage.getID())); assertThat(boosterStage0Context.component.getID(), equalTo(boosterStage.getID()));
assertThat(boosterStage0Context.instanceNumber, equalTo(0)); assertThat(boosterStage0Context.instanceNumber, equalTo(0));
{ {
@ -374,7 +374,7 @@ public class FlightConfigurationTest extends BaseTestCase {
} }
final InstanceContext boosterStage1Context = boosterStageContextList.get(1); final InstanceContext boosterStage1Context = boosterStageContextList.get(1);
assertThat(boosterStage1Context.component.getClass(), equalTo(ParallelStage.class)); assertThat((Class<ParallelStage>) boosterStage1Context.component.getClass(), equalTo(ParallelStage.class));
assertThat(boosterStage1Context.component.getID(), equalTo(boosterStage.getID())); assertThat(boosterStage1Context.component.getID(), equalTo(boosterStage.getID()));
assertThat(boosterStage1Context.instanceNumber, equalTo(1)); assertThat(boosterStage1Context.instanceNumber, equalTo(1));
{ {
@ -394,7 +394,7 @@ public class FlightConfigurationTest extends BaseTestCase {
// this is the instance number per-parent // this is the instance number per-parent
assertThat(boosterBodyContext.instanceNumber, equalTo(0)); assertThat(boosterBodyContext.instanceNumber, equalTo(0));
assertThat(boosterBodyContext.component.getClass(), equalTo(BodyTube.class)); assertThat((Class<BodyTube>) boosterBodyContext.component.getClass(), equalTo(BodyTube.class));
final Coordinate bodyTubeLocation = boosterBodyContext.getLocation(); final Coordinate bodyTubeLocation = boosterBodyContext.getLocation();
assertEquals(bodyTubeLocation.x, 0.564, EPSILON); assertEquals(bodyTubeLocation.x, 0.564, EPSILON);
@ -407,7 +407,7 @@ public class FlightConfigurationTest extends BaseTestCase {
assertEquals(8, mmtContextList.size()); assertEquals(8, mmtContextList.size());
final InstanceContext motorTubeContext0 = mmtContextList.get(4); final InstanceContext motorTubeContext0 = mmtContextList.get(4);
assertThat(motorTubeContext0.component.getClass(), equalTo(InnerTube.class)); assertThat((Class<InnerTube>) motorTubeContext0.component.getClass(), equalTo(InnerTube.class));
assertThat(motorTubeContext0.instanceNumber, equalTo(0)); assertThat(motorTubeContext0.instanceNumber, equalTo(0));
final Coordinate motorTube0Location = motorTubeContext0.getLocation(); final Coordinate motorTube0Location = motorTubeContext0.getLocation();
assertEquals(motorTube0Location.x, 1.214, EPSILON); assertEquals(motorTube0Location.x, 1.214, EPSILON);
@ -415,7 +415,7 @@ public class FlightConfigurationTest extends BaseTestCase {
assertEquals(motorTube0Location.z, -0.015, EPSILON); assertEquals(motorTube0Location.z, -0.015, EPSILON);
final InstanceContext motorTubeContext1 = mmtContextList.get(5); final InstanceContext motorTubeContext1 = mmtContextList.get(5);
assertThat(motorTubeContext1.component.getClass(), equalTo(InnerTube.class)); assertThat((Class<InnerTube>) motorTubeContext1.component.getClass(), equalTo(InnerTube.class));
assertThat(motorTubeContext1.instanceNumber, equalTo(1)); assertThat(motorTubeContext1.instanceNumber, equalTo(1));
final Coordinate motorTube1Location = motorTubeContext1.getLocation(); final Coordinate motorTube1Location = motorTubeContext1.getLocation();
assertEquals(motorTube1Location.x, 1.214, EPSILON); assertEquals(motorTube1Location.x, 1.214, EPSILON);
@ -423,7 +423,7 @@ public class FlightConfigurationTest extends BaseTestCase {
assertEquals(motorTube1Location.z, -0.015, EPSILON); assertEquals(motorTube1Location.z, -0.015, EPSILON);
final InstanceContext motorTubeContext2 = mmtContextList.get(6); final InstanceContext motorTubeContext2 = mmtContextList.get(6);
assertThat(motorTubeContext2.component.getClass(), equalTo(InnerTube.class)); assertThat((Class<InnerTube>) motorTubeContext2.component.getClass(), equalTo(InnerTube.class));
assertThat(motorTubeContext2.instanceNumber, equalTo(2)); assertThat(motorTubeContext2.instanceNumber, equalTo(2));
final Coordinate motorTube2Location = motorTubeContext2.getLocation(); final Coordinate motorTube2Location = motorTubeContext2.getLocation();
assertEquals(motorTube2Location.x, 1.214, EPSILON); assertEquals(motorTube2Location.x, 1.214, EPSILON);
@ -431,7 +431,7 @@ public class FlightConfigurationTest extends BaseTestCase {
assertEquals(motorTube2Location.z, 0.015, EPSILON); assertEquals(motorTube2Location.z, 0.015, EPSILON);
final InstanceContext motorTubeContext3 = mmtContextList.get(7); final InstanceContext motorTubeContext3 = mmtContextList.get(7);
assertThat(motorTubeContext3.component.getClass(), equalTo(InnerTube.class)); assertThat((Class<InnerTube>) motorTubeContext3.component.getClass(), equalTo(InnerTube.class));
assertThat(motorTubeContext3.instanceNumber, equalTo(3)); assertThat(motorTubeContext3.instanceNumber, equalTo(3));
final Coordinate motorTube3Location = motorTubeContext3.getLocation(); final Coordinate motorTube3Location = motorTubeContext3.getLocation();
assertEquals(motorTube3Location.x, 1.214, EPSILON); assertEquals(motorTube3Location.x, 1.214, EPSILON);
@ -444,7 +444,7 @@ public class FlightConfigurationTest extends BaseTestCase {
assertEquals(6, finContextList.size()); assertEquals(6, finContextList.size());
final InstanceContext boosterFinContext0 = finContextList.get(3); final InstanceContext boosterFinContext0 = finContextList.get(3);
assertThat(boosterFinContext0.component.getClass(), equalTo(TrapezoidFinSet.class)); assertThat((Class<TrapezoidFinSet>) boosterFinContext0.component.getClass(), equalTo(TrapezoidFinSet.class));
assertThat(boosterFinContext0.instanceNumber, equalTo(0)); assertThat(boosterFinContext0.instanceNumber, equalTo(0));
final Coordinate boosterFin0Location = boosterFinContext0.getLocation(); final Coordinate boosterFin0Location = boosterFinContext0.getLocation();
assertEquals(boosterFin0Location.x, 1.044, EPSILON); assertEquals(boosterFin0Location.x, 1.044, EPSILON);
@ -452,7 +452,7 @@ public class FlightConfigurationTest extends BaseTestCase {
assertEquals(boosterFin0Location.z, -0.027223611, EPSILON); assertEquals(boosterFin0Location.z, -0.027223611, EPSILON);
final InstanceContext boosterFinContext1 = finContextList.get(4); final InstanceContext boosterFinContext1 = finContextList.get(4);
assertThat(boosterFinContext1.component.getClass(), equalTo(TrapezoidFinSet.class)); assertThat((Class<TrapezoidFinSet>) boosterFinContext1.component.getClass(), equalTo(TrapezoidFinSet.class));
assertThat(boosterFinContext1.instanceNumber, equalTo(1)); assertThat(boosterFinContext1.instanceNumber, equalTo(1));
final Coordinate boosterFin1Location = boosterFinContext1.getLocation(); final Coordinate boosterFin1Location = boosterFinContext1.getLocation();
assertEquals(boosterFin1Location.x, 1.044, EPSILON); assertEquals(boosterFin1Location.x, 1.044, EPSILON);
@ -460,7 +460,7 @@ public class FlightConfigurationTest extends BaseTestCase {
assertEquals(boosterFin1Location.z, -0.00996453, EPSILON); assertEquals(boosterFin1Location.z, -0.00996453, EPSILON);
final InstanceContext boosterFinContext2 = finContextList.get(5); final InstanceContext boosterFinContext2 = finContextList.get(5);
assertThat(boosterFinContext2.component.getClass(), equalTo(TrapezoidFinSet.class)); assertThat((Class<TrapezoidFinSet>) boosterFinContext2.component.getClass(), equalTo(TrapezoidFinSet.class));
assertThat(boosterFinContext2.instanceNumber, equalTo(2)); assertThat(boosterFinContext2.instanceNumber, equalTo(2));
final Coordinate boosterFin2Location = boosterFinContext2.getLocation(); final Coordinate boosterFin2Location = boosterFinContext2.getLocation();
assertEquals(boosterFin2Location.x, 1.044, EPSILON); assertEquals(boosterFin2Location.x, 1.044, EPSILON);