From 53db506919cb378f8f3e2584491ddbc5357ccd8c Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Wed, 29 May 2019 12:47:19 +0200 Subject: [PATCH] Renamed ChangedListeners to LookChangedListeners --- LogicUI/src/era/mi/gui/LogicUICanvas.java | 8 ++--- .../mi/gui/model/components/GUIComponent.java | 34 +++++++++---------- .../gui/model/components/GUIManualSwitch.java | 2 +- .../src/era/mi/gui/model/wires/GUIWire.java | 12 +++---- .../mi/gui/model/wires/WireCrossPoint.java | 2 +- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/LogicUI/src/era/mi/gui/LogicUICanvas.java b/LogicUI/src/era/mi/gui/LogicUICanvas.java index 2115e7b1..55d7d215 100644 --- a/LogicUI/src/era/mi/gui/LogicUICanvas.java +++ b/LogicUI/src/era/mi/gui/LogicUICanvas.java @@ -42,7 +42,7 @@ public class LogicUICanvas extends ZoomableCanvas }; model.addComponentAddedListener(c -> { - c.addComponentChangedListener(redrawConsumer); + c.addComponentLookChangedListener(redrawConsumer); c.addComponentMovedListener(redrawConsumer); c.addPinAddedListener(pinAddedListener); c.addPinRemovedListener(pinRemovedListener); @@ -50,7 +50,7 @@ public class LogicUICanvas extends ZoomableCanvas }); model.addComponentRemovedListener(c -> { - c.removeComponentChangedListener(redrawConsumer); + c.removeComponentLookChangedListener(redrawConsumer); c.removeComponentMovedListener(redrawConsumer); c.removePinAddedListener(pinAddedListener); c.removePinRemovedListener(pinRemovedListener); @@ -58,12 +58,12 @@ public class LogicUICanvas extends ZoomableCanvas }); model.addWireAddedListener(w -> { - w.addWireChangedListener(redrawConsumer); + w.addWireLookChangedListener(redrawConsumer); redrawThreadsafe(); }); model.addWireRemovedListener(w -> { - w.removeWireChangedListener(redrawConsumer); + w.removeWireLookChangedListener(redrawConsumer); redrawThreadsafe(); }); diff --git a/LogicUI/src/era/mi/gui/model/components/GUIComponent.java b/LogicUI/src/era/mi/gui/model/components/GUIComponent.java index dc064617..ccb24a22 100644 --- a/LogicUI/src/era/mi/gui/model/components/GUIComponent.java +++ b/LogicUI/src/era/mi/gui/model/components/GUIComponent.java @@ -17,7 +17,7 @@ public abstract class GUIComponent private final List pins; protected final List pinsUnmodifiable; - private final List> componentChangedListeners; + private final List> componentLookChangedListeners; private final List> componentMovedListeners; private final List> pinAddedListeners; private final List> pinRemovedListeners; @@ -29,7 +29,7 @@ public abstract class GUIComponent this.pins = new ArrayList<>(); this.pinsUnmodifiable = Collections.unmodifiableList(pins); - this.componentChangedListeners = new ArrayList<>(); + this.componentLookChangedListeners = new ArrayList<>(); this.componentMovedListeners = new ArrayList<>(); this.pinAddedListeners = new ArrayList<>(); this.pinRemovedListeners = new ArrayList<>(); @@ -76,20 +76,20 @@ public abstract class GUIComponent } // @formatter:off - public void addComponentChangedListener (Consumer listener) {componentChangedListeners.add (listener);} - public void addComponentMovedListener (Consumer listener) {componentMovedListeners .add (listener);} - public void addPinAddedListener (Consumer listener) {pinAddedListeners .add (listener);} - public void addPinRemovedListener (Consumer listener) {pinRemovedListeners .add (listener);} - - public void removeComponentChangedListener(Consumer listener) {componentChangedListeners.remove(listener);} - public void removeComponentMovedListener (Consumer listener) {componentMovedListeners .remove(listener);} - public void removePinAddedListener (Consumer listener) {pinAddedListeners .remove(listener);} - public void removePinRemovedListener (Consumer listener) {pinRemovedListeners .remove(listener);} - - protected void callComponentChangedListeners( ) {componentChangedListeners.forEach(l -> l.accept(this));} - private void callComponentMovedListeners ( ) {componentMovedListeners .forEach(l -> l.accept(this));} - private void callPinAddedListeners (Pin p) {pinAddedListeners .forEach(l -> l.accept(p ));} - private void callPinRemovedListeners (Pin p) {pinRemovedListeners .forEach(l -> l.accept(p ));} + public void addComponentLookChangedListener (Consumer listener) {componentLookChangedListeners.add (listener);} + public void addComponentMovedListener (Consumer listener) {componentMovedListeners .add (listener);} + public void addPinAddedListener (Consumer listener) {pinAddedListeners .add (listener);} + public void addPinRemovedListener (Consumer listener) {pinRemovedListeners .add (listener);} + + public void removeComponentLookChangedListener(Consumer listener) {componentLookChangedListeners.remove(listener);} + public void removeComponentMovedListener (Consumer listener) {componentMovedListeners .remove(listener);} + public void removePinAddedListener (Consumer listener) {pinAddedListeners .remove(listener);} + public void removePinRemovedListener (Consumer listener) {pinRemovedListeners .remove(listener);} + + protected void callComponentLookChangedListeners( ) {componentLookChangedListeners.forEach(l -> l.accept(this));} + private void callComponentMovedListeners ( ) {componentMovedListeners .forEach(l -> l.accept(this));} + private void callPinAddedListeners (Pin p) {pinAddedListeners .forEach(l -> l.accept(p ));} + private void callPinRemovedListeners (Pin p) {pinRemovedListeners .forEach(l -> l.accept(p ));} // @form atter:on /** @@ -101,7 +101,7 @@ public abstract class GUIComponent { bounds.width = width; bounds.height = height; - callComponentChangedListeners(); + callComponentLookChangedListeners(); } protected void addPin(Pin pin) diff --git a/LogicUI/src/era/mi/gui/model/components/GUIManualSwitch.java b/LogicUI/src/era/mi/gui/model/components/GUIManualSwitch.java index 870a55a4..546b17e2 100644 --- a/LogicUI/src/era/mi/gui/model/components/GUIManualSwitch.java +++ b/LogicUI/src/era/mi/gui/model/components/GUIManualSwitch.java @@ -44,7 +44,7 @@ public class GUIManualSwitch extends GUIComponent this.logicSwitch = logicSwitch; this.end = end; // TODO when ManualSwitch supports it, add listeners - end.addObserver((i, o) -> callComponentChangedListeners()); + end.addObserver((i, o) -> callComponentLookChangedListeners()); } @Override diff --git a/LogicUI/src/era/mi/gui/model/wires/GUIWire.java b/LogicUI/src/era/mi/gui/model/wires/GUIWire.java index c2f03ee5..0f7ff086 100644 --- a/LogicUI/src/era/mi/gui/model/wires/GUIWire.java +++ b/LogicUI/src/era/mi/gui/model/wires/GUIWire.java @@ -18,7 +18,7 @@ public class GUIWire private Pin pin2; private double[] path; - private final List> wireChangedListeners; + private final List> wireLookChangedListeners; private ReadEnd end; @@ -35,7 +35,7 @@ public class GUIWire this.pin1 = pin1; this.pin2 = pin2; - wireChangedListeners = new ArrayList<>(); + wireLookChangedListeners = new ArrayList<>(); pin1.addPinMovedListener(p -> pin1Moved()); pin2.addPinMovedListener(p -> pin2Moved()); @@ -72,15 +72,15 @@ public class GUIWire public void setLogicModelBinding(ReadEnd end) { this.end = end; - end.addObserver((i, o) -> callWireChangedListeners()); + end.addObserver((i, o) -> callWireLookChangedListeners()); } // @formatter:off - public void addWireChangedListener (Consumer listener) {wireChangedListeners.add (listener);} + public void addWireLookChangedListener (Consumer listener) {wireLookChangedListeners.add (listener);} - public void removeWireChangedListener(Consumer listener) {wireChangedListeners.remove(listener);} + public void removeWireLookChangedListener(Consumer listener) {wireLookChangedListeners.remove(listener);} - private void callWireChangedListeners() {wireChangedListeners.forEach(l -> l.accept(this));} + private void callWireLookChangedListeners() {wireLookChangedListeners.forEach(l -> l.accept(this));} // @formatter:on } \ No newline at end of file diff --git a/LogicUI/src/era/mi/gui/model/wires/WireCrossPoint.java b/LogicUI/src/era/mi/gui/model/wires/WireCrossPoint.java index ebe30c30..7c19c13e 100644 --- a/LogicUI/src/era/mi/gui/model/wires/WireCrossPoint.java +++ b/LogicUI/src/era/mi/gui/model/wires/WireCrossPoint.java @@ -28,6 +28,6 @@ public class WireCrossPoint extends GUIComponent public void setLogicModelBinding(ReadEnd end) { this.end = end; - end.addObserver((i, o) -> callComponentChangedListeners()); + end.addObserver((i, o) -> callComponentLookChangedListeners()); } } \ No newline at end of file -- 2.17.1