X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fapplication%2FUpdateChecker.java;h=01960b8dbd2294acb5f3e68abb97126213057581;hb=593eba180ca6538a680810651f127fbcf0a620a3;hp=a87beabafce2a7d143529aa38cb4e51fc203c040;hpb=874f7bd2c0c0435f613b8f9f5b3a16ebf2b4839b;p=jSite.git

diff --git a/src/de/todesbaum/jsite/application/UpdateChecker.java b/src/de/todesbaum/jsite/application/UpdateChecker.java
index a87beab..01960b8 100644
--- a/src/de/todesbaum/jsite/application/UpdateChecker.java
+++ b/src/de/todesbaum/jsite/application/UpdateChecker.java
@@ -1,6 +1,5 @@
 /*
- * jSite-remote - UpdateChecker.java -
- * Copyright © 2008 David Roden
+ * jSite - UpdateChecker.java - Copyright © 2008–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
@@ -24,6 +23,8 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import de.todesbaum.jsite.main.Main;
 import de.todesbaum.jsite.main.Version;
@@ -43,11 +44,14 @@ import de.todesbaum.util.io.Closer;
  */
 public class UpdateChecker implements Runnable {
 
+	/** The logger. */
+	private static final Logger logger = Logger.getLogger(UpdateChecker.class.getName());
+
 	/** Counter for connection names. */
 	private static int counter = 0;
 
 	/** The edition for the update check URL. */
-	private static final int UPDATE_EDITION = 0;
+	private static final int UPDATE_EDITION = 17;
 
 	/** The URL for update checks. */
 	private static final String UPDATE_KEY = "USK@e3myoFyp5avg6WYN16ImHri6J7Nj8980Fm~aQe4EX1U,QvbWT0ImE0TwLODTl7EoJx2NBnwDxTbLTE6zkB-eGPs,AQACAAE";
@@ -187,6 +191,7 @@ public class UpdateChecker implements Runnable {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public void run() {
 		Connection connection = freenetInterface.getConnection("jSite-" + ++counter + "-UpdateChecker");
 		try {
@@ -199,7 +204,7 @@ public class UpdateChecker implements Runnable {
 		int currentEdition = lastUpdateEdition;
 		while (!shouldStop()) {
 			checkNow = false;
-			System.out.println("Trying " + constructUpdateKey(currentEdition));
+			logger.log(Level.FINE, "Trying " + constructUpdateKey(currentEdition));
 			ClientGet clientGet = new ClientGet("get-update-key");
 			clientGet.setUri(constructUpdateKey(currentEdition));
 			clientGet.setPersistence(Persistence.CONNECTION);
@@ -210,7 +215,10 @@ public class UpdateChecker implements Runnable {
 				boolean stop = false;
 				while (!stop) {
 					Message message = client.readMessage();
-					System.out.println(message);
+					logger.log(Level.FINEST, "Received message: " + message);
+					if (message == null) {
+						break;
+					}
 					if ("GetFailed".equals(message.getName())) {
 						if ("27".equals(message.get("code"))) {
 							String editionString = message.get("redirecturi").split("/")[2];
@@ -221,7 +229,7 @@ public class UpdateChecker implements Runnable {
 								/* ignore. */
 							}
 							if (editionNumber != -1) {
-								System.out.println("Found new edition " + editionNumber);
+								logger.log(Level.INFO, "Found new edition " + editionNumber);
 								currentEdition = editionNumber;
 								lastUpdateEdition = editionNumber;
 								checkNow = true;
@@ -230,7 +238,7 @@ public class UpdateChecker implements Runnable {
 						}
 					}
 					if ("AllData".equals(message.getName())) {
-						System.out.println("Update data found.");
+						logger.log(Level.FINE, "Update data found.");
 						InputStream dataInputStream = null;
 						Properties properties = new Properties();
 						try {
@@ -246,7 +254,7 @@ public class UpdateChecker implements Runnable {
 							if (foundVersion != null) {
 								lastVersion = foundVersion;
 								String versionTimestampString = properties.getProperty("jSite.Date");
-								System.out.println(versionTimestampString);
+								logger.log(Level.FINEST, "Version timestamp: " + versionTimestampString);
 								long versionTimestamp = -1;
 								try {
 									versionTimestamp = Long.parseLong(versionTimestampString);
@@ -262,7 +270,7 @@ public class UpdateChecker implements Runnable {
 					}
 				}
 			} catch (IOException e) {
-				System.out.println("Got IOException: " + e.getMessage());
+				logger.log(Level.INFO, "Got IOException: " + e.getMessage());
 				e.printStackTrace();
 			}
 			if (!checkNow && !shouldStop()) {