X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FReply.java;h=cf50a5cb0df9ac2fd72f359ad7f10b22d4aa5655;hb=3c93a3f01e3cab17bda2b97354ffee23929cb26a;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..cf50a5c 100644
--- a/src/main/java/net/pterodactylus/sone/data/Reply.java
+++ b/src/main/java/net/pterodactylus/sone/data/Reply.java
@@ -20,6 +20,7 @@ package net.pterodactylus.sone.data;
 import java.util.Comparator;
 
 import com.google.common.base.Predicate;
+import com.google.common.primitives.Longs;
 
 /**
  * Defines methods common for all replies.
@@ -28,32 +29,22 @@ import com.google.common.base.Predicate;
  *            The type of the reply
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public interface Reply<T extends Reply<T>> {
+public interface Reply<T extends Reply<T>> extends Identified {
 
 	/** Comparator that sorts replies ascending by time. */
-	public static final Comparator<? super Reply<?>> TIME_COMPARATOR = new Comparator<Reply<?>>() {
-
-		/**
-		 * {@inheritDoc}
-		 */
+	Comparator<? super Reply<?>> TIME_COMPARATOR = new Comparator<Reply<?>>() {
 		@Override
 		public int compare(Reply<?> leftReply, Reply<?> rightReply) {
-			return (int) Math.max(Integer.MIN_VALUE, Math.min(Integer.MAX_VALUE, leftReply.getTime() - rightReply.getTime()));
+			return Longs.compare(leftReply.getTime(), rightReply.getTime());
 		}
-
 	};
 
 	/** Filter for replies with timestamps from the future. */
-	public static final Predicate<Reply<?>> FUTURE_REPLY_FILTER = new Predicate<Reply<?>>() {
-
-		/**
-		 * {@inheritDoc}
-		 */
+	Predicate<Reply<?>> FUTURE_REPLY_FILTER = new Predicate<Reply<?>>() {
 		@Override
 		public boolean apply(Reply<?> reply) {
-			return reply.getTime() <= System.currentTimeMillis();
+			return (reply != null) && (reply.getTime() <= System.currentTimeMillis());
 		}
-
 	};
 
 	/**
@@ -61,43 +52,44 @@ public interface Reply<T extends Reply<T>> {
 	 *
 	 * @return The ID of the reply
 	 */
-	public String getId();
+	String getId();
+	String getInternalId();
 
 	/**
 	 * Returns the Sone that posted this reply.
 	 *
 	 * @return The Sone that posted this reply
 	 */
-	public Sone getSone();
+	Sone getSone();
 
 	/**
 	 * Returns the time of the reply.
 	 *
 	 * @return The time of the reply (in milliseconds since Jan 1, 1970 UTC)
 	 */
-	public long getTime();
+	long getTime();
 
 	/**
 	 * Returns the text of the reply.
 	 *
 	 * @return The text of the reply
 	 */
-	public String getText();
+	String getText();
 
 	/**
 	 * Returns whether this reply is known.
 	 *
 	 * @return {@code true} if this reply is known, {@code false} otherwise
 	 */
-	public boolean isKnown();
+	boolean isKnown();
 
 	/**
 	 * Sets whether this reply is known.
 	 *
 	 * @param known
-	 *            {@code true} if this reply is known, {@code false} otherwise
+	 * 		{@code true} if this reply is known, {@code false} otherwise
 	 * @return This reply
 	 */
-	public T setKnown(boolean known);
+	T setKnown(boolean known);
 
 }