Don’t always create a Sone for a given ID.

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

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/GetSoneStatusPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/GetSoneStatusPage.java
index 7a4bfda..47d377a 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetSoneStatusPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetSoneStatusPage.java
@@ -17,42 +17,55 @@
 
 package net.pterodactylus.sone.web.ajax;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.core.Core.SoneStatus;
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.template.SoneAccessor;
+import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.util.json.JsonObject;
 
 /**
  * AJAX page that reeturns the status of a sone, as a) a {@link SoneStatus} name
- * and b) a “modified” boolean (as per {@link Sone#getModificationCounter()}).
+ * and b) a “modified” boolean (as per {@link Core#isModifiedSone(Sone)}).
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 public class GetSoneStatusPage extends JsonPage {
 
-       /** The Sone core. */
-       private final Core core;
-
        /**
         * Creates a new AJAX sone status handler.
         *
-        * @param core
-        *            The Sone core
+        * @param webInterface
+        *            The Sone web interface
         */
-       public GetSoneStatusPage(Core core) {
-               super("ajax/getSoneStatus.ajax");
-               this.core = core;
+       public GetSoneStatusPage(WebInterface webInterface) {
+               super("ajax/getSoneStatus.ajax", webInterface);
        }
 
+       //
+       // JSONPAGE METHODS
+       //
+
        /**
         * {@inheritDoc}
         */
        @Override
        protected JsonObject createJsonObject(Request request) {
                String soneId = request.getHttpRequest().getParam("sone");
-               Sone sone = core.getSone(soneId);
-               SoneStatus soneStatus = core.getSoneStatus(sone);
-               return new JsonObject().put("status", soneStatus.name()).put("modified", sone.getModificationCounter() > 0);
+               Sone sone = webInterface.getCore().getSone(soneId);
+               SoneStatus soneStatus = webInterface.getCore().getSoneStatus(sone);
+               return createSuccessJsonObject().put("status", soneStatus.name()).put("name", SoneAccessor.getNiceName(sone)).put("modified", webInterface.getCore().isModifiedSone(sone)).put("locked", webInterface.getCore().isLocked(sone)).put("lastUpdated", new SimpleDateFormat("MMM d, yyyy, HH:mm:ss").format(new Date(sone.getTime()))).put("age", (System.currentTimeMillis() - sone.getTime()) / 1000);
+       }
+
+       /**
+        * {@inheritDoc}
+        */
+       @Override
+       protected boolean needsFormPassword() {
+               return false;
        }
 
 }