X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FUpdateChecker.java;h=307025aeba55f19e4ad3018195cd6fdc17b19576;hp=511f4e1478d4e2654c1afc77eb501fd9f4b20232;hb=48c925acefd513c3a14728611aec88d1dd3bd57b;hpb=5a9e7b3b9e2ffa21edb6b8d223d9f4d514f05f28

diff --git a/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java b/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java
index 511f4e1..307025a 100644
--- a/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java
+++ b/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java
@@ -1,5 +1,5 @@
 /*
- * Sone - UpdateChecker.java - Copyright © 2011 David Roden
+ * Sone - UpdateChecker.java - Copyright © 2011–2013 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,12 +26,16 @@ import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import net.pterodactylus.sone.core.FreenetInterface.Fetched;
+import net.pterodactylus.sone.core.event.UpdateFoundEvent;
 import net.pterodactylus.sone.main.SonePlugin;
-import net.pterodactylus.util.collection.Pair;
 import net.pterodactylus.util.io.Closer;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.version.Version;
-import freenet.client.FetchResult;
+
+import com.google.common.eventbus.EventBus;
+import com.google.inject.Inject;
+
 import freenet.keys.FreenetURI;
 import freenet.support.api.Bucket;
 
@@ -49,14 +53,14 @@ public class UpdateChecker {
 	private static final String SONE_HOMEPAGE = "USK@nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI,DuQSUZiI~agF8c-6tjsFFGuZ8eICrzWCILB60nT8KKo,AQACAAE/sone/";
 
 	/** The current latest known edition. */
-	private static final int LATEST_EDITION = 49;
+	private static final int LATEST_EDITION = 62;
+
+	/** The event bus. */
+	private final EventBus eventBus;
 
 	/** The Freenet interface. */
 	private final FreenetInterface freenetInterface;
 
-	/** The update listener manager. */
-	private final UpdateListenerManager updateListenerManager = new UpdateListenerManager();
-
 	/** The current URI of the homepage. */
 	private FreenetURI currentUri;
 
@@ -72,38 +76,18 @@ public class UpdateChecker {
 	/**
 	 * Creates a new update checker.
 	 *
+	 * @param eventBus
+	 *            The event bus
 	 * @param freenetInterface
 	 *            The freenet interface to use
 	 */
-	public UpdateChecker(FreenetInterface freenetInterface) {
+	@Inject
+	public UpdateChecker(EventBus eventBus, FreenetInterface freenetInterface) {
+		this.eventBus = eventBus;
 		this.freenetInterface = freenetInterface;
 	}
 
 	//
-	// EVENT LISTENER MANAGEMENT
-	//
-
-	/**
-	 * Adds the given listener to the list of registered listeners.
-	 *
-	 * @param updateListener
-	 *            The listener to add
-	 */
-	public void addUpdateListener(UpdateListener updateListener) {
-		updateListenerManager.addListener(updateListener);
-	}
-
-	/**
-	 * Removes the given listener from the list of registered listeners.
-	 *
-	 * @param updateListener
-	 *            The listener to remove
-	 */
-	public void removeUpdateListener(UpdateListener updateListener) {
-		updateListenerManager.removeListener(updateListener);
-	}
-
-	//
 	// ACCESSORS
 	//
 
@@ -168,12 +152,12 @@ public class UpdateChecker {
 			public void editionFound(FreenetURI uri, long edition, boolean newKnownGood, boolean newSlot) {
 				logger.log(Level.FINEST, String.format("Found update for %s: %d, %s, %s", uri, edition, newKnownGood, newSlot));
 				if (newKnownGood || newSlot) {
-					Pair<FreenetURI, FetchResult> uriResult = freenetInterface.fetchUri(uri.setMetaString(new String[] { "sone.properties" }));
+					Fetched uriResult = freenetInterface.fetchUri(uri.setMetaString(new String[] { "sone.properties" }));
 					if (uriResult == null) {
 						logger.log(Level.WARNING, String.format("Could not fetch properties of latest homepage: %s", uri));
 						return;
 					}
-					Bucket resultBucket = uriResult.getRight().asBucket();
+					Bucket resultBucket = uriResult.getFetchResult().asBucket();
 					try {
 						parseProperties(resultBucket.getInputStream(), edition);
 						latestEdition = edition;
@@ -202,8 +186,7 @@ public class UpdateChecker {
 	 * Parses the properties of the latest version and fires events, if
 	 * necessary.
 	 *
-	 * @see UpdateListener#updateFound(Version, long, long)
-	 * @see UpdateListenerManager#fireUpdateFound(Version, long, long)
+	 * @see UpdateFoundEvent
 	 * @param propertiesInputStream
 	 *            The input stream to parse
 	 * @param edition
@@ -241,7 +224,7 @@ public class UpdateChecker {
 			currentLatestVersion = version;
 			latestVersionDate = releaseTime;
 			logger.log(Level.INFO, String.format("Found new version: %s (%tc)", version, new Date(releaseTime)));
-			updateListenerManager.fireUpdateFound(version, releaseTime, edition);
+			eventBus.post(new UpdateFoundEvent(version, releaseTime, edition));
 		}
 	}