From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Wed, 12 Sep 2012 07:14:08 +0000 (+0200)
Subject: Merge remote-tracking branch 'beak/next' into next
X-Git-Tag: 0.8.3^2~39
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=d1e011bc62bede509d8482dfeea950823b974413;hp=-c

Merge remote-tracking branch 'beak/next' into next
---

d1e011bc62bede509d8482dfeea950823b974413
diff --combined src/main/java/net/pterodactylus/sone/core/Core.java
index e3fdd19,294ff0d..9e1e6c6
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@@ -53,7 -53,6 +53,6 @@@ import net.pterodactylus.sone.freenet.w
  import net.pterodactylus.sone.freenet.wot.IdentityListener;
  import net.pterodactylus.sone.freenet.wot.IdentityManager;
  import net.pterodactylus.sone.freenet.wot.OwnIdentity;
- import net.pterodactylus.sone.freenet.wot.Trust;
  import net.pterodactylus.sone.main.SonePlugin;
  import net.pterodactylus.util.config.Configuration;
  import net.pterodactylus.util.config.ConfigurationException;
@@@ -1042,26 -1041,6 +1041,6 @@@ public class Core extends AbstractServi
  	}
  
  	/**
- 	 * Retrieves the trust relationship from the origin to the target. If the
- 	 * trust relationship can not be retrieved, {@code null} is returned.
- 	 *
- 	 * @see Identity#getTrust(OwnIdentity)
- 	 * @param origin
- 	 *            The origin of the trust tree
- 	 * @param target
- 	 *            The target of the trust
- 	 * @return The trust relationship
- 	 */
- 	public Trust getTrust(Sone origin, Sone target) {
- 		if (!isLocalSone(origin)) {
- 			logger.log(Level.WARNING, String.format("Tried to get trust from remote Sone: %s", origin));
- 			return null;
- 		}
- 		webOfTrustUpdater.getTrust((OwnIdentity) origin.getIdentity(), target.getIdentity());
- 		return target.getIdentity().getTrust((OwnIdentity) origin.getIdentity());
- 	}
- 
- 	/**
  	 * Sets the trust value of the given origin Sone for the target Sone.
  	 *
  	 * @param origin
@@@ -1987,11 -1966,13 +1966,13 @@@
  	@Override
  	public void serviceStop() {
  		synchronized (localSones) {
- 			for (SoneInserter soneInserter : soneInserters.values()) {
- 				soneInserter.removeSoneInsertListener(this);
- 				soneInserter.stop();
+ 			for (Entry<Sone, SoneInserter> soneInserter : soneInserters.entrySet()) {
+ 				soneInserter.getValue().removeSoneInsertListener(this);
+ 				soneInserter.getValue().stop();
+ 				saveSone(soneInserter.getKey());
  			}
  		}
+ 		saveConfiguration();
  		webOfTrustUpdater.stop();
  		updateChecker.stop();
  		updateChecker.removeUpdateListener(this);
@@@ -2369,12 -2350,12 +2350,12 @@@
  	 *            The URI to derive the Sone URI from
  	 * @return The derived URI
  	 */
- 	private FreenetURI getSoneUri(String uriString) {
+ 	private static FreenetURI getSoneUri(String uriString) {
  		try {
  			FreenetURI uri = new FreenetURI(uriString).setDocName("Sone").setMetaString(new String[0]);
  			return uri;
  		} catch (MalformedURLException mue1) {
 -			logger.log(Level.WARNING, String.format("Could not create Sone URI from URI: %s", uriString, mue1));
 +			logger.log(Level.WARNING, String.format("Could not create Sone URI from URI: %s", uriString), mue1);
  			return null;
  		}
  	}