From: Meryem Esa <meresa14@gmail.com>
Date: Sun, 31 Jan 2016 01:04:40 +0000 (-0800)
Subject: make methods for various SendableChooser tasks to make robotInit() cleaner
X-Git-Url: http://challenge-bot.com/repos/?p=3501%2Fstronghold-2016;a=commitdiff_plain;h=29d59f4838916d4dcbb5658df8f488e52abe50f3

make methods for various SendableChooser tasks to make robotInit() cleaner
---

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index 37b3c246..c5e9681b 100644
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -25,38 +25,17 @@ public class Robot extends IterativeRobot {
     oi = new OI();
     shooter = new Shooter();
 
-    initializeSendableChoosers();
-
-    // add options for positions to the positionChooser
-    positionChooser.addDefault("Position 1", 1);
-    positionChooser.addObject("Position 2", 2);
-    positionChooser.addObject("Position 3", 3);
-    positionChooser.addObject("Position 4", 4);
-    positionChooser.addObject("Position 5", 5);
-
-    // add options for defenses into each defense chooser (5)
-    addDefense(positionOneDefense);
-    addDefense(positionTwoDefense);
-    addDefense(positionThreeDefense);
-    addDefense(positionFourDefense);
-    addDefense(positionFiveDefense);
-
-    // send the Sendable Choosers to the Smart Dashboard
     // 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
-    SmartDashboard.putData("PositionChooser", positionChooser);
-    SmartDashboard.putData("Position One Defense Chooser", positionOneDefense);
-    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);
+    // make the Sendable Choosers
+    initializeSendableChoosers();
+    addPositionChooserOptions();
+    addDefensesToAllDefenseSendableChooosers();
+    sendSendableChoosersToSmartDashboard();
+
   }
 
-  // initialize all the Sendable Choosers
   private void initializeSendableChoosers() {
     positionChooser = new SendableChooser();
     positionOneDefense = new SendableChooser();
@@ -66,7 +45,23 @@ public class Robot extends IterativeRobot {
     positionFiveDefense = new SendableChooser();
   }
 
-  private void addDefense(SendableChooser chooser) {
+  private void addPositionChooserOptions() {
+    positionChooser.addDefault("Position 1", 1);
+    positionChooser.addObject("Position 2", 2);
+    positionChooser.addObject("Position 3", 3);
+    positionChooser.addObject("Position 4", 4);
+    positionChooser.addObject("Position 5", 5);
+  }
+
+  private void addDefensesToAllDefenseSendableChooosers() {
+    addDefenseOptions(positionOneDefense);
+    addDefenseOptions(positionTwoDefense);
+    addDefenseOptions(positionThreeDefense);
+    addDefenseOptions(positionFourDefense);
+    addDefenseOptions(positionFiveDefense);
+  }
+
+  private void addDefenseOptions(SendableChooser chooser) {
     chooser.addDefault("Portcullis", Defense.PORTCULLIS);
     chooser.addObject("Sally Port", Defense.SALLY_PORT);
     chooser.addObject("Rough Terrain", Defense.ROUGH_TERRAIN);
@@ -77,6 +72,18 @@ public class Robot extends IterativeRobot {
     chooser.addObject("Rock Wall", Defense.ROCK_WALL);
   }
 
+  private void sendSendableChoosersToSmartDashboard() {
+    SmartDashboard.putData("PositionChooser", positionChooser);
+    SmartDashboard.putData("Position One Defense Chooser", positionOneDefense);
+    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);
+  }
+
   @Override
   public void autonomousInit() {
     Scheduler.getInstance().run();