From c8fb6026b41f4292197ed7525d6e54a78a88add0 Mon Sep 17 00:00:00 2001
From: hneemann <helmut.neemann@arcor.de>
Date: Fri, 1 Apr 2016 13:15:48 +0200
Subject: [PATCH] switched to Scheduled Executor because old timer is not
 working on Windows

---
 src/main/dig/processor/Processor.dig          | 116 +++++++++---------
 .../digital/draw/model/RealTimeClock.java     |  21 ++--
 .../java/de/neemann/digital/gui/Main.java     |   5 +-
 3 files changed, 73 insertions(+), 69 deletions(-)

diff --git a/src/main/dig/processor/Processor.dig b/src/main/dig/processor/Processor.dig
index 9eaa31b05..821b63e13 100644
--- a/src/main/dig/processor/Processor.dig
+++ b/src/main/dig/processor/Processor.dig
@@ -107,9 +107,7 @@
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <de.neemann.digital.core.element.Rotation>
-            <rotation>1</rotation>
-          </de.neemann.digital.core.element.Rotation>
+          <rotation rotation="1"/>
         </entry>
         <entry>
           <string>Bits</string>
@@ -228,9 +226,7 @@
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <de.neemann.digital.core.element.Rotation>
-            <rotation>1</rotation>
-          </de.neemann.digital.core.element.Rotation>
+          <rotation rotation="1"/>
         </entry>
         <entry>
           <string>Label</string>
@@ -238,7 +234,7 @@
         </entry>
         <entry>
           <string>Frequency</string>
-          <int>100</int>
+          <int>1000</int>
         </entry>
       </elementAttributes>
       <pos x="560" y="230"/>
@@ -277,166 +273,166 @@
     <visualElement>
       <elementName>GPO.dig</elementName>
       <elementAttributes/>
-      <pos x="700" y="130"/>
+      <pos x="690" y="130"/>
       <rotate>0</rotate>
     </visualElement>
     <visualElement>
       <elementName>LED</elementName>
       <elementAttributes/>
-      <pos x="760" y="50"/>
+      <pos x="750" y="50"/>
       <rotate>0</rotate>
     </visualElement>
     <visualElement>
       <elementName>LED</elementName>
       <elementAttributes/>
-      <pos x="760" y="70"/>
+      <pos x="750" y="70"/>
       <rotate>0</rotate>
     </visualElement>
     <visualElement>
       <elementName>LED</elementName>
       <elementAttributes/>
-      <pos x="760" y="90"/>
+      <pos x="750" y="90"/>
       <rotate>0</rotate>
     </visualElement>
     <visualElement>
       <elementName>LED</elementName>
       <elementAttributes/>
-      <pos x="760" y="110"/>
+      <pos x="750" y="110"/>
       <rotate>0</rotate>
     </visualElement>
     <visualElement>
       <elementName>LED</elementName>
       <elementAttributes/>
-      <pos x="760" y="130"/>
+      <pos x="750" y="130"/>
       <rotate>0</rotate>
     </visualElement>
     <visualElement>
       <elementName>LED</elementName>
       <elementAttributes/>
-      <pos x="760" y="150"/>
+      <pos x="750" y="150"/>
       <rotate>0</rotate>
     </visualElement>
     <visualElement>
       <elementName>LED</elementName>
       <elementAttributes/>
-      <pos x="760" y="170"/>
+      <pos x="750" y="170"/>
       <rotate>0</rotate>
     </visualElement>
     <visualElement>
       <elementName>LED</elementName>
       <elementAttributes/>
-      <pos x="760" y="190"/>
+      <pos x="750" y="190"/>
       <rotate>0</rotate>
     </visualElement>
     <visualElement>
       <elementName>LED</elementName>
       <elementAttributes/>
-      <pos x="760" y="210"/>
+      <pos x="750" y="210"/>
       <rotate>0</rotate>
     </visualElement>
     <visualElement>
       <elementName>LED</elementName>
       <elementAttributes/>
-      <pos x="760" y="230"/>
+      <pos x="750" y="230"/>
       <rotate>0</rotate>
     </visualElement>
     <visualElement>
       <elementName>LED</elementName>
       <elementAttributes/>
-      <pos x="760" y="250"/>
+      <pos x="750" y="250"/>
       <rotate>0</rotate>
     </visualElement>
     <visualElement>
       <elementName>LED</elementName>
       <elementAttributes/>
