From 32af49dbb85d255a480d8f590579b8669d50a3e2 Mon Sep 17 00:00:00 2001
From: Tyler Veness <calcmogul@gmail.com>
Date: Tue, 1 Sep 2015 06:02:05 -0700
Subject: [PATCH] Fixed miscellaneous typos

Renamed RelayCrossConnectFxiture to RelayCrossConnectFixture and fixed spelling of variable in PIDCommand class prototype

Change-Id: I2e0970c9b14f58b7fa5ad70024b29e7a54524f0c
---
 wpilibc/wpilibC++/include/Commands/PIDCommand.h             | 2 +-
 .../java/edu/wpi/first/wpilibj/RelayCrossConnectTest.java   | 4 ++--
 ...ossConnectFxiture.java => RelayCrossConnectFixture.java} | 4 ++--
 .../src/main/java/edu/wpi/first/wpilibj/test/TestBench.java | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/fixtures/{RelayCrossConnectFxiture.java => RelayCrossConnectFixture.java} (94%)

diff --git a/wpilibc/wpilibC++/include/Commands/PIDCommand.h b/wpilibc/wpilibC++/include/Commands/PIDCommand.h
index a98c239550..d67c063923 100644
--- a/wpilibc/wpilibC++/include/Commands/PIDCommand.h
+++ b/wpilibc/wpilibC++/include/Commands/PIDCommand.h
@@ -20,7 +20,7 @@ class PIDCommand : public Command, public PIDOutput, public PIDSource {
   PIDCommand(const std::string &name, double p, double i, double d);
   PIDCommand(const std::string &name, double p, double i, double d, double period);
   PIDCommand(const std::string &name, double p, double i, double d, double f,
-             double perioid);
+             double period);
   PIDCommand(double p, double i, double d);
   PIDCommand(double p, double i, double d, double period);
   PIDCommand(double p, double i, double d, double f, double period);
diff --git a/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/RelayCrossConnectTest.java b/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/RelayCrossConnectTest.java
index ba5139034b..5ed2c004b4 100644
--- a/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/RelayCrossConnectTest.java
+++ b/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/RelayCrossConnectTest.java
@@ -21,7 +21,7 @@ import org.junit.Test;
 import edu.wpi.first.wpilibj.Relay.Direction;
 import edu.wpi.first.wpilibj.Relay.InvalidValueException;
 import edu.wpi.first.wpilibj.Relay.Value;
-import edu.wpi.first.wpilibj.fixtures.RelayCrossConnectFxiture;
+import edu.wpi.first.wpilibj.fixtures.RelayCrossConnectFixture;
 import edu.wpi.first.wpilibj.networktables.NetworkTable;
 import edu.wpi.first.wpilibj.test.AbstractComsSetup;
 import edu.wpi.first.wpilibj.test.TestBench;
@@ -33,7 +33,7 @@ import edu.wpi.first.wpilibj.test.TestBench;
 public class RelayCrossConnectTest extends AbstractComsSetup {
   private static final Logger logger = Logger.getLogger(RelayCrossConnectTest.class.getName());
   private static final NetworkTable table = NetworkTable.getTable("_RELAY_CROSS_CONNECT_TEST_");
-  private RelayCrossConnectFxiture relayFixture;
+  private RelayCrossConnectFixture relayFixture;
 
 
   /**
diff --git a/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/fixtures/RelayCrossConnectFxiture.java b/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/fixtures/RelayCrossConnectFixture.java
similarity index 94%
rename from wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/fixtures/RelayCrossConnectFxiture.java
rename to wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/fixtures/RelayCrossConnectFixture.java
index f4475a5d9f..2d8b2d9d8f 100644
--- a/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/fixtures/RelayCrossConnectFxiture.java
+++ b/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/fixtures/RelayCrossConnectFixture.java
@@ -15,7 +15,7 @@ import edu.wpi.first.wpilibj.Relay.Value;
  * @author jonathanleitschuh
  *
  */
-public abstract class RelayCrossConnectFxiture implements ITestFixture {
+public abstract class RelayCrossConnectFixture implements ITestFixture {
 
   private DigitalInput inputOne;
   private DigitalInput inputTwo;
@@ -94,7 +94,7 @@ public abstract class RelayCrossConnectFxiture implements ITestFixture {
       freed = true;
     } else {
       throw new RuntimeException("You attempted to free the "
-          + RelayCrossConnectFxiture.class.getSimpleName() + " multiple times");
+          + RelayCrossConnectFixture.class.getSimpleName() + " multiple times");
     }
     return true;
   }
diff --git a/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/test/TestBench.java b/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/test/TestBench.java
index 9c8765f68c..5c9d3489ff 100644
--- a/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/test/TestBench.java
+++ b/wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/test/TestBench.java
@@ -27,7 +27,7 @@ import edu.wpi.first.wpilibj.fixtures.AnalogCrossConnectFixture;
 import edu.wpi.first.wpilibj.fixtures.CANMotorEncoderFixture;
 import edu.wpi.first.wpilibj.fixtures.DIOCrossConnectFixture;
 import edu.wpi.first.wpilibj.fixtures.MotorEncoderFixture;
-import edu.wpi.first.wpilibj.fixtures.RelayCrossConnectFxiture;
+import edu.wpi.first.wpilibj.fixtures.RelayCrossConnectFixture;
 import edu.wpi.first.wpilibj.fixtures.TiltPanCameraFixture;
 import edu.wpi.first.wpilibj.mockhardware.FakePotentiometerSource;
 
@@ -314,8 +314,8 @@ public final class TestBench {
     return analogIO;
   }
 
-  public static RelayCrossConnectFxiture getRelayCrossConnectFixture() {
-    RelayCrossConnectFxiture relay = new RelayCrossConnectFxiture() {
+  public static RelayCrossConnectFixture getRelayCrossConnectFixture() {
+    RelayCrossConnectFixture relay = new RelayCrossConnectFixture() {
 
       @Override
       protected Relay giveRelay() {