Merge pull request #125 from stefanhaustein/master

DeferredDelay -> Delay

Author: stefanhaustein

src/main/java/com/pi4j/examples/games/MiniGame.java

@@ -5,7 +5,7 @@
 import com.pi4j.drivers.display.graphics.GraphicsDisplay;
 import com.pi4j.drivers.input.GameController;
 import com.pi4j.drivers.sound.SoundDriver;
-import com.pi4j.util.DeferredDelay;
+import com.pi4j.util.Delay;
 
 import java.util.concurrent.locks.LockSupport;
 
@@ -18,7 +18,7 @@ public abstract class MiniGame {
     protected final SoundDriver soundDriver;
     protected final String gameName;
     protected final Graphics graphics;
-    protected final DeferredDelay delay = new DeferredDelay();
+    protected final Delay delay = new Delay();
     protected int backgroundColor;
     protected int borderColor;
 
@@ -195,7 +195,7 @@ protected void titleScreenStep() {
 
     public void run() {
         while (!exit) {
-            delay.setDelayMillis(17);
+            delay.setMillis(17);
             if (running) {
                 running = step();
                 if (!running) {
@@ -205,7 +205,7 @@ public void run() {
                 titleScreenStep();
             }
             display.flush();
-            delay.materializeDelay();
+            delay.materialize();
         }
     }
 

src/main/java/com/pi4j/examples/games/bricks/Bricks.java

@@ -3,7 +3,7 @@
 import com.pi4j.drivers.display.graphics.GraphicsDisplay;
 import com.pi4j.drivers.input.GameController;
 import com.pi4j.io.ListenableOnOffRead;
-import com.pi4j.util.DeferredDelay;
+import com.pi4j.util.Delay;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -19,7 +19,7 @@ public class Bricks {
 
     private final GraphicsDisplay display;
     private final GameController controller;
-    private final DeferredDelay delay = new DeferredDelay();
+    private final Delay delay = new Delay();
     private final Map<ListenableOnOffRead<?>, Consumer<Boolean>> keys = new HashMap<>();
 
     private final int scale;
@@ -173,7 +173,7 @@ private void renderBall(boolean on) {
 
     public void run() {
         while (!exit) {
-            delay.setDelayMillis(stepTime);
+            delay.setMillis(stepTime);
             renderPaddle(false);
             paddleX = Math.max(0, Math.min(paddleX + paddleDx, FIELD_SIZE - PADDLE_WIDTH));
             renderPaddle(true);
@@ -182,7 +182,7 @@ public void run() {
             moveBall();
             renderBall(true);
 
-            delay.materializeDelay();
+            delay.materialize();
         }
         releaseKeys();
     }

src/main/java/com/pi4j/examples/games/snake/Snake.java

@@ -3,7 +3,7 @@
 import com.pi4j.drivers.display.graphics.GraphicsDisplay;
 import com.pi4j.drivers.input.GameController;
 import com.pi4j.io.ListenableOnOffRead;
-import com.pi4j.util.DeferredDelay;
+import com.pi4j.util.Delay;
 
 import java.util.*;
 import java.util.function.Consumer;
@@ -24,7 +24,7 @@ public class Snake {
 
     private final GraphicsDisplay display;
     private final GameController controller;
-    private final DeferredDelay deferredDelay = new DeferredDelay();
+    private final Delay delay = new Delay();
     private final int x0;
     private final int y0;
     private final int scale;
@@ -102,7 +102,7 @@ private void renderColor(int x, int y, int color) {
     public void run() {
         initialize();
         while (!exit) {
-            deferredDelay.setDelayMillis(stepTimeMillis);
+            delay.setMillis(stepTimeMillis);
             GameController.Direction direction = controller.getDirection();
             if (!armed) {
                 armed = direction == GameController.Direction.NONE;
@@ -115,7 +115,7 @@ public void run() {
                 }
             }
             step();
-            deferredDelay.materializeDelay();
+            delay.materialize();
         }
         display.fillRect(0, 0, display.getWidth(), display.getHeight(), 0xff000000);
         for (Map.Entry<ListenableOnOffRead<?>, Consumer<Boolean>> entry : keys.entrySet()) {