Always let condition change fire a change event
This commit is contained in:
parent
3acdda83c3
commit
2535c1c468
@ -589,12 +589,6 @@ public class Simulation implements ChangeSource, Cloneable {
|
|||||||
}
|
}
|
||||||
copyExtensionsFrom(simulation.getSimulationExtensions());
|
copyExtensionsFrom(simulation.getSimulationExtensions());
|
||||||
this.status = simulation.status;
|
this.status = simulation.status;
|
||||||
// Status change, so reset the change listeners to be sure
|
|
||||||
for (EventListener listener : this.options.getChangeListeners()) {
|
|
||||||
if (listener instanceof ConditionListener) {
|
|
||||||
((ConditionListener) listener).reset();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
this.simulatedData = simulation.simulatedData;
|
this.simulatedData = simulation.simulatedData;
|
||||||
this.simulationStepperClass = simulation.simulationStepperClass;
|
this.simulationStepperClass = simulation.simulationStepperClass;
|
||||||
this.aerodynamicCalculatorClass = simulation.aerodynamicCalculatorClass;
|
this.aerodynamicCalculatorClass = simulation.aerodynamicCalculatorClass;
|
||||||
@ -664,20 +658,10 @@ public class Simulation implements ChangeSource, Cloneable {
|
|||||||
|
|
||||||
|
|
||||||
private class ConditionListener implements StateChangeListener {
|
private class ConditionListener implements StateChangeListener {
|
||||||
private boolean resetState = false;
|
|
||||||
private Status oldStatus = null;
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void stateChanged(EventObject e) {
|
public void stateChanged(EventObject e) {
|
||||||
if (resetState || getStatus() != oldStatus) {
|
|
||||||
oldStatus = getStatus();
|
|
||||||
fireChangeEvent();
|
fireChangeEvent();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void reset() {
|
|
||||||
resetState = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user