From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sat, 5 Nov 2011 15:55:54 +0000 (+0100)
Subject: Merge branch 'link-filter-26' into next
X-Git-Tag: 0.7.3^2~17
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=b28eb5baea51a37d9765833e0184e2a10a86819b;hp=-c

Merge branch 'link-filter-26' into next
---

b28eb5baea51a37d9765833e0184e2a10a86819b
diff --combined src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
index 30673a3,af680a1..c63231a
--- a/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
+++ b/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
@@@ -26,6 -26,7 +26,6 @@@ import java.util.Map
  import java.util.logging.Level;
  import java.util.logging.Logger;
  
 -import net.pterodactylus.sone.core.SoneException.Type;
  import net.pterodactylus.sone.data.Image;
  import net.pterodactylus.sone.data.Sone;
  import net.pterodactylus.sone.data.TemporaryImage;
@@@ -153,7 -154,7 +153,7 @@@ public class FreenetInterface 
  			ClientPutter clientPutter = client.insert(insertBlock, false, null, false, insertContext, insertToken, RequestStarter.INTERACTIVE_PRIORITY_CLASS);
  			insertToken.setClientPutter(clientPutter);
  		} catch (InsertException ie1) {
 -			throw new SoneException(Type.INSERT_FAILED, "Could not start image insert.", ie1);
 +			throw new SoneInsertException("Could not start image insert.", ie1);
  		}
  	}
  
@@@ -174,7 -175,7 +174,7 @@@
  		try {
  			return client.insertManifest(insertUri, manifestEntries, defaultFile);
  		} catch (InsertException ie1) {
 -			throw new SoneException(null, ie1);
 +			throw new SoneException(ie1);
  		}
  	}
  
@@@ -451,6 -452,14 +451,14 @@@
  		 * {@inheritDoc}
  		 */
  		@Override
+ 		public void onGeneratedMetadata(Bucket metadata, BaseClientPutter clientPutter, ObjectContainer objectContainer) {
+ 			/* ignore, we don’t care. */
+ 		}
+ 
+ 		/**
+ 		 * {@inheritDoc}
+ 		 */
+ 		@Override
  		public void onGeneratedURI(FreenetURI generatedUri, BaseClientPutter clientPutter, ObjectContainer objectContainer) {
  			resultingUri = generatedUri;
  		}