X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fmain%2FMain.java;h=a2ba940699666fe293efe40d59c8080f058e18a4;hb=e7b545e8c74f4ac8ffdc94959fb3fb96931a2cfe;hp=b04473d5011432981526b8030d6c8b4cfdb8cb1f;hpb=195933c1bcb643143275b2725b01acecda59bcce;p=jSite.git

diff --git a/src/de/todesbaum/jsite/main/Main.java b/src/de/todesbaum/jsite/main/Main.java
index b04473d..a2ba940 100644
--- a/src/de/todesbaum/jsite/main/Main.java
+++ b/src/de/todesbaum/jsite/main/Main.java
@@ -24,11 +24,16 @@ import java.awt.event.ActionListener;
 import java.io.File;
 import java.io.IOException;
 import java.text.MessageFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.Map.Entry;
+import java.util.logging.ConsoleHandler;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import javax.swing.AbstractAction;
 import javax.swing.Action;
@@ -47,12 +52,13 @@ import de.todesbaum.jsite.application.FileOption;
 import de.todesbaum.jsite.application.Freenet7Interface;
 import de.todesbaum.jsite.application.Node;
 import de.todesbaum.jsite.application.Project;
+import de.todesbaum.jsite.application.UpdateChecker;
+import de.todesbaum.jsite.application.UpdateListener;
 import de.todesbaum.jsite.gui.NodeManagerListener;
 import de.todesbaum.jsite.gui.NodeManagerPage;
 import de.todesbaum.jsite.gui.ProjectFilesPage;
 import de.todesbaum.jsite.gui.ProjectInsertPage;
 import de.todesbaum.jsite.gui.ProjectPage;
-import de.todesbaum.jsite.gui.UpdateChecker;
 import de.todesbaum.jsite.i18n.I18n;
 import de.todesbaum.jsite.i18n.I18nContainer;
 import de.todesbaum.util.image.IconLoader;
@@ -65,10 +71,10 @@ import de.todesbaum.util.swing.WizardListener;
  *
  * @author David ‘Bombe’ Roden <bombe@freenetproject.org>
  */
-public class Main implements ActionListener, ListSelectionListener, WizardListener, NodeManagerListener {
+public class Main implements ActionListener, ListSelectionListener, WizardListener, NodeManagerListener, UpdateListener {
 
-	/** Whether the debug mode is activated. */
-	private static boolean debug = false;
+	/** The version. */
+	private static final Version VERSION = new Version(0, 7, 1);
 
 	/** The configuration. */
 	private Configuration configuration;
@@ -168,7 +174,9 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 		jSiteIcon = IconLoader.loadIcon("/jsite-icon.png");
 		wizard.setIcon(jSiteIcon);
 
-		updateChecker = new UpdateChecker(wizard, freenetInterface);
+		updateChecker = new UpdateChecker(freenetInterface);
+		updateChecker.addUpdateListener(this);
+		updateChecker.start();
 
 		initPages();
 		showPage(PageType.PAGE_PROJECTS);
@@ -203,14 +211,14 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 			 */
 			@SuppressWarnings("synthetic-access")
 			public void actionPerformed(ActionEvent actionEvent) {
-				updateChecker.checkForUpdates();
+				showLatestUpdate();
 			}
 		};
 		aboutAction = new AbstractAction(I18n.getMessage("jsite.menu.help.about")) {
 
 			@SuppressWarnings("synthetic-access")
 			public void actionPerformed(ActionEvent e) {
-				JOptionPane.showMessageDialog(wizard, MessageFormat.format(I18n.getMessage("jsite.about.message"), Version.getVersion()), null, JOptionPane.INFORMATION_MESSAGE, jSiteIcon);
+				JOptionPane.showMessageDialog(wizard, MessageFormat.format(I18n.getMessage("jsite.about.message"), getVersion().toString()), null, JOptionPane.INFORMATION_MESSAGE, jSiteIcon);
 			}
 		};
 
@@ -297,7 +305,6 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 		pages.put(PageType.PAGE_PROJECT_FILES, projectFilesPage);
 
 		ProjectInsertPage projectInsertPage = new ProjectInsertPage(wizard);
-		projectInsertPage.setDebug(debug);
 		projectInsertPage.setName("page.project.insert");
 		projectInsertPage.setFreenetInterface(freenetInterface);
 		pages.put(PageType.PAGE_INSERT_PROJECT, projectInsertPage);
@@ -362,6 +369,15 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 		return SUPPORTED_LOCALES[0];
 	}
 
