Merged logic into master

[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 cc37c99..46decf5 100644 (file)
--- a/era.mi/src/era/mi/logic/timeline/TimelineEvent.java
+++ b/era.mi/src/era/mi/logic/timeline/TimelineEvent.java
@@ -1,30 +1,30 @@
-package era.mi.logic.timeline;\r
-\r
-/**\r
- * A class that stores all relevant information about an event in the {@link Timeline}. Currently, there is not much relevant information to\r
- * store.\r
- * \r
- * @author Fabian Stemmler\r
- *\r
- */\r
-public class TimelineEvent\r
-{\r
-       private final long timing;\r
-\r
-       TimelineEvent(long timing)\r
-       {\r
-               super();\r
-               this.timing = timing;\r
-       }\r
-\r
-       public long getTiming()\r
-       {\r
-               return timing;\r
-       }\r
-\r
-       @Override\r
-       public String toString()\r
-       {\r
-               return "timestamp: " + timing;\r
-       }\r
+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.
+ * 
+ * @author Fabian Stemmler
+ *
+ */
+public class TimelineEvent
+{
+       private final long timing;
+
+       TimelineEvent(long timing)
+       {
+               super();
+               this.timing = timing;
+       }
+
+       public long getTiming()
+       {
+               return timing;
+       }
+
+       @Override
+       public String toString()
+       {
+               return "timestamp: " + timing;
+       }
 }
\ No newline at end of file