mirror of
https://github.com/2OOP/pism.git
synced 2026-02-04 10:54:51 +00:00
Merge branch 'Widgets' into Development
# Conflicts: # app/src/main/java/org/toop/app/App.java # app/src/main/java/org/toop/app/canvas/ReversiCanvas.java # app/src/main/java/org/toop/app/game/ReversiGame.java # app/src/main/java/org/toop/app/game/TicTacToeGame.java # app/src/main/java/org/toop/app/view/displays/SongDisplay.java # app/src/main/java/org/toop/local/AppContext.java
This commit is contained in:
@@ -46,19 +46,16 @@ public class EventFlow {
|
||||
/** Empty constructor (event must be added via {@link #addPostEvent(Class, Object...)}). */
|
||||
public EventFlow() {}
|
||||
|
||||
// New: accept an event instance directly
|
||||
public EventFlow addPostEvent(EventType event) {
|
||||
this.event = event;
|
||||
return this;
|
||||
}
|
||||
|
||||
// Optional: accept a Supplier<EventType> to defer construction
|
||||
public EventFlow addPostEvent(Supplier<? extends EventType> eventSupplier) {
|
||||
this.event = eventSupplier.get();
|
||||
return this;
|
||||
}
|
||||
|
||||
// Keep the old class+args version if needed
|
||||
public <T extends EventType> EventFlow addPostEvent(Class<T> eventClass, Object... args) {
|
||||
try {
|
||||
boolean isUuidEvent = UniqueEvent.class.isAssignableFrom(eventClass);
|
||||
|
||||
Reference in New Issue
Block a user