From 2c0fdbbab823d8a1aad45c0816227cf505a4419e Mon Sep 17 00:00:00 2001
From: Meryem Esa <meresa14@gmail.com>
Date: Sat, 30 Jan 2016 15:53:12 -0800
Subject: [PATCH] delete Align command and rename Aim to AimAndAlign

---
 .../commands/{Aim.java => AimAndAlign.java}   |  4 +--
 .../frc/team3501/robot/commands/Align.java    | 30 -------------------
 .../robot/commands/DefaultAutonStrategy.java  |  2 +-
 3 files changed, 3 insertions(+), 33 deletions(-)
 rename src/org/usfirst/frc/team3501/robot/commands/{Aim.java => AimAndAlign.java} (83%)
 delete mode 100755 src/org/usfirst/frc/team3501/robot/commands/Align.java

diff --git a/src/org/usfirst/frc/team3501/robot/commands/Aim.java b/src/org/usfirst/frc/team3501/robot/commands/AimAndAlign.java
similarity index 83%
rename from src/org/usfirst/frc/team3501/robot/commands/Aim.java
rename to src/org/usfirst/frc/team3501/robot/commands/AimAndAlign.java
index b4c9f212..72819405 100755
--- a/src/org/usfirst/frc/team3501/robot/commands/Aim.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/AimAndAlign.java
@@ -2,9 +2,9 @@ package org.usfirst.frc.team3501.robot.commands;
 
 import edu.wpi.first.wpilibj.command.Command;
 
-public class Aim extends Command {
+public class AimAndAlign extends Command {
 
-	public Aim() {
+	public AimAndAlign() {
 	}
 
 	@Override
diff --git a/src/org/usfirst/frc/team3501/robot/commands/Align.java b/src/org/usfirst/frc/team3501/robot/commands/Align.java
deleted file mode 100755
index 3d28b696..00000000
--- a/src/org/usfirst/frc/team3501/robot/commands/Align.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.usfirst.frc.team3501.robot.commands;
-
-import edu.wpi.first.wpilibj.command.Command;
-
-public class Align extends Command {
-
-	public Align() {
-	}
-
-	@Override
-	protected void initialize() {
-	}
-
-	@Override
-	protected void execute() {
-	}
-
-	@Override
-	protected boolean isFinished() {
-		return false;
-	}
-
-	@Override
-	protected void end() {
-	}
-
-	@Override
-	protected void interrupted() {
-	}
-}
diff --git a/src/org/usfirst/frc/team3501/robot/commands/DefaultAutonStrategy.java b/src/org/usfirst/frc/team3501/robot/commands/DefaultAutonStrategy.java
index eccd9668..2e6d8eca 100755
--- a/src/org/usfirst/frc/team3501/robot/commands/DefaultAutonStrategy.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/DefaultAutonStrategy.java
@@ -57,7 +57,7 @@ public class DefaultAutonStrategy extends CommandGroup {
 
     // TODO: put in the argument that goes inside of aim, based on the position
     // variable that was passed into the command group
-    addSequential(new Aim());
+    addSequential(new AimAndAlign());
     addSequential(new Shoot());
 
   }
-- 
2.30.2