From eff98118d5ccbeec7676a8aa6c003f475e916bb6 Mon Sep 17 00:00:00 2001 From: Seth Morabito Date: Fri, 8 Jan 2016 20:40:23 -0800 Subject: [PATCH] Fix a few straggling Java 8-isms. --- src/main/java/com/loomcom/symon/Bus.java | 1 - src/main/java/com/loomcom/symon/devices/Device.java | 10 +++------- .../java/com/loomcom/symon/devices/SdController.java | 1 - 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/loomcom/symon/Bus.java b/src/main/java/com/loomcom/symon/Bus.java index bc922b6..2938c7b 100644 --- a/src/main/java/com/loomcom/symon/Bus.java +++ b/src/main/java/com/loomcom/symon/Bus.java @@ -34,7 +34,6 @@ import java.util.Map; import java.util.SortedSet; import java.util.TreeSet; -import java.util.stream.Collectors; /** * The Bus ties the whole thing together, man. diff --git a/src/main/java/com/loomcom/symon/devices/Device.java b/src/main/java/com/loomcom/symon/devices/Device.java index fb5b33d..121ac1b 100644 --- a/src/main/java/com/loomcom/symon/devices/Device.java +++ b/src/main/java/com/loomcom/symon/devices/Device.java @@ -30,7 +30,6 @@ import com.loomcom.symon.exceptions.MemoryRangeException; import java.util.HashSet; import java.util.Set; -import java.util.function.Consumer; /** * A memory-mapped IO Device. @@ -116,12 +115,9 @@ public abstract class Device implements Comparable { } public void notifyListeners() { - deviceChangeListeners.forEach(new Consumer() { - @Override - public void accept(DeviceChangeListener deviceChangeListener) { - deviceChangeListener.deviceStateChanged(); - } - }); + for (DeviceChangeListener listener : deviceChangeListeners) { + listener.deviceStateChanged(); + } } /** diff --git a/src/main/java/com/loomcom/symon/devices/SdController.java b/src/main/java/com/loomcom/symon/devices/SdController.java index 09971f2..040defe 100644 --- a/src/main/java/com/loomcom/symon/devices/SdController.java +++ b/src/main/java/com/loomcom/symon/devices/SdController.java @@ -27,7 +27,6 @@ package com.loomcom.symon.devices; import com.loomcom.symon.exceptions.MemoryAccessException; import com.loomcom.symon.exceptions.MemoryRangeException; -import jdk.nashorn.internal.ir.annotations.Ignore; import java.io.File; import java.io.FileInputStream;