projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert update events to EventBus-based events.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
freenet
/
wot
/
IdentityManager.java
diff --git
a/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java
b/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java
index
568a637
..
5b86db4
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java
+++ b/
src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java
@@
-30,6
+30,9
@@
import net.pterodactylus.sone.freenet.plugin.PluginException;
import net.pterodactylus.util.logging.Logging;
import net.pterodactylus.util.service.AbstractService;
import net.pterodactylus.util.logging.Logging;
import net.pterodactylus.util.service.AbstractService;
+import com.google.inject.Inject;
+import com.google.inject.name.Named;
+
/**
* The identity manager takes care of loading and storing identities, their
* contexts, and properties. It does so in a way that does not expose errors via
/**
* The identity manager takes care of loading and storing identities, their
* contexts, and properties. It does so in a way that does not expose errors via
@@
-77,7
+80,8
@@
public class IdentityManager extends AbstractService {
* The context to focus on (may be {@code null} to ignore
* contexts)
*/
* The context to focus on (may be {@code null} to ignore
* contexts)
*/
- public IdentityManager(WebOfTrustConnector webOfTrustConnector, String context) {
+ @Inject
+ public IdentityManager(WebOfTrustConnector webOfTrustConnector, @Named("WebOfTrustContext") String context) {
super("Sone Identity Manager", false);
this.webOfTrustConnector = webOfTrustConnector;
this.context = context;
super("Sone Identity Manager", false);
this.webOfTrustConnector = webOfTrustConnector;
this.context = context;
@@
-190,7
+194,10
@@
public class IdentityManager extends AbstractService {
Map<String, Identity> identities = new HashMap<String, Identity>();
currentIdentities.put(ownIdentity, identities);
Map<String, Identity> identities = new HashMap<String, Identity>();
currentIdentities.put(ownIdentity, identities);
- /* if the context doesn’t match, skip getting trusted identities. */
+ /*
+ * if the context doesn’t match, skip getting trusted
+ * identities.
+ */
if ((context != null) && !ownIdentity.hasContext(context)) {
continue;
}
if ((context != null) && !ownIdentity.hasContext(context)) {
continue;
}