From 5b3b1652e197b540e14b8f5b405314b6f33d733c Mon Sep 17 00:00:00 2001
From: Logan Howard <logan@oflogan.com>
Date: Fri, 17 Apr 2015 21:49:06 -0700
Subject: [PATCH] change location of base files

---
 .../frc/team3501/{robot/commands => bases}/Command.java       | 2 +-
 .../frc/team3501/{robot/commands => bases}/CommandBase.java   | 2 +-
 .../frc/team3501/{robot/commands => bases}/CommandGroup.java  | 4 ++--
 src/org/usfirst/frc/team3501/robot/autons/DriveOverStep.java  | 2 +-
 src/org/usfirst/frc/team3501/robot/autons/DrivePastStep.java  | 2 +-
 .../usfirst/frc/team3501/robot/autons/PickUpContainer.java    | 1 +
 src/org/usfirst/frc/team3501/robot/commands/CloseClaw.java    | 2 ++
 src/org/usfirst/frc/team3501/robot/commands/DriveFor.java     | 2 ++
 .../frc/team3501/robot/commands/DriveWithJoysticks.java       | 2 ++
 src/org/usfirst/frc/team3501/robot/commands/MoveArm.java      | 2 ++
 src/org/usfirst/frc/team3501/robot/commands/MoveArmFor.java   | 2 ++
 src/org/usfirst/frc/team3501/robot/commands/OpenClaw.java     | 2 ++
 .../usfirst/frc/team3501/robot/commands/TensionLeftWinch.java | 2 ++
 .../frc/team3501/robot/commands/TensionRightWinch.java        | 2 ++
 src/org/usfirst/frc/team3501/robot/commands/ToggleClaw.java   | 2 ++
 .../frc/team3501/robot/commands/TurnOffCompressor.java        | 2 ++
 .../usfirst/frc/team3501/robot/commands/TurnOnCompressor.java | 2 ++
 17 files changed, 29 insertions(+), 6 deletions(-)
 rename src/org/usfirst/frc/team3501/{robot/commands => bases}/Command.java (90%)
 rename src/org/usfirst/frc/team3501/{robot/commands => bases}/CommandBase.java (91%)
 rename src/org/usfirst/frc/team3501/{robot/commands => bases}/CommandGroup.java (70%)

diff --git a/src/org/usfirst/frc/team3501/robot/commands/Command.java b/src/org/usfirst/frc/team3501/bases/Command.java
similarity index 90%
rename from src/org/usfirst/frc/team3501/robot/commands/Command.java
rename to src/org/usfirst/frc/team3501/bases/Command.java
index 42c58d6..b25eb39 100644
--- a/src/org/usfirst/frc/team3501/robot/commands/Command.java
+++ b/src/org/usfirst/frc/team3501/bases/Command.java
@@ -1,4 +1,4 @@
-package org.usfirst.frc.team3501.robot.commands;
+package org.usfirst.frc.team3501.bases;
 
 import edu.wpi.first.wpilibj.command.Scheduler;
 
diff --git a/src/org/usfirst/frc/team3501/robot/commands/CommandBase.java b/src/org/usfirst/frc/team3501/bases/CommandBase.java
similarity index 91%
rename from src/org/usfirst/frc/team3501/robot/commands/CommandBase.java
rename to src/org/usfirst/frc/team3501/bases/CommandBase.java
index 3a5044e..d797ce6 100644
--- a/src/org/usfirst/frc/team3501/robot/commands/CommandBase.java
+++ b/src/org/usfirst/frc/team3501/bases/CommandBase.java
@@ -1,4 +1,4 @@
-package org.usfirst.frc.team3501.robot.commands;
+package org.usfirst.frc.team3501.bases;
 
 import org.usfirst.frc.team3501.robot.AutonData;
 import org.usfirst.frc.team3501.robot.OI;
diff --git a/src/org/usfirst/frc/team3501/robot/commands/CommandGroup.java b/src/org/usfirst/frc/team3501/bases/CommandGroup.java
similarity index 70%
rename from src/org/usfirst/frc/team3501/robot/commands/CommandGroup.java
rename to src/org/usfirst/frc/team3501/bases/CommandGroup.java
index fcb7d26..b1d5c31 100644
--- a/src/org/usfirst/frc/team3501/robot/commands/CommandGroup.java
+++ b/src/org/usfirst/frc/team3501/bases/CommandGroup.java
@@ -1,6 +1,6 @@
-package org.usfirst.frc.team3501.robot.commands;
+package org.usfirst.frc.team3501.bases;
 
