Merge branch '1.2.branch'

This commit is contained in:
Seth Morabito committed 2016-01-08 20:41:25 -08:00
commit b59fa63b63
3 files changed
+3 -9

No files matched your search

-1
View File
@@ -34,7 +34,6 @@ import java.util.Map;
import java.util.SortedSet; import java.util.SortedSet;
import java.util.TreeSet; import java.util.TreeSet;
import java.util.stream.Collectors;
/** /**
* The Bus ties the whole thing together, man. * The Bus ties the whole thing together, man.
@@ -30,7 +30,6 @@ import com.loomcom.symon.exceptions.MemoryRangeException;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import java.util.function.Consumer;
/** /**
* A memory-mapped IO Device. * A memory-mapped IO Device.
@@ -116,12 +115,9 @@ public abstract class Device implements Comparable<Device> {
} }
public void notifyListeners() { public void notifyListeners() {
deviceChangeListeners.forEach(new Consumer<DeviceChangeListener>() { for (DeviceChangeListener listener : deviceChangeListeners) {
@Override listener.deviceStateChanged();
public void accept(DeviceChangeListener deviceChangeListener) { }
deviceChangeListener.deviceStateChanged();
}
});
} }
/** /**
@@ -27,7 +27,6 @@ package com.loomcom.symon.devices;
import com.loomcom.symon.exceptions.MemoryAccessException; import com.loomcom.symon.exceptions.MemoryAccessException;
import com.loomcom.symon.exceptions.MemoryRangeException; import com.loomcom.symon.exceptions.MemoryRangeException;
import jdk.nashorn.internal.ir.annotations.Ignore;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;