From 228e9905577422291bff68f2503ac16b4bb2298b Mon Sep 17 00:00:00 2001
From: hneemann <helmut.neemann@arcor.de>
Date: Fri, 31 Mar 2017 08:54:07 +0200
Subject: [PATCH] unified handling of runtime exceptions

---
 .../de/neemann/digital/draw/model/RealTimeClock.java   |  8 ++++----
 src/main/java/de/neemann/digital/gui/Main.java         | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/de/neemann/digital/draw/model/RealTimeClock.java b/src/main/java/de/neemann/digital/draw/model/RealTimeClock.java
index 5fb22c256..1ddc1b8c8 100644
--- a/src/main/java/de/neemann/digital/draw/model/RealTimeClock.java
+++ b/src/main/java/de/neemann/digital/draw/model/RealTimeClock.java
@@ -93,8 +93,8 @@ public class RealTimeClock implements ModelStateObserver {
                             output.setValue(1 - output.getValue());
                             model.doStep();
                         });
-                    } catch (NodeException e1) {
-                        stopper.showErrorAndStopModel(Lang.get("msg_clockError"), e1);
+                    } catch (NodeException | RuntimeException e) {
+                        stopper.showErrorAndStopModel(Lang.get("msg_clockError"), e);
                         timer.cancel(false);
                     }
                 }
@@ -128,8 +128,8 @@ public class RealTimeClock implements ModelStateObserver {
                         });
                         counter++;
                     }
-                } catch (Exception e1) {
-                    stopper.showErrorAndStopModel(Lang.get("msg_clockError"), e1);
+                } catch (NodeException | RuntimeException e) {
+                    stopper.showErrorAndStopModel(Lang.get("msg_clockError"), e);
                 }
                 time = System.currentTimeMillis() - time;
 
diff --git a/src/main/java/de/neemann/digital/gui/Main.java b/src/main/java/de/neemann/digital/gui/Main.java
index c2d558699..a33ac5856 100644
--- a/src/main/java/de/neemann/digital/gui/Main.java
+++ b/src/main/java/de/neemann/digital/gui/Main.java
@@ -676,7 +676,7 @@ public class Main extends JFrame implements ClosingWindowListener.ConfirmSave, E
             windowPosManager.register("testresult", new TestResultDialog(Main.this, tsl, circuitComponent.getCircuit(), library)).setVisible(true);
 
             stoppedState.enter();
-        } catch (Exception e1) {
+        } catch (NodeException | ElementNotFoundException | PinException | TestingDataException | RuntimeException e1) {
             showErrorAndStopModel(Lang.get("msg_runningTestError"), e1);
         }
     }
@@ -697,7 +697,7 @@ public class Main extends JFrame implements ClosingWindowListener.ConfirmSave, E
                     new TableDialog(Main.this, new ModelAnalyser(model).analyse(), shapeFactory, filename)
                             .setVisible(true);
                     stoppedState.enter();
-                } catch (PinException | NodeException | AnalyseException | ElementNotFoundException e1) {
+                } catch (PinException | NodeException | AnalyseException | ElementNotFoundException | RuntimeException e1) {
                     showErrorAndStopModel(Lang.get("msg_annalyseErr"), e1);
                 }
             }
@@ -741,8 +741,8 @@ public class Main extends JFrame implements ClosingWindowListener.ConfirmSave, E
                     .showDialog()) {
                 circuitComponent.getCircuit().setMeasurementOrdering(names);
             }
-        } catch (Exception e1) {
-            showErrorAndStopModel(Lang.get("msg_errorCreatingModel"), e1);
+        } catch (NodeException | PinException | ElementNotFoundException | RuntimeException e) {
+            showErrorAndStopModel(Lang.get("msg_errorCreatingModel"), e);
         }
     }
 
@@ -1122,7 +1122,7 @@ public class Main extends JFrame implements ClosingWindowListener.ConfirmSave, E
                             }
                             circuitComponent.hasChanged();
                             addressPicker.getProgRomAddr(model);
-                        } catch (NodeException e) {
+                        } catch (NodeException | RuntimeException e) {
                             showErrorAndStopModel(Lang.get("err_remoteExecution"), e);
                         }
                     }