From c45fb73f365e488ec550bdedf5ac09f503f4e0cc Mon Sep 17 00:00:00 2001 From: Austin Shalit Date: Thu, 24 Aug 2017 01:00:55 -0400 Subject: [PATCH] Convert for loops to foreach loops (#592) --- wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogInput.java | 4 ++-- .../main/java/edu/wpi/first/wpilibj/command/Scheduler.java | 4 ++-- .../main/java/edu/wpi/first/wpilibj/util/SortedVector.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogInput.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogInput.java index 48061c5ed9..30d35a3794 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogInput.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogInput.java @@ -305,8 +305,8 @@ public class AnalogInput extends SensorBase implements PIDSource, LiveWindowSend * @return The analog channel is attached to an accumulator. */ public boolean isAccumulatorChannel() { - for (int i = 0; i < kAccumulatorChannels.length; i++) { - if (m_channel == kAccumulatorChannels[i]) { + for (int channel : kAccumulatorChannels) { + if (m_channel == channel) { return true; } } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/Scheduler.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/Scheduler.java index 4acd189aec..9daed6a493 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/Scheduler.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/Scheduler.java @@ -324,8 +324,8 @@ public class Scheduler implements NamedSendable { double[] toCancel = m_table.getNumberArray("Cancel", new double[0]); if (toCancel.length > 0) { for (LinkedListElement e = m_firstCommand; e != null; e = e.getNext()) { - for (int i = 0; i < toCancel.length; i++) { - if (e.getData().hashCode() == toCancel[i]) { + for (double d : toCancel) { + if (e.getData().hashCode() == d) { e.getData().cancel(); } } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/util/SortedVector.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/util/SortedVector.java index 7431e29aec..a6e20b0973 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/util/SortedVector.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/util/SortedVector.java @@ -75,8 +75,8 @@ public class SortedVector extends Vector { Object[] array = new Object[size()]; copyInto(array); removeAllElements(); - for (int i = 0; i < array.length; i++) { - addElement((E) array[i]); + for (Object o : array) { + addElement((E) o); } } }