Clean up SoneTemplatePage’s constructors

[Sone.git] / src / main / kotlin / net / pterodactylus / sone / web / pages / CreateSonePage.kt

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateSonePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateSonePage.kt
index f864b73..2732aac 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateSonePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateSonePage.kt
@@ -3,7 +3,6 @@ package net.pterodactylus.sone.web.pages
 import freenet.clients.http.ToadletContext
 import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.utils.isPOST
-import net.pterodactylus.sone.web.pages.SoneTemplatePage
 import net.pterodactylus.sone.web.WebInterface
 import net.pterodactylus.sone.web.page.FreenetRequest
 import net.pterodactylus.util.template.Template
@@ -15,21 +14,21 @@ import java.util.logging.Logger
  * The “create Sone” page lets the user create a new Sone.
  */
 class CreateSonePage(template: Template, webInterface: WebInterface):
-               SoneTemplatePage("createSone.html", template, "Page.CreateSone.Title", webInterface, false) {
+               SoneTemplatePage("createSone.html", webInterface, template, "Page.CreateSone.Title") {
 
        private val logger = Logger.getLogger(CreateSonePage::class.java.name)
 
-       override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) {
+       override fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
                templateContext["sones"] = webInterface.core.localSones.sortedWith(Sone.NICE_NAME_COMPARATOR)
                templateContext["identitiesWithoutSone"] = webInterface.core.identityManager.allOwnIdentities.filterNot { "Sone" in it.contexts }.sortedBy { "${it.nickname}@${it.id}".toLowerCase() }
-               if (request.isPOST) {
-                       val identity = request.httpRequest.getPartAsStringFailsafe("identity", 43)
+               if (freenetRequest.isPOST) {
+                       val identity = freenetRequest.httpRequest.getPartAsStringFailsafe("identity", 43)
                        webInterface.core.identityManager.allOwnIdentities.firstOrNull { it.id == identity }?.let { ownIdentity ->
                                val sone = webInterface.core.createSone(ownIdentity)
                                if (sone == null) {
                                        logger.log(Level.SEVERE, "Could not create Sone for OwnIdentity: $ownIdentity")
                                }
-                               setCurrentSone(request.toadletContext, sone)
+                               setCurrentSone(freenetRequest.toadletContext, sone)
                                throw RedirectException("index.html")
                        }
                        templateContext["errorNoIdentity"] = true