Rename timecode min/max helpers to avoid Comparator conflicts in future Java versions

Author: petergeneric

stdlib/src/main/java/com/peterphi/std/types/TimecodeComparator.java

@@ -125,7 +125,7 @@ public static boolean le(final Timecode a, final Timecode b)
 	 *
 	 * @return
 	 */
-	public static Timecode max(final Timecode... timecodes)
+	public static Timecode maxTimecode(final Timecode... timecodes)
 	{
 		Timecode max = null;
 
@@ -145,7 +145,7 @@ public static Timecode max(final Timecode... timecodes)
 	 *
 	 * @return
 	 */
-	public static Timecode min(final Timecode... timecodes)
+	public static Timecode minTimecode(final Timecode... timecodes)
 	{
 		Timecode min = null;
 

stdlib/src/main/java/com/peterphi/std/types/TimecodeRange.java

@@ -182,8 +182,8 @@ else if (that.within(this.getStart()) || that.within(this.getEnd()))
 	 */
 	public static TimecodeRange merge(TimecodeRange a, TimecodeRange b)
 	{
-		final Timecode start = TimecodeComparator.min(a.getStart(), b.getStart());
-		final Timecode end = TimecodeComparator.max(a.getEnd(), b.getEnd());
+		final Timecode start = TimecodeComparator.minTimecode(a.getStart(), b.getStart());
+		final Timecode end = TimecodeComparator.maxTimecode(a.getEnd(), b.getEnd());
 
 		return new TimecodeRange(start, end);
 	}

stdlib/src/test/java/com/peterphi/std/types/TimecodeComparatorTest.java

@@ -77,7 +77,7 @@ public void testBetween()
 	@Test
 	public void testMin()
 	{
-		Timecode min = TimecodeComparator.min(Timecode.getInstance("00:00:00:00@25"),
+		Timecode min = TimecodeComparator.minTimecode(Timecode.getInstance("00:00:00:00@25"),
 		                                      Timecode.getInstance("-10:10:10:10@25"),
 		                                      Timecode.getInstance("-10:00:00:00@25"),
 		                                      Timecode.getInstance("-09:09:09:09@25"),
@@ -90,7 +90,7 @@ public void testMin()
 	@Test
 	public void testMax()
 	{
-		Timecode max = TimecodeComparator.max(Timecode.getInstance("00:00:00:00@25"),
+		Timecode max = TimecodeComparator.maxTimecode(Timecode.getInstance("00:00:00:00@25"),
 		                                      Timecode.getInstance("-10:10:10:10@25"),
 		                                      Timecode.getInstance("-10:00:00:00@25"),
 		                                      Timecode.getInstance("-09:09:09:09@25"),