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

SIM_WARN events take a null source. The Warning being passed in includes a set of sources; in case of a SIM_WARN event we'll look the source up there

Browse Source
This commit is contained in:
JoePfeiffer 2024-08-22 16:50:43 -06:00
parent 1c0710e240
commit 1d4ef4383a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/info/openrocket/core/simulation/FlightEvent.java
View File

@ -124,8 +124,8 @@ public class FlightEvent implements Comparable<FlightEvent> {
this(type, time, source, null); this(type, time, source, null);
} }
public FlightEvent(final FlightEvent _sourceEvent, final RocketComponent _comp, final Object _data) { public FlightEvent( final FlightEvent sourceEvent, final RocketComponent source, final Object data) {
this(_sourceEvent.type, _sourceEvent.time, _comp, _data); this(sourceEvent.type, sourceEvent.time, source, data);
} }
public FlightEvent( final Type type, final double time, final RocketComponent source, final Object data) { public FlightEvent( final Type type, final double time, final RocketComponent source, final Object data) {
@ -248,6 +248,12 @@ public class FlightEvent implements Comparable<FlightEvent> {
} }
break; break;
case SIM_WARN: case SIM_WARN:
if (null != this.source) {
// rather than making event sources take sets of components, or trying to keep them
// in sync with the sources of Warnings, we'll require the event source to be null
// and pull the actual sources from the Warning
throw new IllegalStateException(type.name()+" event requires null source component; was " + this.source);
}
if (( null == this.data ) || ( ! ( this.data instanceof Warning ))) { if (( null == this.data ) || ( ! ( this.data instanceof Warning ))) {
throw new IllegalStateException(type.name()+" events require Warning objects"); throw new IllegalStateException(type.name()+" events require Warning objects");
} }