Changeset 57 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder

Timestamp:

08/14/2017 02:46:52 PM (9 years ago)

Author:

bmcguffin

Message:

Added test cases for TimeSlice? class. Added a reference file containing a single timeslice.

File:

• trunk/src/scriptbuilder/structures/TimeSlice.java (modified) (1 diff)

trunk/src/scriptbuilder/structures/TimeSlice.java

@@ -181 +181 @@
     public int compareTo(Object o)
     {
-        TimeSlice other = (TimeSlice) o;
-        if (this.getTime() < other.getTime())
-        {
-            return -1;
-        }
-        else if (this.getTime() > other.getTime())
-        {
-            return 1;
-        }
-        else
-        {
-            return 0;
-        }
+        if (o instanceof TimeSlice)
+        {
+            TimeSlice other = (TimeSlice) o;
+            if (this.getTime() < other.getTime())
+            {
+                return -1;
+            }
+            else if (this.getTime() > other.getTime())
+            {
+                return 1;
+            }
+        }
+        return 0;
     }