Change all copyright headers to include 2012.

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

diff --git a/src/main/java/net/pterodactylus/sone/web/DeleteProfileFieldPage.java b/src/main/java/net/pterodactylus/sone/web/DeleteProfileFieldPage.java
index 2d10b72..5754b2f 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/DeleteProfileFieldPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/DeleteProfileFieldPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - DeleteProfileFieldPage.java - Copyright © 2011 David Roden
+ * Sone - DeleteProfileFieldPage.java - Copyright © 2011–2012 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
@@ -18,11 +18,12 @@
 package net.pterodactylus.sone.web;
 
 import net.pterodactylus.sone.data.Profile;
+import net.pterodactylus.sone.data.Profile.Field;
 import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.web.page.Page.Request.Method;
-import net.pterodactylus.util.number.Numbers;
-import net.pterodactylus.util.template.DataProvider;
+import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.template.Template;
+import net.pterodactylus.util.template.TemplateContext;
+import net.pterodactylus.util.web.Method;
 
 /**
  * Page that lets the user confirm the deletion of a profile field.
@@ -51,33 +52,34 @@ public class DeleteProfileFieldPage extends SoneTemplatePage {
         * {@inheritDoc}
         */
        @Override
-       protected void processTemplate(Request request, DataProvider dataProvider) throws RedirectException {
-               super.processTemplate(request, dataProvider);
+       protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
+               super.processTemplate(request, templateContext);
                Sone currentSone = getCurrentSone(request.getToadletContext());
                Profile profile = currentSone.getProfile();
-               int fieldIndex = Numbers.safeParseInteger(request.getHttpRequest().getParam("field"), -1);
-               if (fieldIndex >= currentSone.getProfile().getFieldNames().size()) {
-                       fieldIndex = -1;
-               }
-               String fieldName = null;
-               String fieldValue = null;
-               if (fieldIndex > -1) {
-                       fieldName = profile.getFieldNames().get(fieldIndex);
-                       fieldValue = profile.getField(fieldName);
+
+               /* get parameters from request. */
+               String fieldId = request.getHttpRequest().getParam("field");
+               Field field = profile.getFieldById(fieldId);
+               if (field == null) {
+                       throw new RedirectException("invalid.html");
                }
+
+               /* process POST request. */
                if (request.getMethod() == Method.POST) {
                        if (request.getHttpRequest().getPartAsStringFailsafe("confirm", 4).equals("true")) {
-                               fieldIndex = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("field", 11), -1);
-                               if (fieldIndex > -1) {
-                                       profile.removeField(fieldIndex);
+                               fieldId = request.getHttpRequest().getParam("field");
+                               field = profile.getFieldById(fieldId);
+                               if (field == null) {
+                                       throw new RedirectException("invalid.html");
                                }
+                               profile.removeField(field);
                                currentSone.setProfile(profile);
                        }
                        throw new RedirectException("editProfile.html#profile-fields");
                }
-               dataProvider.set("fieldIndex", fieldIndex);
-               dataProvider.set("fieldName", fieldName);
-               dataProvider.set("fieldValue", fieldValue);
+
+               /* set current values in template. */
+               templateContext.set("field", field);
        }
 
 }