Update data object models; refactor packages

RaiderRobotix · Feb 3, 2019 · 3bbe719 · 3bbe719
1 parent 7fb4cd7
commit 3bbe719
Show file tree

Hide file tree

Showing 17 changed files with 118 additions and 75 deletions.
diff --git a/src/main/java/org/usfirst/frc/team25/scouting/client/ui/Controller.java b/src/main/java/org/usfirst/frc/team25/scouting/client/ui/Controller.java
@@ -4,10 +4,10 @@
 import javafx.scene.control.*;
 import javafx.scene.text.Text;
 import javafx.stage.DirectoryChooser;
-import org.usfirst.frc.team25.scouting.client.data.BlueAlliance;
-import org.usfirst.frc.team25.scouting.client.data.EventReport;
-import org.usfirst.frc.team25.scouting.client.data.FileManager;
-import org.usfirst.frc.team25.scouting.client.models.ScoutEntry;
+import org.usfirst.frc.team25.scouting.data.BlueAlliance;
+import org.usfirst.frc.team25.scouting.data.EventReport;
+import org.usfirst.frc.team25.scouting.data.FileManager;
+import org.usfirst.frc.team25.scouting.data.models.ScoutEntry;
 
 import java.io.File;
 import java.util.ArrayList;

diff --git a/src/main/java/org/usfirst/frc/team25/scouting/client/ui/Main.java b/src/main/java/org/usfirst/frc/team25/scouting/client/ui/Main.java
@@ -6,7 +6,7 @@
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
-import org.usfirst.frc.team25.scouting.client.data.BlueAlliance;
+import org.usfirst.frc.team25.scouting.data.BlueAlliance;
 
 public class Main extends Application {
 

diff --git a/...team25/scouting/client/data/Alliance.java → ...st/frc/team25/scouting/data/Alliance.java b/...team25/scouting/client/data/Alliance.java → ...st/frc/team25/scouting/data/Alliance.java
@@ -1,4 +1,4 @@
-package org.usfirst.frc.team25.scouting.client.data;
+package org.usfirst.frc.team25.scouting.data;
 
 /**
  * Class for alliance-based calculations and stats

diff --git a/...25/scouting/client/data/BlueAlliance.java → ...rc/team25/scouting/data/BlueAlliance.java b/...25/scouting/client/data/BlueAlliance.java → ...rc/team25/scouting/data/BlueAlliance.java
@@ -1,4 +1,4 @@
-package org.usfirst.frc.team25.scouting.client.data;
+package org.usfirst.frc.team25.scouting.data;
 
 import com.google.gson.Gson;
 import com.thebluealliance.api.v3.TBA;

diff --git a/...m25/scouting/client/data/EventReport.java → ...frc/team25/scouting/data/EventReport.java b/...m25/scouting/client/data/EventReport.java → ...frc/team25/scouting/data/EventReport.java
@@ -1,10 +1,10 @@
-package org.usfirst.frc.team25.scouting.client.data;
+package org.usfirst.frc.team25.scouting.data;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.thebluealliance.api.v3.models.Match;
 import com.thebluealliance.api.v3.models.MatchScoreBreakdown2018Alliance;
-import org.usfirst.frc.team25.scouting.client.models.*;
+import org.usfirst.frc.team25.scouting.data.models.*;
 
 import java.io.File;
 import java.io.FileNotFoundException;

diff --git a/...m25/scouting/client/data/FileManager.java → ...frc/team25/scouting/data/FileManager.java b/...m25/scouting/client/data/FileManager.java → ...frc/team25/scouting/data/FileManager.java
@@ -1,9 +1,9 @@
-package org.usfirst.frc.team25.scouting.client.data;
+package org.usfirst.frc.team25.scouting.data;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.thebluealliance.api.v3.models.Match;
-import org.usfirst.frc.team25.scouting.client.models.ScoutEntry;
+import org.usfirst.frc.team25.scouting.data.models.ScoutEntry;
 
 import java.io.File;
 import java.io.FileNotFoundException;

diff --git a/...outing/client/data/PicklistGenerator.java → ...am25/scouting/data/PicklistGenerator.java b/...outing/client/data/PicklistGenerator.java → ...am25/scouting/data/PicklistGenerator.java
@@ -1,8 +1,8 @@
-package org.usfirst.frc.team25.scouting.client.data;
+package org.usfirst.frc.team25.scouting.data;
 
-import org.usfirst.frc.team25.scouting.client.models.Comparison;
-import org.usfirst.frc.team25.scouting.client.models.RankingTree;
-import org.usfirst.frc.team25.scouting.client.models.ScoutEntry;
+import org.usfirst.frc.team25.scouting.data.models.Comparison;
+import org.usfirst.frc.team25.scouting.data.models.RankingTree;
+import org.usfirst.frc.team25.scouting.data.models.ScoutEntry;
 
 import java.io.File;
 import java.util.ArrayList;

diff --git a/.../team25/scouting/client/data/Sorters.java → ...rst/frc/team25/scouting/data/Sorters.java b/.../team25/scouting/client/data/Sorters.java → ...rst/frc/team25/scouting/data/Sorters.java
@@ -1,4 +1,4 @@
-package org.usfirst.frc.team25.scouting.client.data;
+package org.usfirst.frc.team25.scouting.data;
 
 import com.thebluealliance.api.v3.models.Match;
 import com.thebluealliance.api.v3.models.SimpleMatch;

diff --git a/...am25/scouting/client/data/Statistics.java → .../frc/team25/scouting/data/Statistics.java b/...am25/scouting/client/data/Statistics.java → .../frc/team25/scouting/data/Statistics.java
@@ -1,4 +1,4 @@
-package org.usfirst.frc.team25.scouting.client.data;
+package org.usfirst.frc.team25.scouting.data;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;

diff --git a/...am25/scouting/client/data/TeamReport.java → .../frc/team25/scouting/data/TeamReport.java b/...am25/scouting/client/data/TeamReport.java → .../frc/team25/scouting/data/TeamReport.java
@@ -1,6 +1,6 @@
-package org.usfirst.frc.team25.scouting.client.data;
+package org.usfirst.frc.team25.scouting.data;
 
-import org.usfirst.frc.team25.scouting.client.models.ScoutEntry;
+import org.usfirst.frc.team25.scouting.data.models.ScoutEntry;
 
 import java.io.File;
 import java.util.ArrayList;

diff --git a/...25/scouting/client/models/Autonomous.java → ...am25/scouting/data/models/Autonomous.java b/...25/scouting/client/models/Autonomous.java → ...am25/scouting/data/models/Autonomous.java
@@ -1,4 +1,5 @@
-package org.usfirst.frc.team25.scouting.client.models;
+package org.usfirst.frc.team25.scouting.data.models;
+
 
 /**
  * Object model for autonomous period of a match
@@ -15,11 +16,17 @@ public class Autonomous {
     private boolean opponentCargoShipLineFoul;
     private boolean sideCargoShipHatchCapable;
     private boolean frontCargoShipHatchCapable;
+    private boolean cargoDroppedCargoShip;
+    private boolean cargoDroppedRocket;
+    private boolean hatchesDroppedRocket;
+    private boolean hatchesDroppedCargoShip;
 
     public Autonomous(int rocketCargo, int rocketHatches, int cargoShipHatches,
                       int cargoShipCargo, int hatchesDropped, int cargoDropped,
                       boolean reachHabLine, boolean opponentCargoShipLineFoul,
-                      boolean sideCargoShipHatchCapable, boolean frontCargoShipHatchCapable) {
+                      boolean sideCargoShipHatchCapable, boolean frontCargoShipHatchCapable,
+                      boolean cargoDroppedCargoShip, boolean cargoDroppedRocket,
+                      boolean hatchesDroppedRocket, boolean hatchesDroppedCargoShip) {
         this.rocketCargo = rocketCargo;
         this.rocketHatches = rocketHatches;
         this.cargoShipHatches = cargoShipHatches;
@@ -30,6 +37,22 @@ public Autonomous(int rocketCargo, int rocketHatches, int cargoShipHatches,
         this.opponentCargoShipLineFoul = opponentCargoShipLineFoul;
         this.sideCargoShipHatchCapable = sideCargoShipHatchCapable;
         this.frontCargoShipHatchCapable = frontCargoShipHatchCapable;
+        this.cargoDroppedCargoShip = cargoDroppedCargoShip;
+        this.cargoDroppedRocket = cargoDroppedRocket;
+        this.hatchesDroppedRocket = hatchesDroppedRocket;
+        this.hatchesDroppedCargoShip = hatchesDroppedCargoShip;
+    }
+
+    public void setRocketCargo(int rocketCargo) {
+        this.rocketCargo = rocketCargo;
+    }
+
+    public void setRocketHatches(int rocketHatches) {
+        this.rocketHatches = rocketHatches;
+    }
+
+    public void setCargoShipHatches(int cargoShipHatches) {
+        this.cargoShipHatches = cargoShipHatches;
     }
 
     public void setHatchesDropped(int hatchesDropped) {
@@ -48,40 +71,44 @@ public void setOpponentCargoShipLineFoul(boolean opponentCargoShipLineFoul) {
         this.opponentCargoShipLineFoul = opponentCargoShipLineFoul;
     }
 
-    public int getRocketCargo() {
-        return rocketCargo;
+    public void setCargoShipCargo(int cargoShipCargo) {
+        this.cargoShipCargo = cargoShipCargo;
     }
 
-    public void setRocketCargo(int rocketCargo) {
-        this.rocketCargo = rocketCargo;
+    public void setFrontCargoShipHatchCapable(boolean frontCargoShipHatchCapable) {
+        this.frontCargoShipHatchCapable = frontCargoShipHatchCapable;
     }
 
-    public int getRocketHatches() {
-        return rocketHatches;
+    public boolean isSideCargoShipHatchCapable() {
+        return sideCargoShipHatchCapable;
     }
 
-    public void setRocketHatches(int rocketHatches) {
-        this.rocketHatches = rocketHatches;
+    public void setSideCargoShipHatchCapable(boolean sideCargoShipHatchCapable) {
+        this.sideCargoShipHatchCapable = sideCargoShipHatchCapable;
     }
 
-    public int getCargoShipHatches() {
-        return cargoShipHatches;
+    public boolean isCargoDroppedCargoShip() {
+        return cargoDroppedCargoShip;
     }
 
-    public void setCargoShipHatches(int cargoShipHatches) {
-        this.cargoShipHatches = cargoShipHatches;
+    public void setCargoDroppedCargoShip(boolean cargoDroppedCargoShip) {
+        this.cargoDroppedCargoShip = cargoDroppedCargoShip;
     }
 
-    public int getCargoShipCargo() {
-        return cargoShipCargo;
+    public int getRocketCargo() {
+        return rocketCargo;
     }
 
-    public void setCargoShipCargo(int cargoShipCargo) {
-        this.cargoShipCargo = cargoShipCargo;
+    public int getRocketHatches() {
+        return rocketHatches;
     }
 
-    public boolean isSideCargoShipHatchCapable() {
-        return sideCargoShipHatchCapable;
+    public int getCargoShipHatches() {
+        return cargoShipHatches;
+    }
+
+    public int getCargoShipCargo() {
+        return cargoShipCargo;
     }
 
     public int getHatchesDropped() {
@@ -100,15 +127,31 @@ public boolean isOpponentCargoShipLineFoul() {
         return opponentCargoShipLineFoul;
     }
 
-    public void setSideCargoShipHatchCapable(boolean sideCargoShipHatchCapable) {
-        this.sideCargoShipHatchCapable = sideCargoShipHatchCapable;
+    public boolean isCargoDroppedRocket() {
+        return cargoDroppedRocket;
     }
 
     public boolean isFrontCargoShipHatchCapable() {
         return frontCargoShipHatchCapable;
     }
 
-    public void setFrontCargoShipHatchCapable(boolean frontCargoShipHatchCapable) {
-        this.frontCargoShipHatchCapable = frontCargoShipHatchCapable;
+    public void setCargoDroppedRocket(boolean cargoDroppedRocket) {
+        this.cargoDroppedRocket = cargoDroppedRocket;
+    }
+
+    public boolean isHatchesDroppedRocket() {
+        return hatchesDroppedRocket;
+    }
+
+    public void setHatchesDroppedRocket(boolean hatchesDroppedRocket) {
+        this.hatchesDroppedRocket = hatchesDroppedRocket;
+    }
+
+    public boolean isHatchesDroppedCargoShip() {
+        return hatchesDroppedCargoShip;
+    }
+
+    public void setHatchesDroppedCargoShip(boolean hatchesDroppedCargoShip) {
+        this.hatchesDroppedCargoShip = hatchesDroppedCargoShip;
     }
-}
+}
diff --git a/...25/scouting/client/models/Comparison.java → ...am25/scouting/data/models/Comparison.java b/...25/scouting/client/models/Comparison.java → ...am25/scouting/data/models/Comparison.java
@@ -1,4 +1,4 @@
-package org.usfirst.frc.team25.scouting.client.models;
+package org.usfirst.frc.team25.scouting.data.models;
 
 /**
  * Class that holds a comparison between two teams

diff --git a/...m25/scouting/client/models/PostMatch.java → ...eam25/scouting/data/models/PostMatch.java b/...m25/scouting/client/models/PostMatch.java → ...eam25/scouting/data/models/PostMatch.java
@@ -1,4 +1,4 @@
-package org.usfirst.frc.team25.scouting.client.models;
+package org.usfirst.frc.team25.scouting.data.models;
 
 import java.util.HashMap;
 

diff --git a/...am25/scouting/client/models/PreMatch.java → ...team25/scouting/data/models/PreMatch.java b/...am25/scouting/client/models/PreMatch.java → ...team25/scouting/data/models/PreMatch.java
@@ -1,4 +1,4 @@
-package org.usfirst.frc.team25.scouting.client.models;
+package org.usfirst.frc.team25.scouting.data.models;
 
 
 /**

diff --git a/...5/scouting/client/models/RankingTree.java → ...m25/scouting/data/models/RankingTree.java b/...5/scouting/client/models/RankingTree.java → ...m25/scouting/data/models/RankingTree.java
@@ -1,6 +1,6 @@
-package org.usfirst.frc.team25.scouting.client.models;
+package org.usfirst.frc.team25.scouting.data.models;
 
-import org.usfirst.frc.team25.scouting.client.data.Sorters;
+import org.usfirst.frc.team25.scouting.data.Sorters;
 
 import java.util.ArrayList;
 import java.util.HashMap;

diff --git a/...25/scouting/client/models/ScoutEntry.java → ...am25/scouting/data/models/ScoutEntry.java b/...25/scouting/client/models/ScoutEntry.java → ...am25/scouting/data/models/ScoutEntry.java
@@ -1,4 +1,4 @@
-package org.usfirst.frc.team25.scouting.client.models;
+package org.usfirst.frc.team25.scouting.data.models;
 
 
 import java.io.Serializable;

diff --git a/...team25/scouting/client/models/TeleOp.java → ...c/team25/scouting/data/models/TeleOp.java b/...team25/scouting/client/models/TeleOp.java → ...c/team25/scouting/data/models/TeleOp.java
@@ -1,4 +1,4 @@
-package org.usfirst.frc.team25.scouting.client.models;
+package org.usfirst.frc.team25.scouting.data.models;
 
 
 /**
@@ -7,32 +7,32 @@
  */
 public class TeleOp {
 
-    private final int cargoShipHatches;
-    private final int cargoShipCargo;
-    private final int rocketLevelOneCargo;
-    private final int rocketLevelOneHatches;
-    private final int rocketLevelTwoCargo;
-    private final int rocketLevelTwoHatches;
-    private final int rocketLevelThreeCargo;
-    private final int rocketLevelThreeHatches;
-    private final int hatchesDropped;
-    private final int cargoDropped;
-
-    private final boolean climbAssistedByPartners;
-    private final int attemptHabClimbLevel;
-    private final int successHabClimbLevel;
-    private final boolean attemptHabClimb;
-    private final boolean successHabClimb;
-    private final int assistingClimbTeamNumber;
-    private final int otherRobotClimbsAssisted;
-    private final int highestClimbAssisted;
+    private int cargoShipHatches;
+    private int cargoShipCargo;
+    private int rocketLevelOneCargo;
+    private int rocketLevelOneHatches;
+    private int rocketLevelTwoCargo;
+    private int rocketLevelTwoHatches;
+    private int rocketLevelThreeCargo;
+    private int rocketLevelThreeHatches;
+    private int hatchesDropped;
+    private int cargoDropped;
+
+    private boolean climbAssistedByPartners;
+    private int attemptHabClimbLevel;
+    private int successHabClimbLevel;
+    private boolean attemptHabClimb;
+    private boolean successHabClimb;
+    private int assistingClimbTeamNumber;
+    private int numberOfPartnerClimbsAssisted;
+    private int highestClimbAssisted;
 
     public TeleOp(int cargoShipHatches, int cargoShipCargo, int rocketLevelOneCargo,
                   int rocketLevelOneHatches, int rocketLevelTwoCargo, int rocketLevelTwoHatches,
                   int rocketLevelThreeCargo, int rocketLevelThreeHatches, int hatchesDropped,
                   int cargoDropped, boolean climbAssistedByPartners, int attemptHabClimbLevel,
                   int successHabClimbLevel, boolean attemptHabClimb, boolean successHabClimb,
-                  int assistingClimbTeamNumber, int otherRobotClimbsAssisted,
+                  int assistingClimbTeamNumber, int numberOfPartnerClimbsAssisted,
                   int highestClimbAssisted) {
         this.cargoShipHatches = cargoShipHatches;
         this.cargoShipCargo = cargoShipCargo;
@@ -50,7 +50,7 @@ public TeleOp(int cargoShipHatches, int cargoShipCargo, int rocketLevelOneCargo,
         this.attemptHabClimb = attemptHabClimb;
         this.successHabClimb = successHabClimb;
         this.assistingClimbTeamNumber = assistingClimbTeamNumber;
-        this.otherRobotClimbsAssisted = otherRobotClimbsAssisted;
+        this.numberOfPartnerClimbsAssisted = numberOfPartnerClimbsAssisted;
         this.highestClimbAssisted = highestClimbAssisted;
     }
 
@@ -118,11 +118,11 @@ public int getAssistingClimbTeamNumber() {
         return assistingClimbTeamNumber;
     }
 
-    public int getOtherRobotClimbsAssisted() {
-        return otherRobotClimbsAssisted;
+    public int getNumberOfPartnerClimbsAssisted() {
+        return numberOfPartnerClimbsAssisted;
     }
 
     public int getHighestClimbAssisted() {
         return highestClimbAssisted;
     }
-}
+}