TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-13 06:49:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixes a null pointer exception

Browse Source
This commit is contained in:
hneemann 2020-11-09 18:30:44 +01:00
parent 2f2d45a48d
commit 6aff054465
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/de/neemann/digital/gui/Main.java
View File

@ -1413,7 +1413,7 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
if (updateEvent == ModelEventType.MICROSTEP) { if (updateEvent == ModelEventType.MICROSTEP) {
checkMicroStepActions(model); checkMicroStepActions(model);
model.addObserver(new MicroStepObserver(model)); model.addObserver(new MicroStepObserver(model, modelCreator));
} else if (updateEvent == ModelEventType.STEP) { } else if (updateEvent == ModelEventType.STEP) {
if (maxFrequency <= 50) if (maxFrequency <= 50)
model.addObserver(new FullStepObserver(model)); model.addObserver(new FullStepObserver(model));
@ -1667,10 +1667,10 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
/** /**
* Updates the graphic at every 100ms * Updates the graphic at every 100ms
*/ */
private class FastObserver implements ModelStateObserverTyped { private final class FastObserver implements ModelStateObserverTyped {
private final Timer timer; private final Timer timer;
FastObserver() { private FastObserver() {
timer = new Timer(100, actionEvent -> circuitComponent.graphicHasChanged()); timer = new Timer(100, actionEvent -> circuitComponent.graphicHasChanged());
} }
@ -1697,11 +1697,13 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
/** /**
* Updates the graphic at every micro step * Updates the graphic at every micro step
*/ */
private class MicroStepObserver implements ModelStateObserverTyped { private final class MicroStepObserver implements ModelStateObserverTyped {
private final Model model; private final Model model;
private final ModelCreator modelCreator;
MicroStepObserver(Model model) { private MicroStepObserver(Model model, ModelCreator modelCreator) {
this.model = model; this.model = model;
this.modelCreator = modelCreator;
} }
@Override @Override