Process Sone templates in their own method

[Sone.git] / src / main / java / net / pterodactylus / sone / web / EditImagePage.java

diff --git a/src/main/java/net/pterodactylus/sone/web/EditImagePage.java b/src/main/java/net/pterodactylus/sone/web/EditImagePage.java
index 9a29c85..9d917bb 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/EditImagePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/EditImagePage.java
@@ -17,6 +17,7 @@
 
 package net.pterodactylus.sone.web;
 
+import net.pterodactylus.sone.data.IdBuilder;
 import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.text.TextFilter;
 import net.pterodactylus.sone.web.page.FreenetRequest;
@@ -51,10 +52,9 @@ public class EditImagePage extends SoneTemplatePage {
         * {@inheritDoc}
         */
        @Override
-       protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
-               super.processTemplate(request, templateContext);
+       protected void processSonePage(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
                if (request.getMethod() == Method.POST) {
-                       String imageId = request.getHttpRequest().getPartAsStringFailsafe("image", 36);
+                       String imageId = request.getHttpRequest().getPartAsStringFailsafe("image", IdBuilder.ID_STRING_LENGTH);
                        String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
                        Image image = webInterface.getCore().getImage(imageId, false);
                        if (image == null) {
@@ -71,7 +71,7 @@ public class EditImagePage extends SoneTemplatePage {
                                String title = request.getHttpRequest().getPartAsStringFailsafe("title", 100).trim();
                                String description = request.getHttpRequest().getPartAsStringFailsafe("description", 1024).trim();
                                if (title.length() == 0) {
-                                       templateContext.set("titleMissing", true);
+                                       throw new RedirectException("emptyImageTitle.html");
                                }
                                image.modify().setTitle(title).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description)).update();
                        }