Rename “friend Sone” to just “friend.”

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 576cdf4..72c36d8 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -347,7 +347,7 @@ public class Core extends AbstractService {
                                                ((SoneShell) friendSone).setRequestUri(new FreenetURI(friendKey)).setName(friendName);
                                        }
                                        addRemoteSone(friendSone);
-                                       sone.addFriendSone(sone);
+                                       sone.addFriend(sone);
                                }
 
                                sone.setModificationCounter(modificationCounter);
@@ -406,7 +406,7 @@ public class Core extends AbstractService {
                                configuration.getStringValue(sonePrefix + "/Reply." + replyId + "/ID").setValue(null);
 
                                int friendId = 0;
-                               for (Sone friend : sone.getFriendSones()) {
+                               for (Sone friend : sone.getFriends()) {
                                        String friendPrefix = sonePrefix + "/Friend." + friendId++;
                                        configuration.getStringValue(friendPrefix + "/ID").setValue(friend.getId());
                                        configuration.getStringValue(friendPrefix + "/Key").setValue(friend.getRequestUri().toString());

diff --git a/src/main/java/net/pterodactylus/sone/data/Sone.java b/src/main/java/net/pterodactylus/sone/data/Sone.java
index e6c9433..7041289 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -173,7 +173,7 @@ public class Sone {
         *
         * @return The friend Sones of this Sone
         */
-       public Set<Sone> getFriendSones() {
+       public Set<Sone> getFriends() {
                return Collections.unmodifiableSet(friendSones);
        }
 
@@ -185,7 +185,7 @@ public class Sone {
         * @return {@code true} if this Sone has the given Sone as a friend,
         *         {@code false} otherwise
         */
-       public boolean hasFriendSone(Sone friendSone) {
+       public boolean hasFriend(Sone friendSone) {
                return friendSones.contains(friendSone);
        }
 
@@ -196,7 +196,7 @@ public class Sone {
         *            The friend Sone to add
         * @return This Sone (for method chaining)
         */
-       public synchronized Sone addFriendSone(Sone friendSone) {
+       public synchronized Sone addFriend(Sone friendSone) {
                if (friendSones.add(friendSone)) {
                        modificationCounter++;
                }
@@ -210,7 +210,7 @@ public class Sone {
         *            The friend Sone to remove
         * @return This Sone (for method chaining)
         */
-       public synchronized Sone removeFriendSone(Sone friendSone) {
+       public synchronized Sone removeFriend(Sone friendSone) {
                if (friendSones.remove(friendSone)) {
                        modificationCounter++;
                }

diff --git a/src/main/java/net/pterodactylus/sone/data/SoneShell.java b/src/main/java/net/pterodactylus/sone/data/SoneShell.java
index 16afea1..9063d31 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/data/SoneShell.java
+++ b/src/main/java/net/pterodactylus/sone/data/SoneShell.java
@@ -178,7 +178,7 @@ public class SoneShell extends Sone implements Shell<Sone> {
         * @return The friend Sones of this Sone
         */
        @Override
-       public Set<Sone> getFriendSones() {
+       public Set<Sone> getFriends() {
                return Collections.unmodifiableSet(friendSones);
        }
 
@@ -191,7 +191,7 @@ public class SoneShell extends Sone implements Shell<Sone> {
         *         {@code false} otherwise
         */
        @Override
-       public boolean hasFriendSone(Sone friendSone) {
+       public boolean hasFriend(Sone friendSone) {
                return friendSones.contains(friendSone);
        }
 
@@ -203,7 +203,7 @@ public class SoneShell extends Sone implements Shell<Sone> {
         * @return This Sone (for method chaining)
         */
        @Override
-       public Sone addFriendSone(Sone friendSone) {
+       public Sone addFriend(Sone friendSone) {
                friendSones.add(friendSone);
                return this;
        }
@@ -216,7 +216,7 @@ public class SoneShell extends Sone implements Shell<Sone> {
         * @return This Sone (for method chaining)
         */
        @Override
-       public Sone removeFriendSone(Sone friendSone) {
+       public Sone removeFriend(Sone friendSone) {
                friendSones.remove(friendSone);
                return this;
        }
@@ -317,7 +317,7 @@ public class SoneShell extends Sone implements Shell<Sone> {
                        Sone sone = new Sone(id, name, requestUri);
                        sone.setProfile(profile);
                        for (Sone friendSone : friendSones) {
-                               sone.addFriendSone(friendSone);
+                               sone.addFriend(friendSone);
                        }
                        for (Post post : posts) {
                                sone.addPost(post);

diff --git a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
index bed5771..b45e140 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
@@ -52,7 +52,7 @@ public class SoneAccessor extends ReflectionAccessor {
                        return getNiceName(sone);
                } else if (member.equals("isFriend")) {
                        Sone currentSone = (Sone) dataProvider.getData("currentSone");
-                       return currentSone.hasFriendSone(sone) ? true : null;
+                       return currentSone.hasFriend(sone) ? true : null;
                } else if (member.equals("isCurrent")) {
                        Sone currentSone = (Sone) dataProvider.getData("currentSone");
                        return currentSone.equals(sone);

diff --git a/src/main/java/net/pterodactylus/sone/web/FollowSonePage.java b/src/main/java/net/pterodactylus/sone/web/FollowSonePage.java
index 39e08f3..ba55e23 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/FollowSonePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/FollowSonePage.java
@@ -52,7 +52,7 @@ public class FollowSonePage extends SoneTemplatePage {
                Sone currentSone = getCurrentSone(request.getToadletContext());
                Sone sone = webInterface.core().getSone(soneId);
                if (!(sone instanceof SoneShell) && !sone.equals(currentSone)) {
-                       currentSone.addFriendSone(sone);
+                       currentSone.addFriend(sone);
                }
                throw new RedirectException("viewSone.html?sone=" + soneId);
        }

diff --git a/src/main/java/net/pterodactylus/sone/web/IndexPage.java b/src/main/java/net/pterodactylus/sone/web/IndexPage.java
index 3965aee..47f2715 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/IndexPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/IndexPage.java
@@ -57,7 +57,7 @@ public class IndexPage extends SoneTemplatePage {
                Sone sone = getCurrentSone(request.getToadletContext());
                List<Post> allPosts = new ArrayList<Post>();
                allPosts.addAll(sone.getPosts());
-               for (Sone friendSone : sone.getFriendSones()) {
+               for (Sone friendSone : sone.getFriends()) {
                        allPosts.addAll(friendSone.getPosts());
                }
                Collections.sort(allPosts, new Comparator<Post>() {