X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FSoneAccessor.java;h=50c1f54c66c16dfae276aa037a8680939f806194;hp=ead6066962ebd2a27c17a10dd7442b3ef9f4e719;hb=a47643aed43d118ca68044f95451bb5374cdb332;hpb=d11c8ee9421a28c595350eecad7d6bea9dba356d

diff --git a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
index ead6066..50c1f54 100644
--- a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Sone - SoneAccessor.java - Copyright © 2010 David Roden
+ * Sone - SoneAccessor.java - Copyright © 2010–2012 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
@@ -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,17 +86,17 @@ 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());
+			return !sone.isKnown();
 		} else if (member.equals("locked")) {
 			return core.isLocked(sone);
 		} else if (member.equals("lastUpdatedText")) {