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>
</entry>
</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" />
</component>
</project>

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

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

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

@ -9,16 +9,16 @@ import net.sf.openrocket.util.Transformation;
/**
*
* @author teyrana (aka Daniel Williams) <equipoise@gmail.com>
*
* @author teyrana (aka Daniel Williams) <equipoise@gmail.com>
*
*/
public class InstanceMap extends HashMap<RocketComponent, ArrayList<InstanceContext>> {
// =========== Public Functions ========================
// public InstanceMap() {}
public int count(final RocketComponent key) {
if(containsKey(key)){
return get(key).size();
@ -26,12 +26,12 @@ public class InstanceMap extends HashMap<RocketComponent, ArrayList<InstanceCont
return 0;
}
}
public void emplace(final RocketComponent component, boolean active, int number, final Transformation xform) {
final RocketComponent key = component;
if(!containsKey(component)) {
put(key, new ArrayList<>());
put(key, new ArrayList<InstanceContext>());
}
final InstanceContext context = new InstanceContext(component, active, number, xform);
@ -41,7 +41,7 @@ public class InstanceMap extends HashMap<RocketComponent, ArrayList<InstanceCont
public List<InstanceContext> getInstanceContexts(final RocketComponent key) {
return get(key);
}
// this is primarily for debugging.
@Override
public String toString() {
@ -53,21 +53,21 @@ public class InstanceMap extends HashMap<RocketComponent, ArrayList<InstanceCont
final ArrayList<InstanceContext> contexts = entry.getValue();
buffer.append(String.format("....[% 2d]:[%s]\n", outerIndex, key.getName()));
outerIndex++;
int innerIndex = 0;
for(InstanceContext ctxt: contexts ) {
buffer.append(String.format("........[@% 2d][% 2d] %s\n", innerIndex, ctxt.instanceNumber, ctxt.getLocation().toPreciseString()));
innerIndex++;
}
}
return buffer.toString();
}
// =========== Instance Member Variables ========================
// =========== Private Instance Functions ========================
}

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

