Turn (Own)Identity into mere caches of values from the WebOfTrust.

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

diff --git a/src/main/java/net/pterodactylus/sone/freenet/wot/DefaultOwnIdentity.java b/src/main/java/net/pterodactylus/sone/freenet/wot/DefaultOwnIdentity.java
index 9a104e8..451dd5f 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/DefaultOwnIdentity.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/DefaultOwnIdentity.java
@@ -1,5 +1,5 @@
 /*
- * Sone - DefaultOwnIdentity.java - Copyright © 2010 David Roden
+ * Sone - DefaultOwnIdentity.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
@@ -17,12 +17,6 @@
 
 package net.pterodactylus.sone.freenet.wot;
 
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import net.pterodactylus.util.validation.Validation;
-
 /**
  * An own identity is an identity that the owner of the node has full control
  * over.
@@ -31,17 +25,12 @@ import net.pterodactylus.util.validation.Validation;
  */
 public class DefaultOwnIdentity extends DefaultIdentity implements OwnIdentity {
 
-       /** The identity manager. */
-       private final WebOfTrustConnector webOfTrustConnector;
-
        /** The insert URI of the identity. */
        private final String insertUri;
 
        /**
         * Creates a new own identity.
         *
-        * @param webOfTrustConnector
-        *            The identity manager
         * @param id
         *            The ID of the identity
         * @param nickname
@@ -51,12 +40,24 @@ public class DefaultOwnIdentity extends DefaultIdentity implements OwnIdentity {
         * @param insertUri
         *            The insert URI of the identity
         */
-       public DefaultOwnIdentity(WebOfTrustConnector webOfTrustConnector, String id, String nickname, String requestUri, String insertUri) {
-               super(webOfTrustConnector, id, nickname, requestUri);
-               this.webOfTrustConnector = webOfTrustConnector;
+       public DefaultOwnIdentity(String id, String nickname, String requestUri, String insertUri) {
+               super(id, nickname, requestUri);
                this.insertUri = insertUri;
        }
 
+       /**
+        * Copy constructor for an own identity.
+        *
+        * @param ownIdentity
+        *            The own identity to copy
+        */
+       public DefaultOwnIdentity(OwnIdentity ownIdentity) {
+               super(ownIdentity.getId(), ownIdentity.getNickname(), ownIdentity.getRequestUri());
+               this.insertUri = ownIdentity.getInsertUri();
+               setContexts(ownIdentity.getContexts());
+               setProperties(ownIdentity.getProperties());
+       }
+
        //
        // ACCESSORS
        //
@@ -69,96 +70,4 @@ public class DefaultOwnIdentity extends DefaultIdentity implements OwnIdentity {
                return insertUri;
        }
 
-       /**
-        * {@inheritDoc}
-        */
-       @Override
-       public void addContext(String context) throws WebOfTrustException {
-               webOfTrustConnector.addContext(this, context);
-               addContextPrivate(context);
-       }
-
-       /**
-        * {@inheritDoc}
-        */
-       @Override
-       public void removeContext(String context) throws WebOfTrustException {
-               webOfTrustConnector.removeContext(this, context);
-               removeContextPrivate(context);
-       }
-
-       /**
-        * {@inheritDoc}
-        */
-       @Override
-       public void setContexts(Set<String> contexts) throws WebOfTrustException {
-               for (String context : getContexts()) {
-                       if (!contexts.contains(context)) {
-                               webOfTrustConnector.removeContext(this, context);
-                       }
-               }
-               for (String context : contexts) {
-                       if (!getContexts().contains(context)) {
-                               webOfTrustConnector.addContext(this, context);
-                       }
-               }
-               setContextsPrivate(contexts);
-       }
-
-       /**
-        * {@inheritDoc}
-        */
-       @Override
-       public void setProperty(String name, String value) throws WebOfTrustException {
-               webOfTrustConnector.setProperty(this, name, value);
-               setPropertyPrivate(name, value);
-       }
-
-       /**
-        * {@inheritDoc}
-        */
-       @Override
-       public void removeProperty(String name) throws WebOfTrustException {
-               webOfTrustConnector.removeProperty(this, name);
-               removePropertyPrivate(name);
-       }
-
-       /**
-        * {@inheritDoc}
-        */
-       @Override
-       public void setProperties(Map<String, String> properties) throws WebOfTrustException {
-               for (Entry<String, String> oldProperty : getProperties().entrySet()) {
-                       if (!properties.containsKey(oldProperty.getKey())) {
-                               webOfTrustConnector.removeProperty(this, oldProperty.getKey());
-                       } else {
-                               webOfTrustConnector.setProperty(this, oldProperty.getKey(), properties.get(oldProperty.getKey()));
-                       }
-               }
-               for (Entry<String, String> newProperty : properties.entrySet()) {
-                       if (!getProperties().containsKey(newProperty.getKey())) {
-                               webOfTrustConnector.setProperty(this, newProperty.getKey(), newProperty.getValue());
-                       }
-               }
-               setPropertiesPrivate(properties);
-       }
-
-       /**
-        * {@inheritDoc}
-        */
-       @Override
-       public void setTrust(Identity target, int trustValue, String comment) throws WebOfTrustException {
-               Validation.begin().isNotNull("Trust Target", target).isNotNull("Trust Comment", comment).isLessOrEqual("Trust Value", trustValue, 100).isGreaterOrEqual("Trust Value", trustValue, -100).check();
-               webOfTrustConnector.setTrust(this, target, trustValue, comment);
-       }
-
-       /**
-        * {@inheritDoc}
-        */
-       @Override
-       public void removeTrust(Identity target) throws WebOfTrustException {
-               Validation.begin().isNotNull("Trust Target", target).check();
-               webOfTrustConnector.removeTrust(this, target);
-       }
-
 }