diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ParallelCommandGroup.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ParallelCommandGroup.java index 688435c569..edc8005f34 100644 --- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ParallelCommandGroup.java +++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ParallelCommandGroup.java @@ -54,7 +54,7 @@ public class ParallelCommandGroup extends CommandGroupBase { } @Override - public void initialize() { + public final void initialize() { for (Map.Entry commandRunning : m_commands.entrySet()) { commandRunning.getKey().initialize(); commandRunning.setValue(true); @@ -62,7 +62,7 @@ public class ParallelCommandGroup extends CommandGroupBase { } @Override - public void execute() { + public final void execute() { for (Map.Entry commandRunning : m_commands.entrySet()) { if (!commandRunning.getValue()) { continue; @@ -76,7 +76,7 @@ public class ParallelCommandGroup extends CommandGroupBase { } @Override - public void end(boolean interrupted) { + public final void end(boolean interrupted) { if (interrupted) { for (Map.Entry commandRunning : m_commands.entrySet()) { if (commandRunning.getValue()) { @@ -87,7 +87,7 @@ public class ParallelCommandGroup extends CommandGroupBase { } @Override - public boolean isFinished() { + public final boolean isFinished() { return !m_commands.containsValue(true); } diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ParallelDeadlineGroup.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ParallelDeadlineGroup.java index 5d54b2f50a..918a134860 100644 --- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ParallelDeadlineGroup.java +++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ParallelDeadlineGroup.java @@ -76,7 +76,7 @@ public class ParallelDeadlineGroup extends CommandGroupBase { } @Override - public void initialize() { + public final void initialize() { for (Map.Entry commandRunning : m_commands.entrySet()) { commandRunning.getKey().initialize(); commandRunning.setValue(true); @@ -85,7 +85,7 @@ public class ParallelDeadlineGroup extends CommandGroupBase { } @Override - public void execute() { + public final void execute() { for (Map.Entry commandRunning : m_commands.entrySet()) { if (!commandRunning.getValue()) { continue; @@ -102,7 +102,7 @@ public class ParallelDeadlineGroup extends CommandGroupBase { } @Override - public void end(boolean interrupted) { + public final void end(boolean interrupted) { for (Map.Entry commandRunning : m_commands.entrySet()) { if (commandRunning.getValue()) { commandRunning.getKey().end(true); @@ -111,7 +111,7 @@ public class ParallelDeadlineGroup extends CommandGroupBase { } @Override - public boolean isFinished() { + public final boolean isFinished() { return m_finished; } diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ParallelRaceGroup.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ParallelRaceGroup.java index be3f909fce..04ad5a81f4 100644 --- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ParallelRaceGroup.java +++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ParallelRaceGroup.java @@ -55,7 +55,7 @@ public class ParallelRaceGroup extends CommandGroupBase { } @Override - public void initialize() { + public final void initialize() { m_finished = false; for (Command command : m_commands) { command.initialize(); @@ -63,7 +63,7 @@ public class ParallelRaceGroup extends CommandGroupBase { } @Override - public void execute() { + public final void execute() { for (Command command : m_commands) { command.execute(); if (command.isFinished()) { @@ -73,14 +73,14 @@ public class ParallelRaceGroup extends CommandGroupBase { } @Override - public void end(boolean interrupted) { + public final void end(boolean interrupted) { for (Command command : m_commands) { command.end(!command.isFinished()); } } @Override - public boolean isFinished() { + public final boolean isFinished() { return m_finished; } diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/SequentialCommandGroup.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/SequentialCommandGroup.java index 43426b0975..5fda8f68d0 100644 --- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/SequentialCommandGroup.java +++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/SequentialCommandGroup.java @@ -48,7 +48,7 @@ public class SequentialCommandGroup extends CommandGroupBase { } @Override - public void initialize() { + public final void initialize() { m_currentCommandIndex = 0; if (!m_commands.isEmpty()) { @@ -57,7 +57,7 @@ public class SequentialCommandGroup extends CommandGroupBase { } @Override - public void execute() { + public final void execute() { if (m_commands.isEmpty()) { return; } @@ -75,7 +75,7 @@ public class SequentialCommandGroup extends CommandGroupBase { } @Override - public void end(boolean interrupted) { + public final void end(boolean interrupted) { if (interrupted && !m_commands.isEmpty() && m_currentCommandIndex > -1 @@ -86,7 +86,7 @@ public class SequentialCommandGroup extends CommandGroupBase { } @Override - public boolean isFinished() { + public final boolean isFinished() { return m_currentCommandIndex == m_commands.size(); } diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/ParallelCommandGroup.h b/wpilibNewCommands/src/main/native/include/frc2/command/ParallelCommandGroup.h index d1f5aa6424..2392b2ad09 100644 --- a/wpilibNewCommands/src/main/native/include/frc2/command/ParallelCommandGroup.h +++ b/wpilibNewCommands/src/main/native/include/frc2/command/ParallelCommandGroup.h @@ -74,13 +74,13 @@ class ParallelCommandGroup AddCommands(std::move(foo)); } - void Initialize() override; + void Initialize() final; - void Execute() override; + void Execute() final; - void End(bool interrupted) override; + void End(bool interrupted) final; - bool IsFinished() override; + bool IsFinished() final; bool RunsWhenDisabled() const override; diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/ParallelDeadlineGroup.h b/wpilibNewCommands/src/main/native/include/frc2/command/ParallelDeadlineGroup.h index 81d25cb93e..3ef8b78a8b 100644 --- a/wpilibNewCommands/src/main/native/include/frc2/command/ParallelDeadlineGroup.h +++ b/wpilibNewCommands/src/main/native/include/frc2/command/ParallelDeadlineGroup.h @@ -82,13 +82,13 @@ class ParallelDeadlineGroup AddCommands(std::move(foo)); } - void Initialize() override; + void Initialize() final; - void Execute() override; + void Execute() final; - void End(bool interrupted) override; + void End(bool interrupted) final; - bool IsFinished() override; + bool IsFinished() final; bool RunsWhenDisabled() const override; diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/ParallelRaceGroup.h b/wpilibNewCommands/src/main/native/include/frc2/command/ParallelRaceGroup.h index 0092223771..2f7ee19a71 100644 --- a/wpilibNewCommands/src/main/native/include/frc2/command/ParallelRaceGroup.h +++ b/wpilibNewCommands/src/main/native/include/frc2/command/ParallelRaceGroup.h @@ -62,13 +62,13 @@ class ParallelRaceGroup AddCommands(std::move(foo)); } - void Initialize() override; + void Initialize() final; - void Execute() override; + void Execute() final; - void End(bool interrupted) override; + void End(bool interrupted) final; - bool IsFinished() override; + bool IsFinished() final; bool RunsWhenDisabled() const override; diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/SequentialCommandGroup.h b/wpilibNewCommands/src/main/native/include/frc2/command/SequentialCommandGroup.h index 928af8e493..f7931a6cc9 100644 --- a/wpilibNewCommands/src/main/native/include/frc2/command/SequentialCommandGroup.h +++ b/wpilibNewCommands/src/main/native/include/frc2/command/SequentialCommandGroup.h @@ -78,13 +78,13 @@ class SequentialCommandGroup AddCommands(std::move(foo)); } - void Initialize() override; + void Initialize() final; - void Execute() override; + void Execute() final; - void End(bool interrupted) override; + void End(bool interrupted) final; - bool IsFinished() override; + bool IsFinished() final; bool RunsWhenDisabled() const override;