projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
e9b7a1d
..
cf50a5c
100644
(file)
--- 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 java.util.Comparator;
import com.google.common.base.Predicate;
+import com.google.common.primitives.Longs;
/**
* Defines methods common for all replies.
/**
* Defines methods common for all replies.
@@
-31,29
+32,19
@@
import com.google.common.base.Predicate;
public interface Reply<T extends Reply<T>> extends Identified {
/** Comparator that sorts replies ascending by time. */
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) {
@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. */
};
/** 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 != null) && (reply.getTime() <= System.currentTimeMillis());
}
@Override
public boolean apply(Reply<?> reply) {
return (reply != null) && (reply.getTime() <= System.currentTimeMillis());
}
-
};
/**
};
/**
@@
-61,43
+52,44
@@
public interface Reply<T extends Reply<T>> extends Identified {
*
* @return The ID of the reply
*/
*
* @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
*/
/**
* 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)
*/
/**
* 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
*/
/**
* 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
*/
/**
* 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
/**
* 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
*/
* @return This reply
*/
-
public
T setKnown(boolean known);
+ T setKnown(boolean known);
}
}