-public class CommandGroup
+public abstract class CommandGroup
     extends edu.wpi.first.wpilibj.command.CommandGroup
     implements CommandBase {
 
diff --git a/src/org/usfirst/frc/team3501/robot/autons/DriveOverStep.java b/src/org/usfirst/frc/team3501/robot/autons/DriveOverStep.java
index 224bc9c..aa3e752 100644
--- a/src/org/usfirst/frc/team3501/robot/autons/DriveOverStep.java
+++ b/src/org/usfirst/frc/team3501/robot/autons/DriveOverStep.java
@@ -1,6 +1,6 @@
 package org.usfirst.frc.team3501.robot.autons;
 
-import org.usfirst.frc.team3501.robot.commands.Command;
+import org.usfirst.frc.team3501.bases.Command;
 
 public class DriveOverStep extends Command {
 
diff --git a/src/org/usfirst/frc/team3501/robot/autons/DrivePastStep.java b/src/org/usfirst/frc/team3501/robot/autons/DrivePastStep.java
index f459750..fe4e2c3 100644
--- a/src/org/usfirst/frc/team3501/robot/autons/DrivePastStep.java
+++ b/src/org/usfirst/frc/team3501/robot/autons/DrivePastStep.java
@@ -1,6 +1,6 @@
 package org.usfirst.frc.team3501.robot.autons;
 
-import org.usfirst.frc.team3501.robot.commands.Command;
+import org.usfirst.frc.team3501.bases.Command;
 
 public class DrivePastStep extends Command {
 
diff --git a/src/org/usfirst/frc/team3501/robot/autons/PickUpContainer.java b/src/org/usfirst/frc/team3501/robot/autons/PickUpContainer.java
index 52fb2b4..3f4b4aa 100644
--- a/src/org/usfirst/frc/team3501/robot/autons/PickUpContainer.java
+++ b/src/org/usfirst/frc/team3501/robot/autons/PickUpContainer.java
@@ -1,5 +1,6 @@
 package org.usfirst.frc.team3501.robot.autons;
 
+import org.usfirst.frc.team3501.bases.CommandGroup;
 import org.usfirst.frc.team3501.robot.Robot;
 import org.usfirst.frc.team3501.robot.commands.*;
 
diff --git a/src/org/usfirst/frc/team3501/robot/commands/CloseClaw.java b/src/org/usfirst/frc/team3501/robot/commands/CloseClaw.java
index d4b1199..90e8acc 100644
--- a/src/org/usfirst/frc/team3501/robot/commands/CloseClaw.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/CloseClaw.java
@@ -1,5 +1,7 @@
 package org.usfirst.frc.team3501.robot.commands;
 
+import org.usfirst.frc.team3501.bases.Command;
+
 public class CloseClaw extends Command {
 
     public CloseClaw() {
diff --git a/src/org/usfirst/frc/team3501/robot/commands/DriveFor.java b/src/org/usfirst/frc/team3501/robot/commands/DriveFor.java
index 295834b..95aae89 100644
--- a/src/org/usfirst/frc/team3501/robot/commands/DriveFor.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/DriveFor.java
@@ -1,5 +1,7 @@
 package org.usfirst.frc.team3501.robot.commands;
 
+import org.usfirst.frc.team3501.bases.Command;
+
 public class DriveFor extends Command {
 
     private double speed;
diff --git a/src/org/usfirst/frc/team3501/robot/commands/DriveWithJoysticks.java b/src/org/usfirst/frc/team3501/robot/commands/DriveWithJoysticks.java
index cf5446a..5e935c9 100644
--- a/src/org/usfirst/frc/team3501/robot/commands/DriveWithJoysticks.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/DriveWithJoysticks.java
@@ -1,5 +1,7 @@
 package org.usfirst.frc.team3501.robot.commands;
 
+import org.usfirst.frc.team3501.bases.Command;
+
 public class DriveWithJoysticks extends Command {
 
     public DriveWithJoysticks() {
diff --git a/src/org/usfirst/frc/team3501/robot/commands/MoveArm.java b/src/org/usfirst/frc/team3501/robot/commands/MoveArm.java
index e209771..8043753 100644
--- a/src/org/usfirst/frc/team3501/robot/commands/MoveArm.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/MoveArm.java
@@ -1,5 +1,7 @@
 package org.usfirst.frc.team3501.robot.commands;
 
+import org.usfirst.frc.team3501.bases.Command;
+
 public class MoveArm extends Command {
 
     public MoveArm() {
diff --git a/src/org/usfirst/frc/team3501/robot/commands/MoveArmFor.java b/src/org/usfirst/frc/team3501/robot/commands/MoveArmFor.java
index b9f3bc7..eb2a5ce 100644
--- a/src/org/usfirst/frc/team3501/robot/commands/MoveArmFor.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/MoveArmFor.java
@@ -1,5 +1,7 @@
 package org.usfirst.frc.team3501.robot.commands;
 
+import org.usfirst.frc.team3501.bases.Command;
+
 public class MoveArmFor extends Command {
 
     private double speed;
diff --git a/src/org/usfirst/frc/team3501/robot/commands/OpenClaw.java b/src/org/usfirst/frc/team3501/robot/commands/OpenClaw.java
index 6adb5a7..397dcf4 100644
--- a/src/org/usfirst/frc/team3501/robot/commands/OpenClaw.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/OpenClaw.java
@@ -1,5 +1,7 @@
 package org.usfirst.frc.team3501.robot.commands;
 
+import org.usfirst.frc.team3501.bases.Command;
+
 public class OpenClaw extends Command {
 
     public OpenClaw() {
diff --git a/src/org/usfirst/frc/team3501/robot/commands/TensionLeftWinch.java b/src/org/usfirst/frc/team3501/robot/commands/TensionLeftWinch.java
index b915896..3a5ac17 100644
--- a/src/org/usfirst/frc/team3501/robot/commands/TensionLeftWinch.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/TensionLeftWinch.java
@@ -1,5 +1,7 @@
 package org.usfirst.frc.team3501.robot.commands;
 
+import org.usfirst.frc.team3501.bases.Command;
+
 public class TensionLeftWinch extends Command {
 
     private double speed;
diff --git a/src/org/usfirst/frc/team3501/robot/commands/TensionRightWinch.java b/src/org/usfirst/frc/team3501/robot/commands/TensionRightWinch.java
index 30dfb10..993302c 100644
--- a/src/org/usfirst/frc/team3501/robot/commands/TensionRightWinch.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/TensionRightWinch.java
@@ -1,5 +1,7 @@
 package org.usfirst.frc.team3501.robot.commands;
 
+import org.usfirst.frc.team3501.bases.Command;
+
 public class TensionRightWinch extends Command {
 
     private double speed;
diff --git a/src/org/usfirst/frc/team3501/robot/commands/ToggleClaw.java b/src/org/usfirst/frc/team3501/robot/commands/ToggleClaw.java
index b7e7b52..802baf8 100644
--- a/src/org/usfirst/frc/team3501/robot/commands/ToggleClaw.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/ToggleClaw.java
@@ -1,5 +1,7 @@
 package org.usfirst.frc.team3501.robot.commands;
 
+import org.usfirst.frc.team3501.bases.Command;
+
 public class ToggleClaw extends Command {
 
     public ToggleClaw() {
diff --git a/src/org/usfirst/frc/team3501/robot/commands/TurnOffCompressor.java b/src/org/usfirst/frc/team3501/robot/commands/TurnOffCompressor.java
index 85838f9..43db593 100644
--- a/src/org/usfirst/frc/team3501/robot/commands/TurnOffCompressor.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/TurnOffCompressor.java
@@ -1,5 +1,7 @@
 package org.usfirst.frc.team3501.robot.commands;
 
+import org.usfirst.frc.team3501.bases.Command;
+
 public class TurnOffCompressor extends Command {
 
     public TurnOffCompressor() {
diff --git a/src/org/usfirst/frc/team3501/robot/commands/TurnOnCompressor.java b/src/org/usfirst/frc/team3501/robot/commands/TurnOnCompressor.java
index 49853f2..6905764 100644
--- a/src/org/usfirst/frc/team3501/robot/commands/TurnOnCompressor.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/TurnOnCompressor.java
@@ -1,5 +1,7 @@
 package org.usfirst.frc.team3501.robot.commands;
 
+import org.usfirst.frc.team3501.bases.Command;
+
 public class TurnOnCompressor extends Command {
 
     public TurnOnCompressor() {
-- 
2.30.2