Newest fred does not throw anymore.

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

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
index e8cd3d5..4fb885d 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
@@ -84,15 +84,11 @@ public abstract class JsonPage implements Page {
         *         session
         */
        protected Session getCurrentSession(ToadletContext toadletContenxt, boolean create) {
-               try {
-                       Session session = webInterface.getSessionManager().useSession(toadletContenxt);
-                       if (create && (session == null)) {
-                               session = webInterface.getSessionManager().createSession(UUID.randomUUID().toString(), toadletContenxt);
-                       }
-                       return session;
-               } catch (freenet.clients.http.RedirectException re1) {
-                       return null;
+               Session session = webInterface.getSessionManager().useSession(toadletContenxt);
+               if (create && (session == null)) {
+                       session = webInterface.getSessionManager().createSession(UUID.randomUUID().toString(), toadletContenxt);
                }
+               return session;
        }
 
        /**
@@ -112,12 +108,7 @@ public abstract class JsonPage implements Page {
                if (soneId == null) {
                        return null;
                }
-               for (Sone sone : webInterface.getCore().getSones()) {
-                       if (sone.getId().equals(soneId)) {
-                               return sone;
-                       }
-               }
-               return null;
+               return webInterface.getCore().getLocalSone(soneId, false);
        }
 
        //
@@ -146,6 +137,30 @@ public abstract class JsonPage implements Page {
        }
 
        //
+       // PROTECTED METHODS
+       //
+
+       /**
+        * Creates a success reply.
+        *
+        * @return A reply signaling success
+        */
+       protected JsonObject createSuccessJsonObject() {
+               return new JsonObject().put("success", true);
+       }
+
+       /**
+        * Creates an error reply.
+        *
+        * @param error
+        *            The error that has occured
+        * @return The JSON object, signalling failure and the error code
+        */
+       protected JsonObject createErrorJsonObject(String error) {
+               return new JsonObject().put("success", false).put("error", error);
+       }
+
+       //
        // PAGE METHODS
        //