X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fmain%2FMain.java;h=75c145385da37e19960f5bcd3fdfec150b1e9fba;hb=3b53ea254e50420df8fe2ea9121855d600560f88;hp=2f538d0804a1d477e7cc9bd588df4b52826a6d1a;hpb=5ec1445adc031dccabae42c8c9b315c7c9d44557;p=jSite.git

diff --git a/src/de/todesbaum/jsite/main/Main.java b/src/de/todesbaum/jsite/main/Main.java
index 2f538d0..75c1453 100644
--- a/src/de/todesbaum/jsite/main/Main.java
+++ b/src/de/todesbaum/jsite/main/Main.java
@@ -24,6 +24,7 @@ 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;
@@ -52,6 +53,8 @@ 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.gui.UpdateListener;
 import de.todesbaum.jsite.i18n.I18n;
 import de.todesbaum.jsite.i18n.I18nContainer;
 import de.todesbaum.util.image.IconLoader;
@@ -64,17 +67,23 @@ 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);
+
 	/** The configuration. */
 	private Configuration configuration;
 
 	/** The freenet interface. */
 	private Freenet7Interface freenetInterface = new Freenet7Interface();
 
+	/** The update checker. */
+	private final UpdateChecker updateChecker;
+
 	/** The jSite icon. */
 	private Icon jSiteIcon;
 
@@ -108,6 +117,9 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 	/** The “manage nodes” action. */
 	private Action manageNodeAction;
 
+	/** The “check for updates” action. */
+	private Action checkForUpdatesAction;
+
 	/** The “about jSite” action. */
 	private Action aboutAction;
 
@@ -145,8 +157,11 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 		Locale.setDefault(configuration.getLocale());
 		I18n.setLocale(configuration.getLocale());
 		if (!configuration.createLockFile()) {
-			JOptionPane.showMessageDialog(null, I18n.getMessage("jsite.main.already-running"), null, JOptionPane.ERROR_MESSAGE);
-			return;
+			int option = JOptionPane.showOptionDialog(null, I18n.getMessage("jsite.main.already-running"), "", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, new Object[] { I18n.getMessage("jsite.main.already-running.override"), I18n.getMessage("jsite.wizard.quit") }, I18n.getMessage("jsite.wizard.quit"));
+			if (option != 0) {
+				throw new IllegalStateException("Lockfile override not active, refusing start.");
+			}
+			configuration.removeLockfileOnExit();
 		}
 		wizard = new TWizard();
 		createActions();
@@ -158,6 +173,10 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 		jSiteIcon = IconLoader.loadIcon("/jsite-icon.png");
 		wizard.setIcon(jSiteIcon);
 
+		updateChecker = new UpdateChecker(freenetInterface);
+		updateChecker.addUpdateListener(this);
+		updateChecker.start();
+
 		initPages();
 		showPage(PageType.PAGE_PROJECTS);
 	}
@@ -184,11 +203,21 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 				wizard.setNextName(I18n.getMessage("jsite.wizard.next"));
 			}
 		};
+		checkForUpdatesAction = new AbstractAction(I18n.getMessage("jsite.menu.help.check-for-updates")) {
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@SuppressWarnings("synthetic-access")
+			public void actionPerformed(ActionEvent actionEvent) {
+				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);
 			}
 		};
 
@@ -234,6 +263,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 
 		final JMenu helpMenu = new JMenu(I18n.getMessage("jsite.menu.help"));
 		menuBar.add(helpMenu);
+		helpMenu.add(checkForUpdatesAction);
 		helpMenu.add(aboutAction);
 
 		I18nContainer.getInstance().registerRunnable(new Runnable() {
@@ -339,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
 	//
@@ -366,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
 	//
@@ -411,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;
 				}
@@ -533,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
 	//