From 0b9ff68da1e78880d5801d8454a6c1f28eb56ed9 Mon Sep 17 00:00:00 2001
From: Austin Shalit <austinshalit@gmail.com>
Date: Sun, 7 May 2017 02:26:18 -0400
Subject: [PATCH] StartLiveWindowMode ITables use lambdas (#461)

---
 .../edu/wpi/first/wpilibj/DigitalOutput.java  |  7 +----
 .../java/edu/wpi/first/wpilibj/PWM.java       |  6 +----
 .../java/edu/wpi/first/wpilibj/Relay.java     | 27 +++++++++----------
 .../java/edu/wpi/first/wpilibj/Servo.java     |  6 +----
 .../java/edu/wpi/first/wpilibj/Solenoid.java  |  2 +-
 5 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/DigitalOutput.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/DigitalOutput.java
index 2fab4a7971..e14eff4671 100644
--- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/DigitalOutput.java
+++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/DigitalOutput.java
@@ -256,12 +256,7 @@ public class DigitalOutput extends DigitalSource implements LiveWindowSendable {
 
   @Override
   public void startLiveWindowMode() {
-    m_tableListener = new ITableListener() {
-      @Override
-      public void valueChanged(ITable itable, String key, Object value, boolean bln) {
-        set((Boolean) value);
-      }
-    };
+    m_tableListener = (source, key, value, isNew) -> set((boolean) value);
     m_table.addTableListener("Value", m_tableListener, true);
   }
 
diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/PWM.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/PWM.java
index 833abca638..13fdc21648 100644
--- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/PWM.java
+++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/PWM.java
@@ -292,11 +292,7 @@ public class PWM extends SensorBase implements LiveWindowSendable {
   @Override
   public void startLiveWindowMode() {
     setSpeed(0); // Stop for safety
-    m_tableListener = new ITableListener() {
-      public void valueChanged(ITable itable, String key, Object value, boolean bln) {
-        setSpeed((Double) value);
-      }
-    };
+    m_tableListener = (source, key, value, isNew) -> setSpeed((double) value);
     m_table.addTableListener("Value", m_tableListener, true);
   }
 
diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/Relay.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/Relay.java
index ae11fa21f8..fbedc23ede 100644
--- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/Relay.java
+++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/Relay.java
@@ -105,12 +105,12 @@ public class Relay extends SensorBase implements MotorSafety, LiveWindowSendable
   /**
    * Relay constructor given a channel.
    *
-   * @param channel   The channel number for this relay (0 - 3).
+   * @param channel The channel number for this relay (0 - 3).
    * @param direction The direction that the Relay object will control.
    */
   public Relay(final int channel, Direction direction) {
     m_channel = channel;
-    m_direction = requireNonNull( direction, "Null Direction was given");
+    m_direction = requireNonNull(direction, "Null Direction was given");
     initRelay();
     set(Value.kOff);
   }
@@ -345,19 +345,16 @@ public class Relay extends SensorBase implements MotorSafety, LiveWindowSendable
 
   @Override
   public void startLiveWindowMode() {
-    m_tableListener = new ITableListener() {
-      @Override
-      public void valueChanged(ITable itable, String key, Object value, boolean bln) {
-        String val = ((String) value);
-        if (val.equals("Off")) {
-          set(Value.kOff);
-        } else if (val.equals("On")) {
-          set(Value.kOn);
-        } else if (val.equals("Forward")) {
-          set(Value.kForward);
-        } else if (val.equals("Reverse")) {
-          set(Value.kReverse);
-        }
+    m_tableListener = (source, key, value, isNew) -> {
+      String val = ((String) value);
+      if (val.equals("Off")) {
+        set(Value.kOff);
+      } else if (val.equals("On")) {
+        set(Value.kOn);
+      } else if (val.equals("Forward")) {
+        set(Value.kForward);
+      } else if (val.equals("Reverse")) {
+        set(Value.kReverse);
       }
     };
     m_table.addTableListener("Value", m_tableListener, true);
diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/Servo.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/Servo.java
index 6ca03e62a6..5f2fa6479d 100644
--- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/Servo.java
+++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/Servo.java
@@ -132,11 +132,7 @@ public class Servo extends PWM {
 
   @Override
   public void startLiveWindowMode() {
-    m_tableListener = new ITableListener() {
-      public void valueChanged(ITable itable, String key, Object value, boolean bln) {
-        set(((Double) value).doubleValue());
-      }
-    };
+    m_tableListener = (source, key, value, isNew) -> set((double) value);
     m_table.addTableListener("Value", m_tableListener, true);
   }
 
diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/Solenoid.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/Solenoid.java
index 8592bd1499..079828d4db 100644
--- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/Solenoid.java
+++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/Solenoid.java
@@ -128,7 +128,7 @@ public class Solenoid extends SolenoidBase implements LiveWindowSendable {
   @Override
   public void startLiveWindowMode() {
     set(false); // Stop for safety
-    m_tableListener = (source, key, value, isNew) -> set((Boolean) value);
+    m_tableListener = (source, key, value, isNew) -> set((boolean) value);
     m_table.addTableListener("Value", m_tableListener, true);
   }