X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FReply.java;h=705b1e417aea34a7bf962402a7b935db1494d9c6;hb=f049280a40ddf05f02400e7f0d93a24dea4545c2;hp=a686023fad004e90f45c8e0d52d21a1ba0585a37;hpb=6f019de1d4d9742981d851ac3c9097cca8bff58e;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/data/Reply.java b/src/main/java/net/pterodactylus/sone/data/Reply.java
index a686023..705b1e4 100644
--- a/src/main/java/net/pterodactylus/sone/data/Reply.java
+++ b/src/main/java/net/pterodactylus/sone/data/Reply.java
@@ -1,5 +1,5 @@
 /*
- * Sone - Reply.java - Copyright © 2010–2013 David Roden
+ * Sone - Reply.java - Copyright © 2010–2020 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,22 +26,8 @@ import com.google.common.base.Predicate;
  *
  * @param <T>
  *            The type of the reply
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public interface Reply<T extends Reply<T>> {
-
-	/** Comparator that sorts replies ascending by time. */
-	public static final Comparator<? super Reply<?>> TIME_COMPARATOR = new Comparator<Reply<?>>() {
-
-		/**
-		 * {@inheritDoc}
-		 */
-		@Override
-		public int compare(Reply<?> leftReply, Reply<?> rightReply) {
-			return (int) Math.max(Integer.MIN_VALUE, Math.min(Integer.MAX_VALUE, leftReply.getTime() - rightReply.getTime()));
-		}
-
-	};
+public interface Reply<T extends Reply<T>> extends Identified {
 
 	/** Filter for replies with timestamps from the future. */
 	public static final Predicate<Reply<?>> FUTURE_REPLY_FILTER = new Predicate<Reply<?>>() {
@@ -51,7 +37,7 @@ public interface Reply<T extends Reply<T>> {
 		 */
 		@Override
 		public boolean apply(Reply<?> reply) {
-			return reply.getTime() <= System.currentTimeMillis();
+			return (reply != null) && (reply.getTime() <= System.currentTimeMillis());
 		}
 
 	};