X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fmain%2FMain.java;h=a2ba940699666fe293efe40d59c8080f058e18a4;hb=e7b545e8c74f4ac8ffdc94959fb3fb96931a2cfe;hp=abe9b738247fdeba29ce14c2bf4a0a108bd6edd1;hpb=61db8327999361bf9154236a8713bf72c06bc3d7;p=jSite.git diff --git a/src/de/todesbaum/jsite/main/Main.java b/src/de/todesbaum/jsite/main/Main.java index abe9b73..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,6 +52,8 @@ 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; @@ -64,13 +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 URL for update checks. */ - private static final String UPDATE_KEY = "USK@e3myoFyp5avg6WYN16ImHri6J7Nj8980Fm~aQe4EX1U,QvbWT0ImE0TwLODTl7EoJx2NBnwDxTbLTE6zkB-eGPs,AQACAAE/jSite/0/currentVersion.txt"; + /** The version. */ + private static final Version VERSION = new Version(0, 7, 1); /** The configuration. */ private Configuration configuration; @@ -78,6 +82,9 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen /** The freenet interface. */ private Freenet7Interface freenetInterface = new Freenet7Interface(); + /** The update checker. */ + private final UpdateChecker updateChecker; + /** The jSite icon. */ private Icon jSiteIcon; @@ -153,7 +160,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen if (!configuration.createLockFile()) { 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) { - return; + throw new IllegalStateException("Lockfile override not active, refusing start."); } configuration.removeLockfileOnExit(); } @@ -167,6 +174,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); } @@ -200,14 +211,14 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen */ @SuppressWarnings("synthetic-access") public void actionPerformed(ActionEvent actionEvent) { - 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); } }; @@ -253,6 +264,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() { @@ -293,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); @@ -358,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 // @@ -386,10 +406,19 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen } /** - * Checks for updates of jSite. + * Shows a dialog box that shows the last version that was found by the + * {@link UpdateChecker}. */ - private void checkForUpdates() { - + 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); + } } // @@ -437,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; } @@ -559,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 // @@ -569,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) { @@ -580,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; }