Rename get translation ajax page

diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index 0475359..49f1158 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -127,7 +127,7 @@ import net.pterodactylus.sone.web.ajax.GetPostAjaxPage;
 import net.pterodactylus.sone.web.ajax.GetReplyAjaxPage;
 import net.pterodactylus.sone.web.ajax.GetStatusAjaxPage;
 import net.pterodactylus.sone.web.ajax.GetTimesAjaxPage;
-import net.pterodactylus.sone.web.ajax.GetTranslationPage;
+import net.pterodactylus.sone.web.ajax.GetTranslationAjaxPage;
 import net.pterodactylus.sone.web.ajax.LikeAjaxPage;
 import net.pterodactylus.sone.web.ajax.LockSoneAjaxPage;
 import net.pterodactylus.sone.web.ajax.MarkAsKnownAjaxPage;
@@ -765,7 +765,7 @@ public class WebInterface implements SessionProvider {
                pageToadlets.add(pageToadletFactory.createPageToadlet(loaders.<FreenetRequest>loadStaticPage("images/", "/static/images/", "image/png")));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new TemplatePage<FreenetRequest>("OpenSearch.xml", "application/opensearchdescription+xml", templateContextFactory, openSearchTemplate)));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new GetImagePage(this)));
-               pageToadlets.add(pageToadletFactory.createPageToadlet(new GetTranslationPage(this)));
+               pageToadlets.add(pageToadletFactory.createPageToadlet(new GetTranslationAjaxPage(this)));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new GetStatusAjaxPage(this, elementLoader, timeTextConverter, l10nFilter, TimeZone.getDefault())));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new GetNotificationsAjaxPage(this)));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new DismissNotificationAjaxPage(this)));

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/GetTranslationAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/GetTranslationAjaxPage.java
new file mode 100644 (file)
index 0000000..f9a8c24
--- /dev/null
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetTranslationAjaxPage.java
@@ -0,0 +1,70 @@
+/*
+ * Sone - GetTranslationPage.java - Copyright © 2010–2016 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.ajax;
+
+import net.pterodactylus.sone.web.WebInterface;
+import net.pterodactylus.sone.web.page.FreenetRequest;
+
+/**
+ * Returns the translation for a given key as JSON object.
+ *
+ * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
+ */
+public class GetTranslationAjaxPage extends JsonPage {
+
+       /**
+        * Creates a new translation page.
+        *
+        * @param webInterface
+        *            The Sone web interface
+        */
+       public GetTranslationAjaxPage(WebInterface webInterface) {
+               super("getTranslation.ajax", webInterface);
+       }
+
+       //
+       // JSONPAGE METHODS
+       //
+
+       /**
+        * {@inheritDoc}
+        */
+       @Override
+       protected JsonReturnObject createJsonObject(FreenetRequest request) {
+               String key = request.getHttpRequest().getParam("key");
+               String translation = webInterface.getL10n().getString(key);
+               return createSuccessJsonObject().put("value", translation);
+       }
+
+       /**
+        * {@inheritDoc}
+        */
+       @Override
+       protected boolean needsFormPassword() {
+               return false;
+       }
+
+       /**
+        * {@inheritDoc}
+        */
+       @Override
+       protected boolean requiresLogin() {
+               return false;
+       }
+
+}

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/GetTranslationPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/GetTranslationPage.java
deleted file mode 100644 (file)
index 53e3e67..0000000
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetTranslationPage.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Sone - GetTranslationPage.java - Copyright © 2010–2016 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.ajax;
-
-import net.pterodactylus.sone.web.WebInterface;
-import net.pterodactylus.sone.web.page.FreenetRequest;
-
-/**
- * Returns the translation for a given key as JSON object.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class GetTranslationPage extends JsonPage {
-
-       /**
-        * Creates a new translation page.
-        *
-        * @param webInterface
-        *            The Sone web interface
-        */
-       public GetTranslationPage(WebInterface webInterface) {
-               super("getTranslation.ajax", webInterface);
-       }
-
-       //
-       // JSONPAGE METHODS
-       //
-
-       /**
-        * {@inheritDoc}
-        */
-       @Override
-       protected JsonReturnObject createJsonObject(FreenetRequest request) {
-               String key = request.getHttpRequest().getParam("key");
-               String translation = webInterface.getL10n().getString(key);
-               return createSuccessJsonObject().put("value", translation);
-       }
-
-       /**
-        * {@inheritDoc}
-        */
-       @Override
-       protected boolean needsFormPassword() {
-               return false;
-       }
-
-       /**
-        * {@inheritDoc}
-        */
-       @Override
-       protected boolean requiresLogin() {
-               return false;
-       }
-
-}

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/ajax/GetTranslationAjaxPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/ajax/GetTranslationAjaxPageTest.kt
new file mode 100644 (file)
index 0000000..30a1a72
--- /dev/null
+++ b/src/test/kotlin/net/pterodactylus/sone/web/ajax/GetTranslationAjaxPageTest.kt
@@ -0,0 +1,20 @@
+package net.pterodactylus.sone.web.ajax
+
+import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.Matchers.equalTo
+import org.junit.Test
+
+/**
+ * Unit test for [GetTranslationAjaxPage].
+ */
+class GetTranslationAjaxPageTest : JsonPageTest("getTranslation.ajax", requiresLogin = false, needsFormPassword = false, pageSupplier = ::GetTranslationAjaxPage) {
+
+       @Test
+       fun `translation is returned correctly`() {
+               addTranslation("foo", "bar")
+               addRequestParameter("key", "foo")
+               assertThat(json.isSuccess, equalTo(true))
+               assertThat(json["value"].asText(), equalTo("bar"))
+       }
+
+}

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/ajax/GetTranslationPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/ajax/GetTranslationPageTest.kt
deleted file mode 100644 (file)
index f520977..0000000
--- a/src/test/kotlin/net/pterodactylus/sone/web/ajax/GetTranslationPageTest.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package net.pterodactylus.sone.web.ajax
-
-import org.hamcrest.MatcherAssert.assertThat
-import org.hamcrest.Matchers.equalTo
-import org.junit.Test
-
-/**
- * Unit test for [GetTranslationPage].
- */
-class GetTranslationPageTest : JsonPageTest("getTranslation.ajax", requiresLogin = false, needsFormPassword = false, pageSupplier = ::GetTranslationPage) {
-
-       @Test
-       fun `translation is returned correctly`() {
-               addTranslation("foo", "bar")
-               addRequestParameter("key", "foo")
-               assertThat(json.isSuccess, equalTo(true))
-               assertThat(json["value"].asText(), equalTo("bar"))
-       }
-
-}