Rename “add friend” action to “follow Sone” for now.

diff --git a/src/main/java/net/pterodactylus/sone/web/AddFriendPage.java b/src/main/java/net/pterodactylus/sone/web/AddFriendPage.java
deleted file mode 100644 (file)
index 3b0d904..0000000
--- a/src/main/java/net/pterodactylus/sone/web/AddFriendPage.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Sone - AddFriendPage.java - Copyright © 2010 David Roden
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.pterodactylus.sone.web;
-
-import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.data.SoneShell;
-import net.pterodactylus.util.template.Template;
-
-/**
- * This page lets the user add another Sone as a friend Sone.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class AddFriendPage extends SoneTemplatePage {
-
-       /**
-        * @param template
-        *            The template to render
-        * @param webInterface
-        *            The Sone web interface
-        */
-       public AddFriendPage(Template template, WebInterface webInterface) {
-               super("addFriend.html", template, "Page.AddFriend.Title", webInterface);
-       }
-
-       //
-       // TEMPLATEPAGE METHODS
-       //
-
-       /**
-        * {@inheritDoc}
-        */
-       @Override
-       protected void processTemplate(Request request, Template template) throws RedirectException {
-               super.processTemplate(request, template);
-               String soneId = request.getHttpRequest().getParam("sone");
-               Sone sone = webInterface.core().getSone(soneId);
-               if (!(sone instanceof SoneShell)) {
-                       Sone currentSone = getCurrentSone(request.getToadletContext());
-                       currentSone.addFriendSone(sone);
-               }
-               throw new RedirectException("viewSone.html?sone=" + soneId);
-       }
-
-       //
-       // SONETEMPLATEPAGE METHODS
-       //
-
-       /**
-        * {@inheritDoc}
-        */
-       @Override
-       protected boolean requiresLogin() {
-               return true;
-       }
-
-}

diff --git a/src/main/java/net/pterodactylus/sone/web/FollowSonePage.java b/src/main/java/net/pterodactylus/sone/web/FollowSonePage.java
new file mode 100644 (file)
index 0000000..2e9f2fe
--- /dev/null
+++ b/src/main/java/net/pterodactylus/sone/web/FollowSonePage.java
@@ -0,0 +1,72 @@
+/*
+ * Sone - FollowSonePage.java - Copyright © 2010 David Roden
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.pterodactylus.sone.web;
+
+import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.data.SoneShell;
+import net.pterodactylus.util.template.Template;
+
+/**
+ * This page lets the user follow another Sone.
+ *
+ * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
+ */
+public class FollowSonePage extends SoneTemplatePage {
+
+       /**
+        * @param template
+        *            The template to render
+        * @param webInterface
+        *            The Sone web interface
+        */
+       public FollowSonePage(Template template, WebInterface webInterface) {
+               super("followSone.html", template, "Page.FollowSone.Title", webInterface);
+       }
+
+       //
+       // TEMPLATEPAGE METHODS
+       //
+
+       /**
+        * {@inheritDoc}
+        */
+       @Override
+       protected void processTemplate(Request request, Template template) throws RedirectException {
+               super.processTemplate(request, template);
+               String soneId = request.getHttpRequest().getParam("sone");
+               Sone sone = webInterface.core().getSone(soneId);
+               if (!(sone instanceof SoneShell)) {
+                       Sone currentSone = getCurrentSone(request.getToadletContext());
+                       currentSone.addFriendSone(sone);
+               }
+               throw new RedirectException("viewSone.html?sone=" + soneId);
+       }
+
+       //
+       // SONETEMPLATEPAGE METHODS
+       //
+
+       /**
+        * {@inheritDoc}
+        */
+       @Override
+       protected boolean requiresLogin() {
+               return true;
+       }
+
+}

diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index b3f8865..a05cd31 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -166,8 +166,8 @@ public class WebInterface extends AbstractService {
                Template viewSoneTemplate = templateFactory.createTemplate(createReader("/templates/viewSone.html"));
                viewSoneTemplate.set("formPassword", formPassword);
 
-               Template addFriendTemplate = templateFactory.createTemplate(createReader("/templates/addFriend.html"));
-               addFriendTemplate.set("formPassword", formPassword);
+               Template followSoneTemplate = templateFactory.createTemplate(createReader("/templates/addFriend.html"));
+               followSoneTemplate.set("formPassword", formPassword);
 
                Template deleteSoneTemplate = templateFactory.createTemplate(createReader("/templates/deleteSone.html"));
                deleteSoneTemplate.set("formPassword", formPassword);
@@ -180,7 +180,7 @@ public class WebInterface extends AbstractService {
                pageToadlets.add(pageToadletFactory.createPageToadlet(new EditProfilePage(editProfileTemplate, this), "EditProfile"));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new CreatePostPage(createPostTemplate, this)));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new ViewSonePage(viewSoneTemplate, this)));
-               pageToadlets.add(pageToadletFactory.createPageToadlet(new AddFriendPage(addFriendTemplate, this)));
+               pageToadlets.add(pageToadletFactory.createPageToadlet(new FollowSonePage(followSoneTemplate, this)));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new DeleteSonePage(deleteSoneTemplate, this), "DeleteSone"));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new LoginPage(loginTemplate, this), "Login"));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new LogoutPage(logoutTemplate, this), "Logout"));

diff --git a/src/main/resources/i18n/sone.en.properties b/src/main/resources/i18n/sone.en.properties
index 6e5f9c1..9428a76 100644 (file)
--- a/src/main/resources/i18n/sone.en.properties
+++ b/src/main/resources/i18n/sone.en.properties
@@ -71,9 +71,9 @@ Page.ViewSone.Page.TitleWithSone=View Sone “{sone}”
 Page.ViewSone.UnknownSone.Description=This Sone has not yet been retrieved. Please check back in a short time.
 Page.ViewSone.PostList.Title=Posts by “{sone}”
 Page.ViewSone.PostList.Text.NoPostYet=This Sone has not yet posted anything.
-Page.ViewSone.RemoveFriend.Text=Remove as Friend
-Page.ViewSone.AddFriend.Text=Add as Friend
+Page.ViewSone.UnfollowSone.Text=Unfollow this Sone
+Page.ViewSone.FollowSone.Text=Follow this Sone
 
-Page.AddFriend.Title=Add Friend - Sone
+Page.FollowSone.Title=Follow Sone - Sone
 
 Page.Logout.Title=Logout - Sone

diff --git a/src/main/resources/templates/viewSone.html b/src/main/resources/templates/viewSone.html
index 524d476..ab87a98 100644 (file)
--- a/src/main/resources/templates/viewSone.html
+++ b/src/main/resources/templates/viewSone.html
@@ -14,9 +14,9 @@
 
                <%if ! sone.isCurrent>
                        <%if sone.isFriend>
-                               <div><a href="removeFriend.html?sone=<% sone.id>"><%= Page.ViewSone.RemoveFriend.Text|l10n|html></a></div>
+                               <div><a href="unfollowSone.html?sone=<% sone.id>"><%= Page.ViewSone.UnfollowSone.Text|l10n|html></a></div>
                        <%else>
-                               <div><a href="addFriend.html?sone=<% sone.id>"><%= Page.ViewSone.AddFriend.Text|l10n|html></a></div>
+                               <div><a href="followSone.html?sone=<% sone.id>"><%= Page.ViewSone.FollowSone.Text|l10n|html></a></div>
                        <%/if>
                <%/if>