Merge pull request #8 from Eric-Butcher/make_playing

Added the Play and Pause functionality.

Author: Eric-Butcher

.idea/workspace.xml

@@ -3,23 +3,56 @@
 import model.Model;
 import view.View;
 
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 public class Controller {
 
     private final Model model;
     private final View view;
+    private final ActionListener autoIterateFromPlayer = new ActionListener() {
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            model.step();
+            view.updateView(model.updateView());
+        }
+    };
+
+    private final int delayInMilliseconds = 100;
+    private final Timer timer = new Timer(delayInMilliseconds, autoIterateFromPlayer);
 
     public Controller(Model model, View view) {
         this.model = model;
         this.view = view;
 
-        this.view.getMenuPanel().getGenerateMazeButton().addActionListener(new GenerateAction(this.model, this.view));
+        this.view.getMenuPanel().getGenerateMazeButton().addActionListener(new GenerateAction(this.model, this.view, this));
         this.view.getMenuPanel().getMazeGeneratorComboBox().addActionListener(new GenerateSelectAction(this.model, this.view));
 
-        this.view.getMenuPanel().getSolveMazeButton().addActionListener(new SolveAction(this.model, this.view));
+        this.view.getMenuPanel().getSolveMazeButton().addActionListener(new SolveAction(this.model, this.view, this));
         this.view.getMenuPanel().getMazeSolverComboBox().addActionListener(new SolverSelectAction(this.model, this.view));
 
-        this.view.getMenuPanel().getFinishButton().addActionListener(new FinishAction(this.model, this.view));
-        this.view.getMenuPanel().getStepButton().addActionListener(new StepAction(this.model, this.view));
+        this.view.getMenuPanel().getFinishButton().addActionListener(new FinishAction(this.model, this.view, this));
+        this.view.getMenuPanel().getStepButton().addActionListener(new StepAction(this.model, this.view, this));
+
+        this.view.getMenuPanel().getPlayPauseButton().addActionListener(new PlayPauseAction(this.model, this.view, this));
+
+    }
+
+    public Timer getTimer() {
+        return timer;
+    }
+
+    public void playPause() {
+        if (this.timer.isRunning()) {
+            this.timer.stop();
+        } else {
+            this.timer.restart();
+        }
+    }
+
+    public void stopPlaying() {
+        this.timer.stop();
     }
 
 }

src/controller/Controller.java

@@ -11,13 +11,17 @@ public class FinishAction implements ActionListener {
     private final Model model;
     private final View view;
 
-    public FinishAction(Model model, View view) {
+    private final Controller controller;
+
+    public FinishAction(Model model, View view, Controller controller) {
         this.model = model;
         this.view = view;
+        this.controller = controller;
     }
 
     @Override
     public void actionPerformed(ActionEvent e) {
+        this.controller.stopPlaying();
         this.model.finish();
         this.view.updateView(this.model.updateView());
     }

src/controller/FinishAction.java

@@ -11,13 +11,17 @@ public class GenerateAction implements ActionListener {
     private final Model model;
     private final View view;
 
-    public GenerateAction(Model model, View view) {
+    private final Controller controller;
+
+    public GenerateAction(Model model, View view, Controller controller) {
         this.model = model;
         this.view = view;
+        this.controller = controller;
     }
 
     @Override
     public void actionPerformed(ActionEvent e) {
+        this.controller.stopPlaying();
         this.model.generate();
         this.view.updateView(this.model.updateView());
     }

src/controller/GenerateAction.java

@@ -0,0 +1,24 @@
+package controller;
+
+import model.Model;
+import view.View;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+public class PlayPauseAction implements ActionListener {
+    private final Model model;
+    private final View view;
+    private final Controller controller;
+
+    public PlayPauseAction(Model model, View view, Controller controller) {
+        this.model = model;
+        this.view = view;
+        this.controller = controller;
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        this.controller.playPause();
+    }
+}

src/controller/PlayPauseAction.java

@@ -11,13 +11,17 @@ public class SolveAction implements ActionListener {
     private final Model model;
     private final View view;
 
-    public SolveAction(Model model, View view) {
+    private final Controller controller;
+
+    public SolveAction(Model model, View view, Controller controller) {
         this.model = model;
         this.view = view;
+        this.controller = controller;
     }
 
     @Override
     public void actionPerformed(ActionEvent e) {
+        this.controller.stopPlaying();
         this.model.solve();
         this.view.updateView(this.model.updateView());
     }

src/controller/SolveAction.java

@@ -11,13 +11,17 @@ public class StepAction implements ActionListener {
     private final Model model;
     private final View view;
 
-    public StepAction(Model model, View view) {
+    private final Controller controller;
+
+    public StepAction(Model model, View view, Controller controller) {
         this.model = model;
         this.view = view;
+        this.controller = controller;
     }
 
     @Override
     public void actionPerformed(ActionEvent e) {
+        this.controller.stopPlaying();
         this.model.step();
         this.view.updateView(this.model.updateView());
     }

src/controller/StepAction.java

@@ -1,8 +1,8 @@
 package controller;
 
-import java.util.LinkedList;
+import java.util.ArrayList;
 
-public record ViewUpdatePacket(LinkedList<TileUpdate> tileUpdates) {
+public record ViewUpdatePacket(ArrayList<TileUpdate> tileUpdates) {
 
     public void addTileUpdate(TileUpdate tileUpdate) {
         tileUpdates.add(tileUpdate);

src/controller/ViewUpdatePacket.java

@@ -6,7 +6,6 @@
 import utilities.Constants;
 
 import java.util.ArrayList;
-import java.util.LinkedList;
 
 public class AldousBroderGenerator extends Generator {
 
@@ -28,7 +27,7 @@ public void setCurrentCell(Cell currentCell) {
 
     @Override
     public ViewUpdatePacket makeViewUpdatePacket() {
-        ViewUpdatePacket updatePacket = new ViewUpdatePacket(new LinkedList<>());
+        ViewUpdatePacket updatePacket = new ViewUpdatePacket(new ArrayList<>(300));
 
         for (int x = Constants.minCellIndex; x <= Constants.maxCellIndex; x++) {
             for (int y = Constants.minCellIndex; y <= Constants.maxCellIndex; y++) {