From c83442761ca6502cedc28feb671705fdf4c0a768 Mon Sep 17 00:00:00 2001
From: Connor Taylor-Brown <cbt24@uclive.ac.nz>
Date: Thu, 3 Aug 2017 17:54:03 +1200
Subject: [PATCH] Implemented Factory for Command objects and fixed Command
 Pattern implementation. - Commands now have standard 0-parameter execute
 method - Commands are created by CommandFactory

#story[1094]
---
 .../mock/model/commandFactory/Command.java    | 14 +++++++++++++
 .../model/commandFactory/CommandFactory.java  | 21 ++++++++++++++++---
 .../model/commandFactory/TackGybeCommand.java | 13 ++++++++----
 .../mock/model/commandFactory/VMGCommand.java | 13 ++++++++----
 4 files changed, 50 insertions(+), 11 deletions(-)
 create mode 100644 racevisionGame/src/main/java/mock/model/commandFactory/Command.java

diff --git a/racevisionGame/src/main/java/mock/model/commandFactory/Command.java b/racevisionGame/src/main/java/mock/model/commandFactory/Command.java
new file mode 100644
index 00000000..e0486114
--- /dev/null
+++ b/racevisionGame/src/main/java/mock/model/commandFactory/Command.java
@@ -0,0 +1,14 @@
+package mock.model.commandFactory;
+
+import mock.model.MockBoat;
+import mock.model.MockRace;
+
+/**
+ * Allows RaceLogic to control MockRace state according to the Command pattern
+ */
+public interface Command {
+    /**
+     * Execute command - standard method name in pattern
+     */
+    void execute();
+}
diff --git a/racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java b/racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java
index ace2f3be..17834963 100644
--- a/racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java
+++ b/racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java
@@ -3,7 +3,22 @@ package mock.model.commandFactory;
 import mock.model.MockBoat;
 import mock.model.MockRace;
 
-public interface CommandFactory {
-
-    void runCommand(MockBoat boat, MockRace race);
+/**
+ * Factory class for Command objects
+ */
+public class CommandFactory {
+    /**
+     * Generates a command on a race and boat corresponding to the protocol action number.
+     * @param race to receive command
+     * @param boat to receive command in race
+     * @param action number to select command
+     * @return
+     */
+    public static Command createCommand(MockRace race, MockBoat boat, int action) {
+        switch(action) {
+            case 1: return new VMGCommand(race, boat);
+            case 4: return new TackGybeCommand(race, boat);
+            default: return null; // TODO - please please have discussion over what to default to
+        }
+    }
 }
diff --git a/racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java b/racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java
index ef776536..150a1da8 100644
--- a/racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java
+++ b/racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java
@@ -2,17 +2,22 @@ package mock.model.commandFactory;
 
 import mock.model.MockBoat;
 import mock.model.MockRace;
-import mock.model.VMG;
-import shared.model.Bearing;
 
 /**
  * Created by David on 2/08/2017.
  */
-public class TackGybeCommand implements CommandFactory {
+public class TackGybeCommand implements Command {
+    private MockRace race;
+    private MockBoat boat;
+
+    public TackGybeCommand(MockRace race, MockBoat boat) {
+        this.race = race;
+        this.boat = boat;
+    }
 
     //The refactoring of MockRace will require changes to be made
     @Override
-    public void runCommand(MockBoat boat, MockRace race) {
+    public void execute() {
         /*VMG newVMG = boat.getPolars().calculateVMG(
                 race.getWindDirection(),
                 race.getWindSpeed(),
diff --git a/racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java b/racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java
index 5d11a27b..64cc6a9f 100644
--- a/racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java
+++ b/racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java
@@ -2,17 +2,22 @@ package mock.model.commandFactory;
 
 import mock.model.MockBoat;
 import mock.model.MockRace;
-import mock.model.VMG;
-import shared.model.Bearing;
 
 /**
  * Created by David on 2/08/2017.
  */
-public class VMGCommand implements CommandFactory {
+public class VMGCommand implements Command {
+    private MockRace race;
+    private MockBoat boat;
+
+    public VMGCommand(MockRace race, MockBoat boat) {
+        this.race = race;
+        this.boat = boat;
+    }
 
     //The refactoring of MockRace will require changes to be made
     @Override
-    public void runCommand(MockBoat boat, MockRace race) {
+    public void execute() {
         /*VMG newVMG = boat.getPolars().calculateVMG(
                 race.getWindDirection(),
                 race.getWindSpeed(),