fix merge conflicts

[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 71685c51327524058ee33760c112549a40dde356..ea7910b607f05090ca31e46446fa6f0f33ee2654 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -3,6 +3,7 @@ package org.usfirst.frc.team3501.robot;
 import org.usfirst.frc.team3501.robot.Constants.Defense;
 import org.usfirst.frc.team3501.robot.subsystems.DefenseArm;
 import org.usfirst.frc.team3501.robot.subsystems.DriveTrain;
+import org.usfirst.frc.team3501.robot.subsystems.IntakeArm;
 import org.usfirst.frc.team3501.robot.subsystems.Scaler;
 import org.usfirst.frc.team3501.robot.subsystems.Shooter;
 
@@ -16,12 +17,13 @@ public class Robot extends IterativeRobot {
   public static DriveTrain driveTrain;
   public static Shooter shooter;
   public static Scaler scaler;
-  public static DefenseArm defenseArm;
+  public static IntakeArm intakeArm;
 
   // Sendable Choosers send a drop down menu to the Smart Dashboard.
   SendableChooser positionChooser;
   SendableChooser positionOneDefense, positionTwoDefense, positionThreeDefense,
-      positionFourDefense, positionFiveDefense;
+      positionFourDefense,
+      positionFiveDefense;
 
   @Override
   public void robotInit() {
@@ -29,9 +31,10 @@ public class Robot extends IterativeRobot {
     oi = new OI();
     shooter = new Shooter();
     scaler = new Scaler();
-    defenseArm = new DefenseArm();
+    intakeArm = new IntakeArm();
 
-    // Sendable Choosers allows the driver to select the position of the robot
+    // Sendable Choosers allows the driver to select the position of the
+    // robot
     // and the positions of the defenses from a drop-down menu on the Smart
     // Dashboard
     // make the Sendable Choosers
@@ -84,10 +87,10 @@ public class Robot extends IterativeRobot {
     SmartDashboard.putData("Position Two Defense Chooser", positionTwoDefense);
     SmartDashboard.putData("Position Three Defense Chooser",
         positionThreeDefense);
-    SmartDashboard.putData("Position Four Defense Chooser",
-        positionFourDefense);
-    SmartDashboard.putData("Position Five Defense Chooser",
-        positionFiveDefense);
+    SmartDashboard
+        .putData("Position Four Defense Chooser", positionFourDefense);
+    SmartDashboard
+        .putData("Position Five Defense Chooser", positionFiveDefense);
   }
 
   @Override