X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FIdentity.java;h=c6875e965deb2e4169adb57b87fefb83484cfb28;hp=4554f40f828661a26ea744318cf8c5e0f5cc12ff;hb=419098bcd6215125408b29e60bd888e60979d37b;hpb=4c4b77eff97fd247c6b1c8bbb30aeb6ea3d2c172

diff --git a/src/main/java/net/pterodactylus/sone/freenet/wot/Identity.java b/src/main/java/net/pterodactylus/sone/freenet/wot/Identity.java
index 4554f40..c6875e9 100644
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/Identity.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/Identity.java
@@ -1,5 +1,5 @@
 /*
- * Sone - Identity.java - Copyright © 2010–2013 David Roden
+ * Sone - Identity.java - Copyright © 2010–2015 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
@@ -22,8 +22,6 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 
-import javax.annotation.Nullable;
-
 import com.google.common.base.Function;
 
 /**
@@ -35,17 +33,17 @@ import com.google.common.base.Function;
  */
 public interface Identity {
 
-	final Function<Identity, Collection<String>> TO_CONTEXTS = new Function<Identity, Collection<String>>() {
+	public static final Function<Identity, Set<String>> TO_CONTEXTS = new Function<Identity, Set<String>>() {
 		@Override
-		public Collection<String> apply(@Nullable Identity identity) {
-			return (identity == null) ? Collections.<String>emptyList() : identity.getContexts();
+		public Set<String> apply(Identity identity) {
+			return (identity == null) ? Collections.<String>emptySet() : identity.getContexts();
 		}
 	};
 
-	final Function<Identity, Map<String, String>> TO_PROPERTIES = new Function<Identity, Map<String, String>>() {
+	public static final Function<Identity, Map<String, String>> TO_PROPERTIES = new Function<Identity, Map<String, String>>() {
 		@Override
-		public Map<String, String> apply(@Nullable Identity identity) {
-			return (identity == null) ? Collections.<String, String>emptyMap() : identity.getProperties();
+		public Map<String, String> apply(Identity input) {
+			return (input == null) ? Collections.<String, String>emptyMap() : input.getProperties();
 		}
 	};
 
@@ -93,7 +91,7 @@ public interface Identity {
 	 * @param context
 	 *            The context to add
 	 */
-	public void addContext(String context);
+	public Identity addContext(String context);
 
 	/**
 	 * Sets all contexts of this identity.
@@ -109,7 +107,7 @@ public interface Identity {
 	 * @param context
 	 *            The context to remove
 	 */
-	public void removeContext(String context);
+	public Identity removeContext(String context);
 
 	/**
 	 * Returns all properties of this identity.
@@ -135,7 +133,7 @@ public interface Identity {
 	 * @param value
 	 *            The value of the property
 	 */
-	public void setProperty(String name, String value);
+	public Identity setProperty(String name, String value);
 
 	/**
 	 * Sets all properties of this identity.
@@ -151,7 +149,7 @@ public interface Identity {
 	 * @param name
 	 *            The name of the property to remove
 	 */
-	public void removeProperty(String name);
+	public Identity removeProperty(String name);
 
 	/**
 	 * Retrieves the trust that this identity receives from the given own
@@ -174,7 +172,7 @@ public interface Identity {
 	 * @param trust
 	 *            The trust given by the given own identity
 	 */
-	public void setTrust(OwnIdentity ownIdentity, Trust trust);
+	public Identity setTrust(OwnIdentity ownIdentity, Trust trust);
 
 	/**
 	 * Removes trust assignment from the given own identity for this identity.
@@ -183,6 +181,6 @@ public interface Identity {
 	 *            The own identity that removed the trust assignment for this
 	 *            identity
 	 */
-	public void removeTrust(OwnIdentity ownIdentity);
+	public Identity removeTrust(OwnIdentity ownIdentity);
 
 }