Abandon logging that does not work with Freenet’s logger at all

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

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 b895304..f7ebfb1 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/data/impl/SoneImpl.java
+++ b/src/main/java/net/pterodactylus/sone/data/impl/SoneImpl.java
@@ -40,6 +40,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;
 
@@ -58,7 +59,10 @@ import com.google.common.hash.Hashing;
 public class SoneImpl implements Sone {
 
        /** The logger. */
-       private static final Logger logger = getLogger("Sone.Data");
+       private static final Logger logger = getLogger(SoneImpl.class.getName());
+
+       /** The database. */
+       private final Database database;
 
        /** The ID of this Sone. */
        private final String id;
@@ -87,9 +91,6 @@ public class SoneImpl implements Sone {
        /** Whether this Sone is known. */
        private volatile boolean known;
 
-       /** All friend Sones. */
-       private final Set<String> friendSones = new CopyOnWriteArraySet<String>();
-
        /** All posts. */
        private final Set<Post> posts = new CopyOnWriteArraySet<Post>();
 
@@ -111,12 +112,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;
@@ -339,8 +342,8 @@ public class SoneImpl implements Sone {
         *
         * @return The friend Sones of this Sone
         */
-       public List<String> getFriends() {
-               return new ArrayList<String>(friendSones);
+       public Collection<String> getFriends() {
+               return database.getFriends(this);
        }
 
        /**
@@ -352,33 +355,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);
        }
 
        /**
@@ -711,7 +688,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() + ")]";
        }
 
 }