X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2Fimpl%2FSoneImpl.java;h=551e2298b8f62c512e2e20c534e86b693c3b0d15;hb=56a2875b53db60fc26dd7ee089d721227508703c;hp=32cefb16398b04b3bcb16ddf5f287eedd488df51;hpb=1bc68398c8912a992d87087b79ad9bbea8964c76;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/data/impl/SoneImpl.java b/src/main/java/net/pterodactylus/sone/data/impl/SoneImpl.java
index 32cefb1..551e229 100644
--- a/src/main/java/net/pterodactylus/sone/data/impl/SoneImpl.java
+++ b/src/main/java/net/pterodactylus/sone/data/impl/SoneImpl.java
@@ -32,8 +32,8 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import net.pterodactylus.sone.data.Album;
-import net.pterodactylus.sone.data.AlbumImpl;
import net.pterodactylus.sone.data.Client;
+import net.pterodactylus.sone.data.LocalSone;
import net.pterodactylus.sone.data.Post;
import net.pterodactylus.sone.data.PostReply;
import net.pterodactylus.sone.data.Profile;
@@ -41,6 +41,7 @@ import net.pterodactylus.sone.data.Reply;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.data.SoneOptions;
import net.pterodactylus.sone.data.SoneOptions.DefaultSoneOptions;
+import net.pterodactylus.sone.database.Database;
import net.pterodactylus.sone.freenet.wot.Identity;
import net.pterodactylus.sone.freenet.wot.OwnIdentity;
@@ -56,11 +57,14 @@ import com.google.common.hash.Hashing;
*
* @author David âBombeâ Roden
*/
-public class SoneImpl implements Sone {
+public class SoneImpl implements LocalSone {
/** The logger. */
private static final Logger logger = getLogger("Sone.Data");
+ /** The database. */
+ private final Database database;
+
/** The ID of this Sone. */
private final String id;
@@ -88,9 +92,6 @@ public class SoneImpl implements Sone {
/** Whether this Sone is known. */
private volatile boolean known;
- /** All friend Sones. */
- private final Set friendSones = new CopyOnWriteArraySet();
-
/** All posts. */
private final Set posts = new CopyOnWriteArraySet();
@@ -112,12 +113,14 @@ public class SoneImpl implements Sone {
/**
* Creates a new Sone.
*
+ * @param database The database
* @param identity
* The identity of the Sone
* @param local
* {@code true} if the Sone is a local Sone, {@code false} otherwise
*/
- public SoneImpl(Identity identity, boolean local) {
+ public SoneImpl(Database database, Identity identity, boolean local) {
+ this.database = database;
this.id = identity.getId();
this.identity = identity;
this.local = local;
@@ -340,8 +343,8 @@ public class SoneImpl implements Sone {
*
* @return The friend Sones of this Sone
*/
- public List getFriends() {
- return new ArrayList(friendSones);
+ public Collection getFriends() {
+ return database.getFriends(this);
}
/**
@@ -353,33 +356,7 @@ public class SoneImpl implements Sone {
* false} otherwise
*/
public boolean hasFriend(String friendSoneId) {
- return friendSones.contains(friendSoneId);
- }
-
- /**
- * Adds the given Sone as a friend Sone.
- *
- * @param friendSone
- * The friend Sone to add
- * @return This Sone (for method chaining)
- */
- public Sone addFriend(String friendSone) {
- if (!friendSone.equals(id)) {
- friendSones.add(friendSone);
- }
- return this;
- }
-
- /**
- * Removes the given Sone as a friend Sone.
- *
- * @param friendSoneId
- * The ID of the friend Sone to remove
- * @return This Sone (for method chaining)
- */
- public Sone removeFriend(String friendSoneId) {
- friendSones.remove(friendSoneId);
- return this;
+ return database.isFriend(this, friendSoneId);
}
/**
@@ -712,7 +689,7 @@ public class SoneImpl implements Sone {
/** {@inheritDoc} */
@Override
public String toString() {
- return getClass().getName() + "[identity=" + identity + ",friends(" + friendSones.size() + "),posts(" + posts.size() + "),replies(" + replies.size() + "),albums(" + getRootAlbum().getAlbums().size() + ")]";
+ return getClass().getName() + "[identity=" + identity + ",posts(" + posts.size() + "),replies(" + replies.size() + "),albums(" + getRootAlbum().getAlbums().size() + ")]";
}
}