-      <pos x="760" y="270"/>
+      <pos x="750" y="270"/>
       <rotate>0</rotate>
     </visualElement>
     <visualElement>
       <elementName>LED</elementName>
       <elementAttributes/>
-      <pos x="760" y="290"/>
+      <pos x="750" y="290"/>
       <rotate>0</rotate>
     </visualElement>
     <visualElement>
       <elementName>LED</elementName>
       <elementAttributes/>
-      <pos x="760" y="310"/>
+      <pos x="750" y="310"/>
       <rotate>0</rotate>
     </visualElement>
     <visualElement>
       <elementName>LED</elementName>
       <elementAttributes/>
-      <pos x="760" y="330"/>
+      <pos x="750" y="330"/>
       <rotate>0</rotate>
     </visualElement>
     <visualElement>
       <elementName>LED</elementName>
       <elementAttributes/>
-      <pos x="760" y="350"/>
+      <pos x="750" y="350"/>
       <rotate>0</rotate>
     </visualElement>
   </visualElements>
   <wires>
     <wire>
-      <p1 x="760" y="50"/>
-      <p2 x="730" y="130"/>
+      <p1 x="750" y="50"/>
+      <p2 x="720" y="130"/>
     </wire>
     <wire>
-      <p1 x="730" y="140"/>
-      <p2 x="760" y="70"/>
+      <p1 x="720" y="140"/>
+      <p2 x="750" y="70"/>
     </wire>
     <wire>
-      <p1 x="730" y="150"/>
-      <p2 x="760" y="90"/>
+      <p1 x="720" y="150"/>
+      <p2 x="750" y="90"/>
     </wire>
     <wire>
-      <p1 x="760" y="110"/>
-      <p2 x="730" y="160"/>
+      <p1 x="750" y="110"/>
+      <p2 x="720" y="160"/>
     </wire>
     <wire>
-      <p1 x="730" y="170"/>
-      <p2 x="760" y="130"/>
+      <p1 x="720" y="170"/>
+      <p2 x="750" y="130"/>
     </wire>
     <wire>
-      <p1 x="730" y="180"/>
-      <p2 x="760" y="150"/>
+      <p1 x="720" y="180"/>
+      <p2 x="750" y="150"/>
     </wire>
     <wire>
-      <p1 x="730" y="190"/>
-      <p2 x="760" y="170"/>
+      <p1 x="720" y="190"/>
+      <p2 x="750" y="170"/>
     </wire>
     <wire>
-      <p1 x="730" y="200"/>
-      <p2 x="760" y="190"/>
+      <p1 x="720" y="200"/>
+      <p2 x="750" y="190"/>
     </wire>
     <wire>
-      <p1 x="760" y="210"/>
-      <p2 x="730" y="210"/>
+      <p1 x="750" y="210"/>
+      <p2 x="720" y="210"/>
     </wire>
     <wire>
-      <p1 x="730" y="220"/>
-      <p2 x="760" y="230"/>
+      <p1 x="720" y="220"/>
+      <p2 x="750" y="230"/>
     </wire>
     <wire>
-      <p1 x="730" y="230"/>
-      <p2 x="760" y="250"/>
+      <p1 x="720" y="230"/>
+      <p2 x="750" y="250"/>
     </wire>
     <wire>
-      <p1 x="730" y="240"/>
-      <p2 x="760" y="270"/>
+      <p1 x="720" y="240"/>
+      <p2 x="750" y="270"/>
     </wire>
     <wire>
-      <p1 x="730" y="260"/>
-      <p2 x="760" y="310"/>
+      <p1 x="720" y="260"/>
+      <p2 x="750" y="310"/>
     </wire>
     <wire>
-      <p1 x="730" y="270"/>
-      <p2 x="760" y="330"/>
+      <p1 x="720" y="270"/>
+      <p2 x="750" y="330"/>
     </wire>
     <wire>
-      <p1 x="730" y="280"/>
-      <p2 x="760" y="350"/>
+      <p1 x="720" y="280"/>
+      <p2 x="750" y="350"/>
     </wire>
     <wire>
       <p1 x="310" y="320"/>
@@ -459,8 +455,8 @@
       <p2 x="320" y="260"/>
     </wire>
     <wire>
-      <p1 x="730" y="250"/>
-      <p2 x="760" y="290"/>
+      <p1 x="720" y="250"/>
+      <p2 x="750" y="290"/>
     </wire>
     <wire>
       <p1 x="450" y="70"/>
