projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged logicui into master
[Mograsim.git]
/
era.mi
/
src
/
era
/
mi
/
logic
/
timeline
/
Timeline.java
diff --git
a/era.mi/src/era/mi/logic/timeline/Timeline.java
b/era.mi/src/era/mi/logic/timeline/Timeline.java
index
63d7395
..
8107db9
100644
(file)
--- a/
era.mi/src/era/mi/logic/timeline/Timeline.java
+++ b/
era.mi/src/era/mi/logic/timeline/Timeline.java
@@
-90,8
+90,7
@@
public class Timeline
{
if (!hasNext())
return -1;
{
if (!hasNext())
return -1;
- else
- return events.peek().timing;
+ return events.peek().timing;
}
public void reset()
}
public void reset()
@@
-127,7
+126,7
@@
public class Timeline
private class InnerEvent
{
private class InnerEvent
{
-
private
final long timing;
+ final long timing;
private final TimelineEventHandler function;
private final TimelineEvent event;
private final TimelineEventHandler function;
private final TimelineEvent event;