X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FDeleteProfileFieldAjaxPage.java;h=97393f2929477e7efa55be1f7c30571d948ec6c8;hb=53a71d1d6b91e4d56af49a06f2e06bc4d11bf3eb;hp=20fe841f7177da3595f8368711ce672e501b2c84;hpb=480691a26222e035e53bda56029524e160fdf898;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/DeleteProfileFieldAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/DeleteProfileFieldAjaxPage.java
index 20fe841..97393f2 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/DeleteProfileFieldAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/DeleteProfileFieldAjaxPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - DeleteProfileFieldAjaxPage.java - Copyright © 2011–2012 David Roden
+ * Sone - DeleteProfileFieldAjaxPage.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
@@ -17,12 +17,16 @@
 
 package net.pterodactylus.sone.web.ajax;
 
+import static com.fasterxml.jackson.databind.node.JsonNodeFactory.instance;
+
 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.sone.web.page.FreenetRequest;
-import net.pterodactylus.util.json.JsonObject;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.databind.node.TextNode;
 
 /**
  * AJAX page that lets the user delete a profile field.
@@ -45,9 +49,9 @@ public class DeleteProfileFieldAjaxPage extends JsonPage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected JsonObject createJsonObject(FreenetRequest request) {
+	protected JsonReturnObject createJsonObject(FreenetRequest request) {
 		String fieldId = request.getHttpRequest().getParam("field");
-		Sone currentSone = getCurrentSone(request.getToadletContext());
+		Sone currentSone = getCurrentSone(request.getToadletContext()).get();
 		Profile profile = currentSone.getProfile();
 		Field field = profile.getFieldById(fieldId);
 		if (field == null) {
@@ -56,7 +60,7 @@ public class DeleteProfileFieldAjaxPage extends JsonPage {
 		profile.removeField(field);
 		currentSone.setProfile(profile);
 		webInterface.getCore().touchConfiguration();
-		return createSuccessJsonObject().put("field", new JsonObject().put("id", field.getId()));
+		return createSuccessJsonObject().put("field", new ObjectNode(instance).put("id", new TextNode(field.getId())));
 	}
 
 }