From: David ‘Bombe’ Roden Date: Wed, 28 Sep 2011 18:27:58 +0000 (+0200) Subject: Move common fields and setters to Reply. X-Git-Tag: 0.7.2^2~11 X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=bd84cd0b9cba986052fd8e2eac16e86825814fc6;p=Sone.git Move common fields and setters to Reply. --- diff --git a/src/main/java/net/pterodactylus/sone/data/PostReply.java b/src/main/java/net/pterodactylus/sone/data/PostReply.java index 23f310d..3222d9d 100644 --- a/src/main/java/net/pterodactylus/sone/data/PostReply.java +++ b/src/main/java/net/pterodactylus/sone/data/PostReply.java @@ -27,21 +27,9 @@ import java.util.UUID; */ public class PostReply extends Reply { - /** The ID of the reply. */ - private final UUID id; - - /** The Sone that posted this reply. */ - private volatile Sone sone; - /** The Post this reply refers to. */ private volatile Post post; - /** The time of the reply. */ - private volatile long time; - - /** The text of the reply. */ - private volatile String text; - /** * Creates a new reply. * @@ -97,11 +85,8 @@ public class PostReply extends Reply { * The text of the reply */ public PostReply(String id, Sone sone, Post post, long time, String text) { - this.id = UUID.fromString(id); - this.sone = sone; + super(id, sone, time, text); this.post = post; - this.time = time; - this.text = text; } // @@ -109,34 +94,6 @@ public class PostReply extends Reply { // /** - * {@inheritDoc} - */ - @Override - public String getId() { - return id.toString(); - } - - /** - * {@inheritDoc} - */ - @Override - public Sone getSone() { - return sone; - } - - /** - * Sets the Sone that posted this reply. - * - * @param sone - * The Sone that posted this reply - * @return This reply (for method chaining) - */ - public PostReply setSone(Sone sone) { - this.sone = sone; - return this; - } - - /** * Returns the post this reply refers to. * * @return The post this reply refers to @@ -157,76 +114,4 @@ public class PostReply extends Reply { return this; } - /** - * {@inheritDoc} - */ - @Override - public long getTime() { - return time; - } - - /** - * Sets the time of this reply. - * - * @param time - * The time of this reply (in milliseconds since Jan 1, 1970 UTC) - * @return This reply (for method chaining) - */ - public PostReply setTime(long time) { - this.time = time; - return this; - } - - /** - * {@inheritDoc} - */ - @Override - public String getText() { - return text; - } - - /** - * Sets the text of this reply. - * - * @param text - * The text of this reply - * @return This reply (for method chaining) - */ - public PostReply setText(String text) { - this.text = text; - return this; - } - - // - // OBJECT METHODS - // - - /** - * {@inheritDoc} - */ - @Override - public int hashCode() { - return id.hashCode(); - } - - /** - * {@inheritDoc} - */ - @Override - public boolean equals(Object object) { - if (!(object instanceof PostReply)) { - return false; - } - PostReply reply = (PostReply) object; - return reply.id.equals(id); - } - - /** - * {@inheritDoc} - */ - @Override - public String toString() { - return getClass().getName() + "[id=" + id + ",sone=" + sone + ",post=" + post + ",time=" + time + ",text=" + text + "]"; - } - } diff --git a/src/main/java/net/pterodactylus/sone/data/Reply.java b/src/main/java/net/pterodactylus/sone/data/Reply.java index 935c79b..780fe69 100644 --- a/src/main/java/net/pterodactylus/sone/data/Reply.java +++ b/src/main/java/net/pterodactylus/sone/data/Reply.java @@ -18,6 +18,7 @@ package net.pterodactylus.sone.data; import java.util.Comparator; +import java.util.UUID; import net.pterodactylus.util.filter.Filter; @@ -56,32 +57,166 @@ public abstract class Reply> { }; + /** The ID of the reply. */ + private final String id; + + /** The Sone that created this reply. */ + private volatile Sone sone; + + /** The time of the reply. */ + private volatile long time; + + /** The text of the reply. */ + private volatile String text; + + /** + * Creates a new reply with the given ID. + * + * @param id + * The ID of the reply + */ + protected Reply(String id) { + this(id, null, 0, null); + } + + /** + * Creates a new reply with a new random ID. + * + * @param sone + * The Sone of the reply + * @param time + * The time of the reply + * @param text + * The text of the reply + */ + protected Reply(Sone sone, long time, String text) { + this(UUID.randomUUID().toString(), sone, time, text); + } + + /** + * Creates a new reply. + * + * @param id + * The ID of the reply + * @param sone + * The Sone of the reply + * @param time + * The time of the reply + * @param text + * The text of the reply + */ + protected Reply(String id, Sone sone, long time, String text) { + this.id = id; + this.sone = sone; + this.time = time; + this.text = text; + } + /** * Returns the ID of the reply. * * @return The ID of the reply */ - public abstract String getId(); + public String getId() { + return id; + } /** * Returns the Sone that posted this reply. * * @return The Sone that posted this reply */ - public abstract Sone getSone(); + public Sone getSone() { + return sone; + } + + /** + * Sets the Sone that posted this reply. + * + * @param sone + * The Sone that posted this reply + * @return This reply (for method chaining) + */ + @SuppressWarnings("unchecked") + public T setSone(Sone sone) { + this.sone = sone; + return (T) this; + } /** * Returns the time of the reply. * * @return The time of the reply (in milliseconds since Jan 1, 1970 UTC) */ - public abstract long getTime(); + public long getTime() { + return time; + } + + /** + * Sets the time of this reply. + * + * @param time + * The time of this reply (in milliseconds since Jan 1, 1970 UTC) + * @return This reply (for method chaining) + */ + @SuppressWarnings("unchecked") + public T setTime(long time) { + this.time = time; + return (T) this; + } /** * Returns the text of the reply. * * @return The text of the reply */ - public abstract String getText(); + public String getText() { + return text; + } + + /** + * Sets the text of this reply. + * + * @param text + * The text of this reply + * @return This reply (for method chaining) + */ + @SuppressWarnings("unchecked") + public T setText(String text) { + this.text = text; + return (T) this; + } + + // + // OBJECT METHODS + // + + /** + * {@inheritDoc} + */ + @Override + public int hashCode() { + return id.hashCode(); + } + + /** + * {@inheritDoc} + */ + @Override + public boolean equals(Object object) { + if (!(object instanceof Reply)) { + return false; + } + Reply reply = (Reply) object; + return reply.id.equals(id); + } + + /** + * {@inheritDoc} + */ + @Override + public String toString() { + return getClass().getName() + "[id=" + id + ",sone=" + sone + ",time=" + time + ",text=" + text + "]"; + } }