Merge branch 'master' into next

[Sone.git] / src / main / java / net / pterodactylus / sone / freenet / wot / Identity.java

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 41540e5..0a9fb93 100644 (file)
--- 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 David Roden
+ * Sone - Identity.java - Copyright © 2010–2012 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
@@ -85,13 +85,15 @@ public interface Identity {
 
        /**
         * Retrieves the trust that this identity receives from the given own
-        * identity.
+        * identity. If this identity is not in the own identity’s trust tree, a
+        * {@link Trust} is returned that has all its elements set to {@code null}.
+        * If the trust can not be retrieved, {@code null} is returned.
         *
         * @param ownIdentity
         *            The own identity to get the trust for
-        * @return The trust assigned to this identity
-        * @throws WebOfTrustException
+        * @return The trust assigned to this identity, or {@code null} if the trust
+        *         could not be retrieved
         */
-       public Trust getTrust(OwnIdentity ownIdentity) throws WebOfTrustException;
+       public Trust getTrust(OwnIdentity ownIdentity);
 
 }