/*
- * 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
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 move a profile field up or down.
// JSONPAGE METHODS
//
- /**
- * {@inheritDoc}
- */
@Override
- protected JsonObject createJsonObject(Request 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");
}