@@ -532,7 +528,7 @@
     </wire>
     <wire>
       <p1 x="610" y="140"/>
-      <p2 x="700" y="140"/>
+      <p2 x="690" y="140"/>
     </wire>
     <wire>
       <p1 x="310" y="270"/>
@@ -592,7 +588,7 @@
     </wire>
     <wire>
       <p1 x="650" y="130"/>
-      <p2 x="700" y="130"/>
+      <p2 x="690" y="130"/>
     </wire>
     <wire>
       <p1 x="280" y="150"/>
@@ -664,7 +660,7 @@
     </wire>
     <wire>
       <p1 x="650" y="160"/>
-      <p2 x="700" y="160"/>
+      <p2 x="690" y="160"/>
     </wire>
     <wire>
       <p1 x="310" y="290"/>
@@ -716,7 +712,7 @@
     </wire>
     <wire>
       <p1 x="630" y="150"/>
-      <p2 x="700" y="150"/>
+      <p2 x="690" y="150"/>
     </wire>
     <wire>
       <p1 x="310" y="300"/>
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 7fe575ac7..8e0368405 100644
--- a/src/main/java/de/neemann/digital/draw/model/RealTimeClock.java
+++ b/src/main/java/de/neemann/digital/draw/model/RealTimeClock.java
@@ -6,19 +6,23 @@ import de.neemann.digital.gui.GuiModelObserver;
 import de.neemann.gui.ErrorMessage;
 
 import javax.swing.*;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @author hneemann
  */
 public class RealTimeClock implements ModelStateObserver {
-
     private final Model model;
+    private final ScheduledThreadPoolExecutor executor;
     private final int frequency;
     private final ObservableValue output;
-    private Timer timer;
+    private ScheduledFuture<?> timer;
 
-    public RealTimeClock(Model model, Clock clock) {
+    public RealTimeClock(Model model, Clock clock, ScheduledThreadPoolExecutor executor) {
         this.model = model;
+        this.executor = executor;
         int f = clock.getFrequency();
         if (f < 1) f = 1;
         this.frequency = f;
@@ -34,20 +38,21 @@ public class RealTimeClock implements ModelStateObserver {
 
                 int delay = 1000 / frequency;
                 if (delay < 1) delay = 1;
-                timer = new Timer(delay, e -> {
+
+                timer = executor.scheduleAtFixedRate(() -> SwingUtilities.invokeLater(() -> {
                     output.setValue(1 - output.getValue());
                     try {
                         model.doStep();
                     } catch (NodeException e1) {
                         SwingUtilities.invokeLater(new ErrorMessage("ClockError").addCause(e1));
-                        timer.stop();
+                        timer.cancel(false);
                     }
-                });
-                timer.start();
+                }), delay, delay, TimeUnit.MILLISECONDS);
+
                 break;
             case STOPPED:
                 if (timer != null)
-                    timer.stop();
+                    timer.cancel(false);
                 break;
         }
     }
diff --git a/src/main/java/de/neemann/digital/gui/Main.java b/src/main/java/de/neemann/digital/gui/Main.java
index 36e890b7a..d01b64f0a 100644
--- a/src/main/java/de/neemann/digital/gui/Main.java
+++ b/src/main/java/de/neemann/digital/gui/Main.java
@@ -24,6 +24,7 @@ import java.awt.event.WindowEvent;
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.prefs.Preferences;
 
 /**
@@ -58,6 +59,7 @@ public class Main extends JFrame implements ClosingWindowListener.ConfirmSave {
     private Model model;
     private ModelDescription modelDescription;
     private boolean modelHasRunningClocks;
+    private ScheduledThreadPoolExecutor timerExecuter = new ScheduledThreadPoolExecutor(1);
 
     private Main() {
         this(null, null, null);
@@ -95,6 +97,7 @@ public class Main extends JFrame implements ClosingWindowListener.ConfirmSave {
             @Override
             public void windowClosed(WindowEvent e) {
                 clearModelDescription(); // stop model timer if running
+                timerExecuter.shutdown();
             }
         });
 
@@ -372,7 +375,7 @@ public class Main extends JFrame implements ClosingWindowListener.ConfirmSave {
 
             if (runClock)
                 for (Clock c : model.getClocks())
-                    model.addObserver(new RealTimeClock(model, c));
+                    model.addObserver(new RealTimeClock(model, c, timerExecuter));
 
             model.init();