@ -17,8 +17,8 @@ import net.sf.openrocket.util.TestRockets;
import net.sf.openrocket.util.BaseTestCase.BaseTestCase;
public class FlightConfigurationTest extends BaseTestCase {
private final static double EPSILON = MathUtil.EPSILON*1E3;
private final static double EPSILON = MathUtil.EPSILON*1E3;
/**
* Empty rocket (no components) specific configuration tests
*/
@ -26,12 +26,12 @@ public class FlightConfigurationTest extends BaseTestCase {
public void testEmptyRocket() {
Rocket r1 = TestRockets.makeEstesAlphaIII();
FlightConfiguration config = r1.getSelectedConfiguration();
FlightConfiguration configClone = config.clone();
assertTrue(config.getRocket() == configClone.getRocket());
}
@Test
public void testFlightConfigurationRocketLength() {
@ -55,13 +55,13 @@ public class FlightConfigurationTest extends BaseTestCase {
double actualReferenceArea = config.getReferenceArea();
assertEquals("source config reference area doesn't match: ", expectedReferenceArea, actualReferenceArea, EPSILON);
}
@Test
public void testCloneBasic() {
Rocket rkt1 = TestRockets.makeBeta();
FlightConfiguration config1 = rkt1.getSelectedConfiguration();
// preconditions
config1.setAllStages();
int expectedStageCount = 2;
@ -79,10 +79,10 @@ public class FlightConfigurationTest extends BaseTestCase {
assertEquals("source config reference area doesn't match: ", expectedReferenceArea, actualReferenceArea, EPSILON);
// vvvv test target vvvv
// vvvv test target vvvv
FlightConfiguration config2= config1.clone();
// ^^^^ test target ^^^^
// postconditions
expectedStageCount = 2;
actualStageCount = config2.getActiveStageCount();
@ -95,7 +95,7 @@ public class FlightConfigurationTest extends BaseTestCase {
assertEquals("source config reference area doesn't match: ", expectedReferenceArea, config2.getReferenceArea(), EPSILON);
}
/**
* Test flight configuration ID methods
*/
@ -107,11 +107,11 @@ public class FlightConfigurationTest extends BaseTestCase {
int actualStageCount;
int expectedMotorCount;
int actualMotorCount;
// test that cloned configurations operate independently:
// change #1, test clone #2 -- verify that cloned configurations change independent.
config1.setAllStages();
// vvvv test target vvvv
// vvvv test target vvvv
FlightConfiguration config2 = config1.clone();
// ^^^^ test target ^^^^
config1.clearAllStages();
@ -123,7 +123,7 @@ public class FlightConfigurationTest extends BaseTestCase {
expectedMotorCount = 0;
actualMotorCount = config1.getActiveMotors().size();
assertThat("active motor count doesn't match", actualMotorCount, equalTo(expectedMotorCount));
// postcondition: config #2
expectedStageCount = 2;
actualStageCount = config2.getActiveStageCount();
@ -132,7 +132,7 @@ public class FlightConfigurationTest extends BaseTestCase {
actualMotorCount = config2.getActiveMotors().size();
assertThat("active motor count doesn't match", actualMotorCount, equalTo(expectedMotorCount));
}
/**
* Single stage rocket specific configuration tests
*/
@ -140,39 +140,39 @@ public class FlightConfigurationTest extends BaseTestCase {
public void testSingleStageRocket() {
Rocket r1 = TestRockets.makeEstesAlphaIII();
FlightConfiguration config = r1.getSelectedConfiguration();
// test explicitly setting only first stage active
config.clearAllStages();
config.setOnlyStage(0);
// test that getStageCount() returns correct value
int expectedStageCount = 1;
int stageCount = config.getStageCount();
assertTrue("stage count doesn't match", stageCount == expectedStageCount);
expectedStageCount = 1;
stageCount = config.getActiveStageCount();
assertThat("active stage count doesn't match", stageCount, equalTo(expectedStageCount));
// test explicitly setting all stages up to first stage active
config.setOnlyStage(0);
// test explicitly setting all stages active
config.setAllStages();
}
/**
* Single stage rocket specific configuration tests
*/
@Test
public void testDefaultConfigurationIsEmpty() {
Rocket r1 = TestRockets.makeEstesAlphaIII();
// don't change the configuration:
// don't change the configuration:
FlightConfiguration defaultConfig = r1.getSelectedConfiguration();
assertThat( "Empty configuration has motors! it should be empty!", r1.getEmptyConfiguration().getActiveMotors().size(), equalTo(0));
assertThat( "Default configuration is not the empty configuration. It should be!", defaultConfig.getActiveMotors().size(), equalTo(0));
assertThat( "Default configuration is not the empty configuration. It should be!", defaultConfig.getActiveMotors().size(), equalTo(0));
}
@Test
@ -197,15 +197,15 @@ public class FlightConfigurationTest extends BaseTestCase {
public void testMotorConfigurations() {
/* Setup */
Rocket rkt = TestRockets.makeEstesAlphaIII();
InnerTube smmt = (InnerTube)rkt.getChild(0).getChild(1).getChild(2);
int expectedMotorCount = 5;
int actualMotorCount = smmt.getMotorCount();
assertThat("number of motor configurations doesn't match.", actualMotorCount, equalTo(expectedMotorCount));
}
@Test
public void testFlightConfigurationGetters(){
Rocket rkt = TestRockets.makeEstesAlphaIII();
@ -224,7 +224,7 @@ public class FlightConfigurationTest extends BaseTestCase {
rkt.getFlightConfigurationByIndex(4);
rkt.getFlightConfigurationByIndex(5, true);
}
@Test(expected=java.lang.IndexOutOfBoundsException.class)
public void testGetFlightConfigurationOutOfBounds(){
@ -235,84 +235,84 @@ public class FlightConfigurationTest extends BaseTestCase {
int actualConfigCount = rkt.getConfigurationCount();
assertThat("number of loaded configuration counts doesn't actually match.", actualConfigCount, equalTo(expectedConfigCount));
// this SHOULD throw an exception --
// this SHOULD throw an exception --
// it's out of bounds on, and no configuration exists at index 5.
rkt.getFlightConfigurationByIndex(5);
rkt.getFlightConfigurationByIndex(5);
}
/**
* Multi stage rocket specific configuration tests
*/
@Test
public void testMultiStageRocket() {
/* Setup */
Rocket rkt = TestRockets.makeBeta();
FlightConfiguration config = rkt.getSelectedConfiguration();
int expectedStageCount;
int stageCount;
expectedStageCount = 2;
stageCount = config.getStageCount();
assertThat("stage count doesn't match", stageCount, equalTo(expectedStageCount));
config.clearAllStages();
assertThat(" clear all stages: check #0: ", config.isStageActive(0), equalTo(false));
assertThat(" clear all stages: check #1: ", config.isStageActive(1), equalTo(false));
// test explicitly setting only first stage active
config.setOnlyStage(0);
expectedStageCount = 1;
stageCount = config.getActiveStageCount();
assertThat("active stage count doesn't match", stageCount, equalTo(expectedStageCount));
assertThat(" setting single stage active: ", config.isStageActive(0), equalTo(true));
// test explicitly setting all stages up to second stage active
config.setOnlyStage(1);
assertThat("Setting single stage active: ", config.isStageActive(0), equalTo(false));
assertThat("Setting single stage active: ", config.isStageActive(1), equalTo(true));
config.clearStage(0);
assertThat(" deactivate stage #0: ", config.isStageActive(0), equalTo(false));
assertThat(" active stage #1: ", config.isStageActive(1), equalTo(true));
// test explicitly setting all two stages active
config.setAllStages();
assertThat(" activate all stages: check stage #0: ", config.isStageActive(0), equalTo(true));
assertThat(" activate all stages: check stage #1: ", config.isStageActive(1), equalTo(true));
// test toggling single stage
config.setAllStages();
config.toggleStage(0);
assertThat(" toggle stage #0: ", config.isStageActive(0), equalTo(false));
config.toggleStage(0);
assertThat(" toggle stage #0: ", config.isStageActive(0), equalTo(true));
config.toggleStage(0);
assertThat(" toggle stage #0: ", config.isStageActive(0), equalTo(false));
}
/**
* Multi stage rocket specific configuration tests
*/
@Test
public void testMotorClusters() {
/* Setup */
Rocket rkt = TestRockets.makeBeta();
FlightConfiguration config = rkt.getSelectedConfiguration();
config.clearAllStages();
int expectedMotorCount = 0;
int actualMotorCount = config.getActiveMotors().size();
assertThat("active motor count doesn't match", actualMotorCount, equalTo(expectedMotorCount));
config.setOnlyStage(0);
expectedMotorCount = 1;
actualMotorCount = config.getActiveMotors().size();
@ -328,7 +328,7 @@ public class FlightConfigurationTest extends BaseTestCase {
actualMotorCount = config.getActiveMotors().size();
assertThat("active motor count doesn't match: ", actualMotorCount, equalTo(expectedMotorCount));
}
@Test
public void testIterateComponents() {
Rocket rocket = TestRockets.makeFalcon9Heavy();
@ -336,21 +336,21 @@ public class FlightConfigurationTest extends BaseTestCase {
selected.clearAllStages();
selected.toggleStage(2);
// vvvv Test Target vvvv
InstanceMap instances = selected.getActiveInstances();
// ^^^^ Test Target ^^^^
// Payload Stage
final AxialStage coreStage = (AxialStage)rocket.getChild(1);
{ // Core Stage
final List<InstanceContext> coreStageContextList = instances.getInstanceContexts(coreStage);
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.getInstanceCount(), equalTo(1));
final Coordinate coreLocation = coreStageContext.getLocation();
final Coordinate coreLocation = coreStageContext.getLocation();
assertEquals(coreLocation.x, 0.564, EPSILON);
assertEquals(coreLocation.y, 0.0, EPSILON);
assertEquals(coreLocation.z, 0.0, EPSILON);
@ -363,77 +363,77 @@ public class FlightConfigurationTest extends BaseTestCase {
final ParallelStage boosterStage = (ParallelStage)coreStage.getChild(0).getChild(0);
final List<InstanceContext> boosterStageContextList = instances.getInstanceContexts(boosterStage);
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.instanceNumber, equalTo(0));
{
final Coordinate loc = boosterStage0Context.getLocation();
final Coordinate loc = boosterStage0Context.getLocation();
assertEquals(loc.x, 0.484, EPSILON);
assertEquals(loc.y, 0.077, EPSILON);
assertEquals(loc.z, 0.0, EPSILON);
}
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.instanceNumber, equalTo(1));
{
final Coordinate loc = boosterStage1Context.getLocation();
final Coordinate loc = boosterStage1Context.getLocation();
assertEquals(loc.x, 0.484, EPSILON);
assertEquals(loc.y, -0.077, EPSILON);
assertEquals(loc.z, 0.0, EPSILON);
}
{ // Booster Body:
final BodyTube boosterBody = (BodyTube)boosterStage.getChild(1);
final List<InstanceContext> boosterBodyContextList = instances.getInstanceContexts(boosterBody);
// this is the instance number rocket-wide
final InstanceContext boosterBodyContext = boosterBodyContextList.get(1);
// this is the instance number per-parent
assertThat(boosterBodyContext.instanceNumber, equalTo(0));
assertThat(boosterBodyContext.component.getClass(), equalTo(BodyTube.class));
final Coordinate bodyTubeLocation = boosterBodyContext.getLocation();
assertThat((Class<BodyTube>) boosterBodyContext.component.getClass(), equalTo(BodyTube.class));
final Coordinate bodyTubeLocation = boosterBodyContext.getLocation();
assertEquals(bodyTubeLocation.x, 0.564, EPSILON);
assertEquals(bodyTubeLocation.y, -0.077, EPSILON);
assertEquals(bodyTubeLocation.z, 0.0, EPSILON);
{ // Booster::Motor Tubes ( x2 x4)
final InnerTube boosterMMT = (InnerTube)boosterBody.getChild(0);
final List<InstanceContext> mmtContextList = instances.getInstanceContexts(boosterMMT);
assertEquals(8, mmtContextList.size());
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));
final Coordinate motorTube0Location = motorTubeContext0.getLocation();
final Coordinate motorTube0Location = motorTubeContext0.getLocation();
assertEquals(motorTube0Location.x, 1.214, EPSILON);
assertEquals(motorTube0Location.y, -0.062, EPSILON);
assertEquals(motorTube0Location.z, -0.015, EPSILON);
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));
final Coordinate motorTube1Location = motorTubeContext1.getLocation();
final Coordinate motorTube1Location = motorTubeContext1.getLocation();
assertEquals(motorTube1Location.x, 1.214, EPSILON);
assertEquals(motorTube1Location.y, -0.092, EPSILON);
assertEquals(motorTube1Location.z, -0.015, EPSILON);
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));
final Coordinate motorTube2Location = motorTubeContext2.getLocation();
final Coordinate motorTube2Location = motorTubeContext2.getLocation();
assertEquals(motorTube2Location.x, 1.214, EPSILON);
assertEquals(motorTube2Location.y, -0.092, EPSILON);
assertEquals(motorTube2Location.z, 0.015, EPSILON);
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));
final Coordinate motorTube3Location = motorTubeContext3.getLocation();
final Coordinate motorTube3Location = motorTubeContext3.getLocation();
assertEquals(motorTube3Location.x, 1.214, EPSILON);
assertEquals(motorTube3Location.y, -0.062, EPSILON);
assertEquals(motorTube3Location.z, 0.015, EPSILON);
@ -442,54 +442,54 @@ public class FlightConfigurationTest extends BaseTestCase {
final FinSet fins = (FinSet)boosterBody.getChild(1);
final List<InstanceContext> finContextList = instances.getInstanceContexts(fins);
assertEquals(6, finContextList.size());
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));
final Coordinate boosterFin0Location = boosterFinContext0.getLocation();
final Coordinate boosterFin0Location = boosterFinContext0.getLocation();
assertEquals(boosterFin0Location.x, 1.044, EPSILON);
assertEquals(boosterFin0Location.y, -0.104223611, EPSILON);
assertEquals(boosterFin0Location.z, -0.027223611, EPSILON);
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));
final Coordinate boosterFin1Location = boosterFinContext1.getLocation();
final Coordinate boosterFin1Location = boosterFinContext1.getLocation();
assertEquals(boosterFin1Location.x, 1.044, EPSILON);
assertEquals(boosterFin1Location.y, -0.03981186, EPSILON);
assertEquals(boosterFin1Location.z, -0.00996453, EPSILON);
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));
final Coordinate boosterFin2Location = boosterFinContext2.getLocation();
final Coordinate boosterFin2Location = boosterFinContext2.getLocation();
assertEquals(boosterFin2Location.x, 1.044, EPSILON);
assertEquals(boosterFin2Location.y, -0.08696453, EPSILON);
assertEquals(boosterFin2Location.z, 0.03718814, EPSILON);
}
}
}
}
@Test
public void testIterateCoreComponents_AllStagesActive() {
Rocket rocket = TestRockets.makeFalcon9Heavy();
FlightConfiguration selected = rocket.getSelectedConfiguration();
selected.setAllStages();
// vvvv Test Target vvvv
ArrayList<RocketComponent> components = selected.getCoreComponents();
// ^^^^ Test Target ^^^^
assertThat(components.size(), equalTo(10));
final AxialStage payloadStage = (AxialStage)components.get(0);
assertThat(payloadStage.getName(), equalTo("Payload Fairing Stage"));
final AxialStage coreStage = (AxialStage)components.get(1);
assertThat(coreStage.getName(), equalTo("Core Stage"));
@ -499,7 +499,7 @@ public class FlightConfigurationTest extends BaseTestCase {
assertThat(components.get(3).getName(), equalTo("PL Fairing Body"));
assertThat(components.get(4), instanceOf(Transition.class));
assertThat(components.get(5), instanceOf(BodyTube.class));
assertThat(components.get(5).getName(), equalTo("Upper Stage Body"));
@ -508,11 +508,11 @@ public class FlightConfigurationTest extends BaseTestCase {
assertThat(components.get(7), instanceOf(BodyTube.class));
assertThat(components.get(7).getName(), equalTo("Core Stage Body"));
assertThat(components.get(8), instanceOf(Parachute.class));
assertThat(components.get(9), instanceOf(ShockCord.class));
}
@Test
public void testIterateCoreComponents_ActiveOnly() {
Rocket rocket = TestRockets.makeFalcon9Heavy();
@ -520,30 +520,30 @@ public class FlightConfigurationTest extends BaseTestCase {
selected.clearAllStages();
selected.toggleStage(2); // booster only.
// vvvv Test Target vvvv
ArrayList<RocketComponent> components = selected.getCoreComponents();
// ^^^^ Test Target ^^^^
assertThat(components.size(), equalTo(0));
// =================================
selected.clearAllStages();
selected.toggleStage(1); // booster only.
// vvvv Test Target vvvv
components = selected.getCoreComponents();
// ^^^^ Test Target ^^^^
assertThat(components.size(), equalTo(2));
final AxialStage coreStage = (AxialStage)components.get(0);
assertThat(coreStage.getName(), equalTo("Core Stage"));
assertThat(components.get(1), instanceOf(BodyTube.class));
assertThat(components.get(1).getName(), equalTo("Core Stage Body"));
}
}