X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FDefaultIdentity.java;h=8bda5de60a9b94b8c09f0e6427dd5d124a6ed952;hp=176a3beb17835045cb73567c4745ea84b6138acc;hb=62573c314957b1851f4fbe693b8746686caa940a;hpb=99888ce13cc17d49f5e217ab6f2c9ad5ef168792

diff --git a/src/main/java/net/pterodactylus/sone/freenet/wot/DefaultIdentity.java b/src/main/java/net/pterodactylus/sone/freenet/wot/DefaultIdentity.java
index 176a3be..8bda5de 100644
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/DefaultIdentity.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/DefaultIdentity.java
@@ -1,5 +1,5 @@
 /*
- * Sone - DefaultIdentity.java - Copyright © 2010–2013 David Roden
+ * Sone - DefaultIdentity.java - Copyright © 2010–2016 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
@@ -26,8 +26,6 @@ import java.util.Set;
 
 /**
  * A Web of Trust identity.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 public class DefaultIdentity implements Identity {
 
@@ -69,163 +67,112 @@ public class DefaultIdentity implements Identity {
 	// ACCESSORS
 	//
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public String getId() {
 		return id;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public String getNickname() {
 		return nickname;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public String getRequestUri() {
 		return requestUri;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public Set<String> getContexts() {
 		return Collections.unmodifiableSet(contexts);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public boolean hasContext(String context) {
 		return contexts.contains(context);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public void setContexts(Collection<String> contexts) {
 		this.contexts.clear();
 		this.contexts.addAll(contexts);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
-	public void addContext(String context) {
+	public Identity addContext(String context) {
 		contexts.add(context);
+		return this;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
-	public void removeContext(String context) {
+	public Identity removeContext(String context) {
 		contexts.remove(context);
+		return this;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public Map<String, String> getProperties() {
 		return Collections.unmodifiableMap(properties);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public void setProperties(Map<String, String> properties) {
 		this.properties.clear();
 		this.properties.putAll(properties);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public String getProperty(String name) {
 		return properties.get(name);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
-	public void setProperty(String name, String value) {
+	public Identity setProperty(String name, String value) {
 		properties.put(name, value);
+		return this;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
-	public void removeProperty(String name) {
+	public Identity removeProperty(String name) {
 		properties.remove(name);
+		return this;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public Trust getTrust(OwnIdentity ownIdentity) {
 		return trustCache.get(ownIdentity);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
-	public void setTrust(OwnIdentity ownIdentity, Trust trust) {
+	public Identity setTrust(OwnIdentity ownIdentity, Trust trust) {
 		trustCache.put(ownIdentity, trust);
+		return this;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
-	public void removeTrust(OwnIdentity ownIdentity) {
+	public Identity removeTrust(OwnIdentity ownIdentity) {
 		trustCache.remove(ownIdentity);
+		return this;
 	}
 
 	//
 	// OBJECT METHODS
 	//
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public int hashCode() {
-		return id.hashCode();
+		return getId().hashCode();
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public boolean equals(Object object) {
-		if (!(object instanceof DefaultIdentity)) {
+		if (!(object instanceof Identity)) {
 			return false;
 		}
-		DefaultIdentity identity = (DefaultIdentity) object;
-		return identity.id.equals(id);
+		Identity identity = (Identity) object;
+		return identity.getId().equals(getId());
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public String toString() {
 		return getClass().getSimpleName() + "[id=" + id + ",nickname=" + nickname + ",contexts=" + contexts + ",properties=" + properties + "]";