If no current Sone exists, return an error.

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

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/EditProfileFieldAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/EditProfileFieldAjaxPage.java
index 0036545..319aa79 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/ajax/EditProfileFieldAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/EditProfileFieldAjaxPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - EditProfileFieldAjaxPage.java - Copyright © 2011 David Roden
+ * Sone - EditProfileFieldAjaxPage.java - Copyright © 2011–2013 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
@@ -21,7 +21,9 @@ import net.pterodactylus.sone.data.Profile;
 import net.pterodactylus.sone.data.Profile.Field;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.web.WebInterface;
-import net.pterodactylus.util.json.JsonObject;
+import net.pterodactylus.sone.web.page.FreenetRequest;
+
+import com.google.common.base.Optional;
 
 /**
  * AJAX page that lets the user rename a profile field.
@@ -44,27 +46,24 @@ public class EditProfileFieldAjaxPage extends JsonPage {
        // JSONPAGE METHODS
        //
 
-       /**
-        * {@inheritDoc}
-        */
        @Override
-       protected JsonObject createJsonObject(Request request) {
+       protected JsonReturnObject createJsonObject(FreenetRequest request) {
                String fieldId = request.getHttpRequest().getParam("field");
                Sone currentSone = getCurrentSone(request.getToadletContext());
                Profile profile = currentSone.getProfile();
-               Field field = profile.getFieldById(fieldId);
-               if (field == null) {
+               Optional<Field> field = profile.getFieldById(fieldId);
+               if (!field.isPresent()) {
                        return createErrorJsonObject("invalid-field-id");
                }
                String name = request.getHttpRequest().getParam("name", "").trim();
                if (name.length() == 0) {
                        return createErrorJsonObject("invalid-parameter-name");
                }
-               Field existingField = profile.getFieldByName(name);
-               if ((existingField != null) && !existingField.equals(field)) {
+               Optional<Field> existingField = profile.getFieldByName(name);
+               if (existingField.isPresent() && !existingField.equals(field)) {
                        return createErrorJsonObject("duplicate-field-name");
                }
-               field.setName(name);
+               profile.renameField(field.get(), name);
                currentSone.setProfile(profile);
                return createSuccessJsonObject();
        }