projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'development' of
[Mograsim.git]
/
era.mi
/
src
/
era
/
mi
/
logic
/
timeline
/
TimelineEvent.java
diff --git
a/era.mi/src/era/mi/logic/timeline/TimelineEvent.java
b/era.mi/src/era/mi/logic/timeline/TimelineEvent.java
index
c5fe16c
..
46decf5
100644
(file)
--- a/
era.mi/src/era/mi/logic/timeline/TimelineEvent.java
+++ b/
era.mi/src/era/mi/logic/timeline/TimelineEvent.java
@@
-1,14
+1,16
@@
package era.mi.logic.timeline;
/**
package era.mi.logic.timeline;
/**
- * A class that stores all relevant information about an event in the {@link Timeline}. Currently, there is not much relevant information to store.
+ * A class that stores all relevant information about an event in the {@link Timeline}. Currently, there is not much relevant information to
+ * store.
+ *
* @author Fabian Stemmler
*
*/
public class TimelineEvent
{
private final long timing;
* @author Fabian Stemmler
*
*/
public class TimelineEvent
{
private final long timing;
-
+
TimelineEvent(long timing)
{
super();
TimelineEvent(long timing)
{
super();
@@
-19,7
+21,8
@@
public class TimelineEvent
{
return timing;
}
{
return timing;
}
-
+
+ @Override
public String toString()
{
return "timestamp: " + timing;
public String toString()
{
return "timestamp: " + timing;