projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'partial-rewrite' into next
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
data
/
impl
/
PostReplyImpl.java
diff --git
a/src/main/java/net/pterodactylus/sone/data/impl/PostReplyImpl.java
b/src/main/java/net/pterodactylus/sone/data/impl/PostReplyImpl.java
index
361a2e9
..
30badf7
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/data/impl/PostReplyImpl.java
+++ b/
src/main/java/net/pterodactylus/sone/data/impl/PostReplyImpl.java
@@
-17,9
+17,12
@@
package net.pterodactylus.sone.data.impl;
package net.pterodactylus.sone.data.impl;
-import net.pterodactylus.sone.core.PostProvider;
import net.pterodactylus.sone.data.Post;
import net.pterodactylus.sone.data.PostReply;
import net.pterodactylus.sone.data.Post;
import net.pterodactylus.sone.data.PostReply;
+import net.pterodactylus.sone.database.PostProvider;
+import net.pterodactylus.sone.database.SoneProvider;
+
+import com.google.common.base.Optional;
/**
* Simple {@link PostReply} implementation.
/**
* Simple {@link PostReply} implementation.
@@
-32,18
+35,28
@@
public class PostReplyImpl extends ReplyImpl<PostReply> implements PostReply {
private final PostProvider postProvider;
/** The Post this reply refers to. */
private final PostProvider postProvider;
/** The Post this reply refers to. */
- private
volatile
String postId;
+ private
final
String postId;
/**
* Creates a new reply.
*
/**
* Creates a new reply.
*
+ * @param soneProvider
+ * The Sone provider
* @param postProvider
* The post provider
* @param id
* The ID of the reply
* @param postProvider
* The post provider
* @param id
* The ID of the reply
+ * @param soneId
+ * The ID of the Sone of the reply
+ * @param time
+ * The time of the reply
+ * @param text
+ * The text of the reply
+ * @param postId
+ * The ID of the post this reply refers to
*/
*/
- public PostReplyImpl(
PostProvider postProvider, String i
d) {
- super(
id
);
+ public PostReplyImpl(
SoneProvider soneProvider, PostProvider postProvider, String id, String soneId, long time, String text, String postI
d) {
+ super(
soneProvider, id, soneId, time, text
);
this.postProvider = postProvider;
this.postId = postId;
}
this.postProvider = postProvider;
this.postId = postId;
}
@@
-53,24
+66,19
@@
public class PostReplyImpl extends ReplyImpl<PostReply> implements PostReply {
//
/**
//
/**
- * {@inheritDoc}
+ * {@inheritDoc
s
}
*/
@Override
*/
@Override
- public
Post getPost
() {
- return post
Provider.getPost(postId)
;
+ public
String getPostId
() {
+ return post
Id
;
}
/**
}
/**
- * Sets the post this reply refers to.
- *
- * @param postId
- * The ID of the post to reply to
- * @return This reply (for method chaining)
+ * {@inheritDoc}
*/
@Override
*/
@Override
- public PostReply setPost(String postId) {
- this.postId = postId;
- return this;
+ public Optional<Post> getPost() {
+ return postProvider.getPost(postId);
}
}
}
}