X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FSoneAccessor.java;h=305e9a8114910ae96197007e36ae5dc382887a36;hp=76fdcc1e3652b1578c8128dbc2b47c0922150310;hb=4314a29fdeb9766e198b7144a9724422d0df84dc;hpb=ac926296e54cb3387e5772fceda9fa20b25d6711 diff --git a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java index 76fdcc1..305e9a8 100644 --- a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java +++ b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java @@ -21,9 +21,9 @@ import java.util.logging.Level; import java.util.logging.Logger; import net.pterodactylus.sone.core.Core; -import net.pterodactylus.sone.core.Core.SoneStatus; import net.pterodactylus.sone.data.Profile; import net.pterodactylus.sone.data.Sone; +import net.pterodactylus.sone.data.Sone.SoneStatus; import net.pterodactylus.sone.freenet.wot.Trust; import net.pterodactylus.sone.web.WebInterface; import net.pterodactylus.sone.web.ajax.GetTimesAjaxPage; @@ -86,21 +86,21 @@ public class SoneAccessor extends ReflectionAccessor { } else if (member.equals("modified")) { return core.isModifiedSone(sone); } else if (member.equals("status")) { - return core.getSoneStatus(sone); + return sone.getStatus(); } else if (member.equals("unknown")) { - return core.getSoneStatus(sone) == SoneStatus.unknown; + return sone.getStatus() == SoneStatus.unknown; } else if (member.equals("idle")) { - return core.getSoneStatus(sone) == SoneStatus.idle; + return sone.getStatus() == SoneStatus.idle; } else if (member.equals("inserting")) { - return core.getSoneStatus(sone) == SoneStatus.inserting; + return sone.getStatus() == SoneStatus.inserting; } else if (member.equals("downloading")) { - return core.getSoneStatus(sone) == SoneStatus.downloading; + return sone.getStatus() == SoneStatus.downloading; } else if (member.equals("new")) { return core.isNewSone(sone.getId()); } else if (member.equals("locked")) { return core.isLocked(sone); } else if (member.equals("lastUpdatedText")) { - return GetTimesAjaxPage.getTime((WebInterface) templateContext.get("webInterface"), System.currentTimeMillis() - sone.getTime()); + return GetTimesAjaxPage.getTime((WebInterface) templateContext.get("webInterface"), sone.getTime()); } else if (member.equals("trust")) { Sone currentSone = (Sone) templateContext.get("currentSone"); if (currentSone == null) {