From 4b6dc9583ad539adde48f652946c4cc470cd2845 Mon Sep 17 00:00:00 2001
From: Tyler Veness <calcmogul@gmail.com>
Date: Mon, 2 Jan 2017 00:44:35 -0800
Subject: [PATCH] Corrected order of access specifiers in MockCommand class
 (#436)

---
 .../include/command/MockCommand.h             | 30 +++++++++----------
 .../src/command/MockCommand.cpp               | 12 ++++----
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/wpilibcIntegrationTests/include/command/MockCommand.h b/wpilibcIntegrationTests/include/command/MockCommand.h
index 582a83621f..0efdfae057 100644
--- a/wpilibcIntegrationTests/include/command/MockCommand.h
+++ b/wpilibcIntegrationTests/include/command/MockCommand.h
@@ -12,21 +12,6 @@
 namespace frc {
 
 class MockCommand : public Command {
- private:
-  int32_t m_initializeCount;
-  int32_t m_executeCount;
-  int32_t m_isFinishedCount;
-  bool m_hasFinished;
-  int32_t m_endCount;
-  int32_t m_interruptedCount;
-
- protected:
-  virtual void Initialize();
-  virtual void Execute();
-  virtual bool IsFinished();
-  virtual void End();
-  virtual void Interrupted();
-
  public:
   MockCommand();
   int32_t GetInitializeCount() { return m_initializeCount; }
@@ -41,6 +26,21 @@ class MockCommand : public Command {
 
   int32_t GetInterruptedCount() { return m_interruptedCount; }
   bool HasInterrupted();
+
+ protected:
+  void Initialize() override;
+  void Execute() override;
+  bool IsFinished() override;
+  void End() override;
+  void Interrupted() override;
+
+ private:
+  int32_t m_initializeCount;
+  int32_t m_executeCount;
+  int32_t m_isFinishedCount;
+  bool m_hasFinished;
+  int32_t m_endCount;
+  int32_t m_interruptedCount;
 };
 
 }  // namespace frc
diff --git a/wpilibcIntegrationTests/src/command/MockCommand.cpp b/wpilibcIntegrationTests/src/command/MockCommand.cpp
index c16f483e22..19c0c6460e 100644
--- a/wpilibcIntegrationTests/src/command/MockCommand.cpp
+++ b/wpilibcIntegrationTests/src/command/MockCommand.cpp
@@ -18,6 +18,12 @@ MockCommand::MockCommand() {
   m_interruptedCount = 0;
 }
 
+bool MockCommand::HasInitialized() { return GetInitializeCount() > 0; }
+
+bool MockCommand::HasEnd() { return GetEndCount() > 0; }
+
+bool MockCommand::HasInterrupted() { return GetInterruptedCount() > 0; }
+
 void MockCommand::Initialize() { ++m_initializeCount; }
 
 void MockCommand::Execute() { ++m_executeCount; }
@@ -30,9 +36,3 @@ bool MockCommand::IsFinished() {
 void MockCommand::End() { ++m_endCount; }
 
 void MockCommand::Interrupted() { ++m_interruptedCount; }
-
-bool MockCommand::HasInitialized() { return GetInitializeCount() > 0; }
-
-bool MockCommand::HasEnd() { return GetEndCount() > 0; }
-
-bool MockCommand::HasInterrupted() { return GetInterruptedCount() > 0; }