X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FMoveProfileFieldAjaxPage.java;h=5e8a2bd7635f74901e28a8789e02d3f5f0bb9009;hb=2e03e9dddbea4b81aacaf1aa316f5c3ccffd4bf9;hp=b932a823eea512169ecafe9c4116586051fea205;hpb=38cb6c5ec82298ee351d0eb15ddd8331db273af2;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/MoveProfileFieldAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/MoveProfileFieldAjaxPage.java
index b932a82..5e8a2bd 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/MoveProfileFieldAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/MoveProfileFieldAjaxPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - MoveProfileFieldAjaxPage.java - Copyright © 2011 David Roden
+ * Sone - MoveProfileFieldAjaxPage.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
@@ -22,7 +22,8 @@ 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.google.common.base.Optional;
 
 /**
  * AJAX page that lets the user move a profile field up or down.
@@ -47,24 +48,21 @@ public class MoveProfileFieldAjaxPage extends JsonPage {
 	// JSONPAGE METHODS
 	//
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
-	protected JsonObject createJsonObject(FreenetRequest request) {
+	protected JsonReturnObject createJsonObject(FreenetRequest request) {
 		Sone currentSone = getCurrentSone(request.getToadletContext());
 		Profile profile = currentSone.getProfile();
 		String fieldId = request.getHttpRequest().getParam("field");
-		Field field = profile.getFieldById(fieldId);
-		if (field == null) {
+		Optional<Field> field = profile.getFieldById(fieldId);
+		if (!field.isPresent()) {
 			return createErrorJsonObject("invalid-field-id");
 		}
 		String direction = request.getHttpRequest().getParam("direction");
 		try {
 			if ("up".equals(direction)) {
-				profile.moveFieldUp(field);
+				profile.moveFieldUp(field.get());
 			} else if ("down".equals(direction)) {
-				profile.moveFieldDown(field);
+				profile.moveFieldDown(field.get());
 			} else {
 				return createErrorJsonObject("invalid-direction");
 			}