X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FSoneAccessor.java;h=c54fc0d80d106d0ae641dc0f18731d8c9f10594c;hb=295f1e33bfcdb9d772e2de2a05b49f2feea92223;hp=52424e6008319933fcd9530b303030beea5056fe;hpb=f0d22e3053432c92312cd0d979e8f59e197b5db4;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
index 52424e6..c54fc0d 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â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
@@ -21,14 +21,17 @@ 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.OwnIdentity;
import net.pterodactylus.sone.freenet.wot.Trust;
+import net.pterodactylus.sone.web.WebInterface;
+import net.pterodactylus.sone.web.ajax.GetTimesAjaxPage;
import net.pterodactylus.util.logging.Logging;
import net.pterodactylus.util.template.Accessor;
-import net.pterodactylus.util.template.DataProvider;
import net.pterodactylus.util.template.ReflectionAccessor;
+import net.pterodactylus.util.template.TemplateContext;
/**
* {@link Accessor} for {@link Sone}s that adds a couple of properties to Sones.
@@ -39,7 +42,7 @@ import net.pterodactylus.util.template.ReflectionAccessor;
*
friend
* Will return {@code true} if the sone in question is a friend of the
* currently logged in Sone (as determined by accessing the âcurrentSoneâ
- * variable of the given {@link DataProvider}).
+ * variable of the given {@link TemplateContext}).
* current
* Will return {@code true} if the sone in question is the currently logged
* in Sone.
@@ -69,47 +72,47 @@ public class SoneAccessor extends ReflectionAccessor {
* {@inheritDoc}
*/
@Override
- public Object get(DataProvider dataProvider, Object object, String member) {
+ public Object get(TemplateContext templateContext, Object object, String member) {
Sone sone = (Sone) object;
if (member.equals("niceName")) {
return getNiceName(sone);
- } else if (member.equals("local")) {
- return sone.getInsertUri() != null;
} else if (member.equals("friend")) {
- Sone currentSone = (Sone) dataProvider.get("currentSone");
+ Sone currentSone = (Sone) templateContext.get("currentSone");
return (currentSone != null) && currentSone.hasFriend(sone.getId());
} else if (member.equals("current")) {
- Sone currentSone = (Sone) dataProvider.get("currentSone");
+ Sone currentSone = (Sone) templateContext.get("currentSone");
return (currentSone != null) && currentSone.equals(sone);
} 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);
+ return !sone.isKnown();
} else if (member.equals("locked")) {
return core.isLocked(sone);
+ } else if (member.equals("lastUpdatedText")) {
+ return GetTimesAjaxPage.getTime((WebInterface) templateContext.get("webInterface"), sone.getTime());
} else if (member.equals("trust")) {
- Sone currentSone = (Sone) dataProvider.get("currentSone");
+ 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);
}
return trust;
}
- return super.get(dataProvider, object, member);
+ return super.get(templateContext, object, member);
}
//