+	/**
+	 * Returns the version.
+	 *
+	 * @return The version
+	 */
+	public static final Version getVersion() {
+		return VERSION;
+	}
+
 	//
 	// ACTIONS
 	//
@@ -389,6 +405,22 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 		configuration.setLocale(supportedLocale);
 	}
 
+	/**
+	 * Shows a dialog box that shows the last version that was found by the
+	 * {@link UpdateChecker}.
+	 */
+	private void showLatestUpdate() {
+		Version latestVersion = updateChecker.getLatestVersion();
+		int versionDifference = latestVersion.compareTo(VERSION);
+		if (versionDifference > 0) {
+			JOptionPane.showMessageDialog(wizard, MessageFormat.format(I18n.getMessage("jsite.update-checker.latest-version.newer.message"), VERSION, latestVersion), I18n.getMessage("jsite.update-checker.latest-version.title"), JOptionPane.INFORMATION_MESSAGE);
+		} else if (versionDifference < 0) {
+			JOptionPane.showMessageDialog(wizard, MessageFormat.format(I18n.getMessage("jsite.update-checker.latest-version.older.message"), VERSION, latestVersion), I18n.getMessage("jsite.update-checker.latest-version.title"), JOptionPane.INFORMATION_MESSAGE);
+		} else {
+			JOptionPane.showMessageDialog(wizard, MessageFormat.format(I18n.getMessage("jsite.update-checker.latest-version.okay.message"), VERSION, latestVersion), I18n.getMessage("jsite.update-checker.latest-version.title"), JOptionPane.INFORMATION_MESSAGE);
+		}
+	}
+
 	//
 	// INTERFACE ListSelectionListener
 	//
@@ -434,7 +466,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 				JOptionPane.showMessageDialog(wizard, I18n.getMessage("jsite.project-files.no-node-selected"), null, JOptionPane.ERROR_MESSAGE);
 				return;
 			}
-			if (project.getIndexFile() == null) {
+			if ((project.getIndexFile() == null) || (project.getIndexFile().length() == 0)) {
 				if (JOptionPane.showConfirmDialog(wizard, I18n.getMessage("jsite.project-files.empty-index"), null, JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE) != JOptionPane.OK_OPTION) {
 					return;
 				}
@@ -556,6 +588,19 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 	}
 
 	//
+	// INTERFACE UpdateListener
+	//
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public void foundUpdateData(Version foundVersion, long versionTimestamp) {
+		if (foundVersion.compareTo(VERSION) > 0) {
+			JOptionPane.showMessageDialog(wizard, MessageFormat.format(I18n.getMessage("jsite.update-checker.found-version.message"), foundVersion.toString(), new Date(versionTimestamp)), I18n.getMessage("jsite.update-checker.found-version.title"), JOptionPane.INFORMATION_MESSAGE);
+		}
+	}
+
+	//
 	// MAIN METHOD
 	//
 
@@ -566,6 +611,10 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 	 *            The command-line arguments
 	 */
 	public static void main(String[] args) {
+		/* initialize logger. */
+		Logger logger = Logger.getLogger("de.todesbaum");
+		Handler handler = new ConsoleHandler();
+		logger.addHandler(handler);
 		String configFilename = null;
 		boolean nextIsConfigFilename = false;
 		for (String argument : args) {
@@ -577,7 +626,8 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 				printHelp();
 				return;
 			} else if ("--debug".equals(argument)) {
-				debug = true;
+				logger.setLevel(Level.ALL);
+				handler.setLevel(Level.ALL);
 			} else if ("--config-file".equals(argument)) {
 				nextIsConfigFilename = true;
 			}