/*
- * Sone - SoneAccessor.java - Copyright © 2010 David Roden
+ * Sone - SoneAccessor.java - Copyright © 2010–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 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.OwnIdentity;
import net.pterodactylus.sone.freenet.wot.Trust;
import net.pterodactylus.sone.web.WebInterface;
import net.pterodactylus.sone.web.ajax.GetTimesAjaxPage;
Sone sone = (Sone) object;
if (member.equals("niceName")) {
return getNiceName(sone);
- } else if (member.equals("local")) {
- return core.isLocalSone(sone);
} else if (member.equals("friend")) {
Sone currentSone = (Sone) templateContext.get("currentSone");
return (currentSone != null) && currentSone.hasFriend(sone.getId());
} 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")) {
- 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) {
return null;
}
- Trust trust = core.getTrust(currentSone, sone);
- logger.log(Level.FINEST, "Trust for %s by %s: %s", new Object[] { sone, currentSone, trust });
+ Trust trust = sone.getIdentity().getTrust((OwnIdentity) currentSone.getIdentity());
+ logger.log(Level.FINEST, String.format("Trust for %s by %s: %s", sone, currentSone, trust));
if (trust == null) {
return new Trust(null, null, null);
}