put defense Sendable Choosers on one line

[3501/stronghold-2016] / src / org / usfirst / frc / team3501 / robot / Robot.java

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index 0c75eeecd1158382fe7a9963032db934fa2d8557..1ebdf64bfbd55cdd81110f8a7873304e26c93694 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -1,6 +1,7 @@
 package org.usfirst.frc.team3501.robot;
 
-import org.usfirst.frc.team3501.robot.Constants.DriveTrain;
+import org.usfirst.frc.team3501.robot.Constants.Defense;
+import org.usfirst.frc.team3501.robot.subsystems.DriveTrain;
 import org.usfirst.frc.team3501.robot.subsystems.Shooter;
 
 import edu.wpi.first.wpilibj.IterativeRobot;
@@ -13,17 +14,9 @@ public class Robot extends IterativeRobot {
   public static DriveTrain driveTrain;
   public static Shooter shooter;
 
-  enum Defense {
-    PORTCULLIS, SALLY_PORT, ROUGH_TERRAIN, LOW_BAR, CHEVAL_DE_FRISE, DRAWBRIDGE, MOAT, ROCK_WALL
-  };
-
   // Sendable Choosers send a drop down menu to the Smart Dashboard.
-  SendableChooser positionOneDefense;
-  SendableChooser positionTwoDefense;
-  SendableChooser positionThreeDefense;
-  SendableChooser positionFourDefense;
-  SendableChooser positionFiveDefense;
   SendableChooser positionChooser;
+  SendableChooser positionOneDefense, positionTwoDefense, positionThreeDefense, positionFourDefense, positionFiveDefense;
 
   @Override
   public void robotInit() {
@@ -31,7 +24,7 @@ public class Robot extends IterativeRobot {
     oi = new OI();
     shooter = new Shooter();
 
-    // intialize all the Sendable Choosers
+    // initialize all the Sendable Choosers
     positionChooser = new SendableChooser();
     positionOneDefense = new SendableChooser();
     positionTwoDefense = new SendableChooser();