X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fmain%2FMain.java;h=75c145385da37e19960f5bcd3fdfec150b1e9fba;hb=3b53ea254e50420df8fe2ea9121855d600560f88;hp=b00e02088edd8067d58cb1fabe28f8d156e0f6f4;hpb=e55f3540316c9d2dc5e2d543384db15f8b48e67a;p=jSite.git
diff --git a/src/de/todesbaum/jsite/main/Main.java b/src/de/todesbaum/jsite/main/Main.java
index b00e020..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;
@@ -61,26 +64,32 @@ import de.todesbaum.util.swing.WizardListener;
/**
* The main class that ties together everything.
- *
+ *
* @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;
/**
* Enumeration for all possible pages.
- *
+ *
* @author David âBombeâ Roden <bombe@freenetproject.org>
*/
private static enum PageType {
@@ -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;
@@ -132,7 +144,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
/**
* Creates a new core with the given configuration from the given file.
- *
+ *
* @param configFilename
* The name of the configuration file
*/
@@ -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);
}
};
@@ -204,7 +233,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
/**
* Creates the menu bar.
- *
+ *
* @return The menu bar
*/
private JMenuBar createMenuBar() {
@@ -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() {
@@ -282,7 +312,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
/**
* Shows the page with the given type.
- *
+ *
* @param pageType
* The page type to show
*/
@@ -295,7 +325,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
/**
* Saves the configuration.
- *
+ *
* @return true if the configuration could be saved,
* false otherwise
*/
@@ -314,7 +344,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
/**
* Finds a supported locale for the given locale.
- *
+ *
* @param forLocale
* The locale to find a supported locale for
* @return The supported locale that was found, or the default locale if no
@@ -339,13 +369,22 @@ 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
//
/**
* Switches the language of the interface to the given locale.
- *
+ *
* @param locale
* The locale to switch to
*/
@@ -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,12 +588,25 @@ 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
//
/**
* Main method that is called by the VM.
- *
+ *
* @param args
* The command-line arguments
*/