Remove some unnecessary qualifiers, whitespace, and comments

[Sone.git] / src / main / java / net / pterodactylus / sone / data / Reply.java

diff --git a/src/main/java/net/pterodactylus/sone/data/Reply.java b/src/main/java/net/pterodactylus/sone/data/Reply.java
index 935c79b..cf50a5c 100644 (file)
--- 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 © 2011 David Roden
+ * Sone - Reply.java - Copyright © 2010–2013 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
@@ -19,41 +19,32 @@ package net.pterodactylus.sone.data;
 
 import java.util.Comparator;
 
-import net.pterodactylus.util.filter.Filter;
+import com.google.common.base.Predicate;
+import com.google.common.primitives.Longs;
 
 /**
- * Abstract base class for all replies.
+ * Defines methods common for all replies.
  *
  * @param <T>
  *            The type of the reply
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public abstract class 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<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 Filter<Reply<?>> FUTURE_REPLY_FILTER = new Filter<Reply<?>>() {
-
-               /**
-                * {@inheritDoc}
-                */
+       Predicate<Reply<?>> FUTURE_REPLY_FILTER = new Predicate<Reply<?>>() {
                @Override
-               public boolean filterObject(Reply<?> reply) {
-                       return reply.getTime() <= System.currentTimeMillis();
+               public boolean apply(Reply<?> reply) {
+                       return (reply != null) && (reply.getTime() <= System.currentTimeMillis());
                }
-
        };
 
        /**
@@ -61,27 +52,44 @@ public abstract class Reply<T extends Reply<T>> {
         *
         * @return The ID of the reply
         */
-       public abstract String getId();
+       String getId();
+       String getInternalId();
 
        /**
         * Returns the Sone that posted this reply.
         *
         * @return The Sone that posted this reply
         */
-       public abstract Sone getSone();
+       Sone getSone();
 
        /**
         * Returns the time of the reply.
         *
         * @return The time of the reply (in milliseconds since Jan 1, 1970 UTC)
         */
-       public abstract long getTime();
+       long getTime();
 
        /**
         * Returns the text of the reply.
         *
         * @return The text of the reply
         */
-       public abstract String getText();
+       String getText();
+
+       /**
+        * Returns whether this reply is known.
+        *
+        * @return {@code true} if this reply is known, {@code false} otherwise
+        */
+       boolean isKnown();
+
+       /**
+        * Sets whether this reply is known.
+        *
+        * @param known
+        *              {@code true} if this reply is known, {@code false} otherwise
+        * @return This reply
+        */
+       T setKnown(boolean known);
 
 }