Fix import issue to import the right drivetrain

[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 89f5f0fbc3be384baa34e981a958f8229c0679e9..63b18399873f930b0df50693438707e1fd325007 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,10 +14,6 @@ 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;
@@ -31,7 +28,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();
@@ -87,16 +84,18 @@ public class Robot extends IterativeRobot {
     Integer chosenPosition = (Integer) positionChooser.getSelected();
     Integer chosenDefense = 0;
 
-    if (chosenPosition == 1)
+    switch (chosenPosition) {
+    case 1:
       chosenDefense = (Integer) positionOneDefense.getSelected();
-    if (chosenPosition == 2)
+    case 2:
       chosenDefense = (Integer) positionTwoDefense.getSelected();
-    if (chosenPosition == 3)
+    case 3:
       chosenDefense = (Integer) positionThreeDefense.getSelected();
-    if (chosenPosition == 4)
+    case 4:
       chosenDefense = (Integer) positionFourDefense.getSelected();
-    if (chosenPosition == 5)
+    case 5:
       chosenDefense = (Integer) positionFiveDefense.getSelected();
+    }
 
     System.out.println("Chosen Position: " + chosenPosition);
     System.out.println("Chosen Defense: " + chosenDefense);
@@ -109,7 +108,6 @@ public class Robot extends IterativeRobot {
 
   @Override
   public void teleopInit() {
-    System.out.println("running teleopInit");
   }
 
   @Override
@@ -117,9 +115,4 @@ public class Robot extends IterativeRobot {
     Scheduler.getInstance().run();
 
   }
-
-  public void operate() {
-
-  }
-
 }