projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unnecessary type parameter.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
template
/
SoneAccessor.java
diff --git
a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
index
beb7f2a
..
c54fc0d
100644
(file)
--- 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
*
* 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
@@
-17,14
+17,21
@@
package net.pterodactylus.sone.template;
package net.pterodactylus.sone.template;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import net.pterodactylus.sone.core.Core;
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.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.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.Accessor;
-import net.pterodactylus.util.template.DataProvider;
import net.pterodactylus.util.template.ReflectionAccessor;
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.
/**
* {@link Accessor} for {@link Sone}s that adds a couple of properties to Sones.
@@
-35,7
+42,7
@@
import net.pterodactylus.util.template.ReflectionAccessor;
* <dt>friend</dt>
* <dd>Will return {@code true} if the sone in question is a friend of the
* currently logged in Sone (as determined by accessing the “currentSone”
* <dt>friend</dt>
* <dd>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
}).</dd>
+ * variable of the given {@link
TemplateContext
}).</dd>
* <dt>current</dt>
* <dd>Will return {@code true} if the sone in question is the currently logged
* in Sone.</dd>
* <dt>current</dt>
* <dd>Will return {@code true} if the sone in question is the currently logged
* in Sone.</dd>
@@
-45,6
+52,9
@@
import net.pterodactylus.util.template.ReflectionAccessor;
*/
public class SoneAccessor extends ReflectionAccessor {
*/
public class SoneAccessor extends ReflectionAccessor {
+ /** The logger. */
+ private static final Logger logger = Logging.getLogger(SoneAccessor.class);
+
/** The core. */
private final Core core;
/** The core. */
private final Core core;
@@
-62,45
+72,47
@@
public class SoneAccessor extends ReflectionAccessor {
* {@inheritDoc}
*/
@Override
* {@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);
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")) {
} 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")) {
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 (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")) {
} else if (member.equals("unknown")) {
- return
core.getSoneStatus(sone
) == SoneStatus.unknown;
+ return
sone.getStatus(
) == SoneStatus.unknown;
} else if (member.equals("idle")) {
} else if (member.equals("idle")) {
- return
core.getSoneStatus(sone
) == SoneStatus.idle;
+ return
sone.getStatus(
) == SoneStatus.idle;
} else if (member.equals("inserting")) {
} else if (member.equals("inserting")) {
- return
core.getSoneStatus(sone
) == SoneStatus.inserting;
+ return
sone.getStatus(
) == SoneStatus.inserting;
} else if (member.equals("downloading")) {
} else if (member.equals("downloading")) {
- return
core.getSoneStatus(sone
) == SoneStatus.downloading;
+ return
sone.getStatus(
) == SoneStatus.downloading;
} else if (member.equals("new")) {
} 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("locked")) {
return core.isLocked(sone);
+ } else if (member.equals("lastUpdatedText")) {
+ return GetTimesAjaxPage.getTime((WebInterface) templateContext.get("webInterface"), sone.getTime());
} else if (member.equals("trust")) {
} else if (member.equals("trust")) {
- Sone currentSone = (Sone)
dataProvider
.get("currentSone");
+ Sone currentSone = (Sone)
templateContext
.get("currentSone");
if (currentSone == null) {
return null;
}
if (currentSone == null) {
return null;
}
- Trust trust = core.getTrust(currentSone, sone);
+ 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);
}
if (trust == null) {
return new Trust(null, null, null);
}
+ return trust;
}
}
- return super.get(
dataProvider
, object, member);
+ return super.get(
templateContext
, object, member);
}
//
}
//