From: Daniel Kirschten <daniel.kirschten@gmx.de>
Date: Wed, 15 May 2019 22:53:29 +0000 (+0200)
Subject: Added nextEventTime(); added NewEventListeners
X-Git-Url: https://mograsim.net/gitweb/?a=commitdiff_plain;h=de79184d60c80d6775b368e61d3368de032952e8;p=Mograsim.git

Added nextEventTime(); added NewEventListeners
---

diff --git a/era.mi/src/era/mi/logic/timeline/Timeline.java b/era.mi/src/era/mi/logic/timeline/Timeline.java
index 8b3c3255..3e3b9f6d 100644
--- a/era.mi/src/era/mi/logic/timeline/Timeline.java
+++ b/era.mi/src/era/mi/logic/timeline/Timeline.java
@@ -1,6 +1,9 @@
 package era.mi.logic.timeline;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.PriorityQueue;
+import java.util.function.Consumer;
 
 /**
  * Orders Events by the time they are due to be executed. Can execute Events individually.
@@ -12,6 +15,8 @@ public class Timeline
 	private PriorityQueue<InnerEvent> events;
 	private long currentTime = 0;
 	
+	private final List<Consumer<TimelineEvent>> eventAddedListener;
+	
 	public Timeline(int initCapacity)
 	{
 		events = new PriorityQueue<InnerEvent>(initCapacity, (a, b) -> {
@@ -20,6 +25,8 @@ public class Timeline
 				return 0;
 			return difference < 0 ? -1 : 1;
 		});
+		
+		eventAddedListener = new ArrayList<>();
 	}
 	
 	public boolean hasNext()
@@ -79,12 +86,29 @@ public class Timeline
 	{
 		return currentTime;
 	}
+
+	public long nextEventTime()
+	{
+		if(!hasNext())
+			return -1;
+		else
+			return events.peek().timing;
+	}
 	
 	public void reset()
 	{
 		events.clear();
 		currentTime = 0;
 	}
+
+	public void addEventAddedListener(Consumer<TimelineEvent> listener)
+	{
+		eventAddedListener.add(listener);
+	}
+	public void removeEventAddedListener(Consumer<TimelineEvent> listener)
+	{
+		eventAddedListener.remove(listener);
+	}
 	
 	/**
 	 * Adds an Event to the {@link Timeline}
@@ -94,7 +118,9 @@ public class Timeline
 	public void addEvent(TimelineEventHandler function, int relativeTiming)
 	{
 		long timing = currentTime + relativeTiming;
-		events.add(new InnerEvent(function, new TimelineEvent(timing), timing));
+		TimelineEvent event = new TimelineEvent(timing);
+		events.add(new InnerEvent(function, event, timing));
+		eventAddedListener.forEach(l -> l.accept(event));
 	}
 	
 	private class InnerEvent