Declare all possibly-static methods as static.

[jSite.git] / src / de / todesbaum / jsite / main / Main.java

diff --git a/src/de/todesbaum/jsite/main/Main.java b/src/de/todesbaum/jsite/main/Main.java
index 4c7752f..3c9c3fa 100644 (file)
--- a/src/de/todesbaum/jsite/main/Main.java
+++ b/src/de/todesbaum/jsite/main/Main.java
@@ -1,6 +1,5 @@
 /*
- * jSite - a tool for uploading websites into Freenet
- * Copyright © 2006–2011 David Roden
+ * jSite - Main.java - Copyright © 2006–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
@@ -51,10 +50,10 @@ import de.todesbaum.jsite.application.Freenet7Interface;
 import de.todesbaum.jsite.application.Node;
 import de.todesbaum.jsite.application.Project;
 import de.todesbaum.jsite.application.ProjectInserter;
-import de.todesbaum.jsite.application.UpdateChecker;
-import de.todesbaum.jsite.application.UpdateListener;
 import de.todesbaum.jsite.application.ProjectInserter.CheckReport;
 import de.todesbaum.jsite.application.ProjectInserter.Issue;
+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.PreferencesPage;
@@ -80,7 +79,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
        private static final Logger logger = Logger.getLogger(Main.class.getName());
 
        /** The version. */
-       private static final Version VERSION = new Version(0, 9, 2);
+       private static final Version VERSION = new Version(0, 10);
 
        /** The configuration. */
        private Configuration configuration;
@@ -148,6 +147,9 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
        /** Mapping from page type to page. */
        private final Map<PageType, TWizardPage> pages = new HashMap<PageType, TWizardPage>();
 
+       /** The original location of the configuration file. */
+       private ConfigurationLocation originalLocation;
+
        /**
         * Creates a new core with the default configuration file.
         */
@@ -168,9 +170,9 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
                        configurationLocator.setCustomLocation(configFilename);
                }
 
-               ConfigurationLocation preferredLocation = configurationLocator.findPreferredLocation();
-               logger.log(Level.CONFIG, "Using configuration from " + preferredLocation + ".");
-               configuration = new Configuration(configurationLocator, preferredLocation);
+               originalLocation = configurationLocator.findPreferredLocation();
+               logger.log(Level.CONFIG, "Using configuration from " + originalLocation + ".");
+               configuration = new Configuration(configurationLocator, originalLocation);
 
                Locale.setDefault(configuration.getLocale());
                I18n.setLocale(configuration.getLocale());
@@ -199,6 +201,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
                for (final Locale locale : SUPPORTED_LOCALES) {
                        languageActions.put(locale, new AbstractAction(I18n.getMessage("jsite.menu.language." + locale.getLanguage()), IconLoader.loadIcon("/flag-" + locale.getLanguage() + ".png")) {
 
+                               @Override
                                @SuppressWarnings("synthetic-access")
                                public void actionPerformed(ActionEvent actionEvent) {
                                        switchLanguage(locale);
@@ -207,6 +210,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
                }
                manageNodeAction = new AbstractAction(I18n.getMessage("jsite.menu.nodes.manage-nodes")) {
 
+                       @Override
                        @SuppressWarnings("synthetic-access")
                        public void actionPerformed(ActionEvent actionEvent) {
                                showPage(PageType.PAGE_NODE_MANAGER);
@@ -220,6 +224,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
                        /**
                         * {@inheritDoc}
                         */
+                       @Override
                        @SuppressWarnings("synthetic-access")
                        public void actionPerformed(ActionEvent actionEvent) {
                                optionsPreferences();
@@ -230,6 +235,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
                        /**
                         * {@inheritDoc}
                         */
+                       @Override
                        @SuppressWarnings("synthetic-access")
                        public void actionPerformed(ActionEvent actionEvent) {
                                showLatestUpdate();
@@ -237,6 +243,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
                };
                aboutAction = new AbstractAction(I18n.getMessage("jsite.menu.help.about")) {
 
+                       @Override
                        @SuppressWarnings("synthetic-access")
                        public void actionPerformed(ActionEvent e) {
                                JOptionPane.showMessageDialog(wizard, MessageFormat.format(I18n.getMessage("jsite.about.message"), getVersion().toString()), null, JOptionPane.INFORMATION_MESSAGE, jSiteIcon);
@@ -245,6 +252,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 
                I18nContainer.getInstance().registerRunnable(new Runnable() {
 
+                       @Override
                        @SuppressWarnings("synthetic-access")
                        public void run() {
                                manageNodeAction.putValue(Action.NAME, I18n.getMessage("jsite.menu.nodes.manage-nodes"));
@@ -296,6 +304,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 
                I18nContainer.getInstance().registerRunnable(new Runnable() {
 
+                       @Override
                        @SuppressWarnings("synthetic-access")
                        public void run() {
                                languageMenu.setText(I18n.getMessage("jsite.menu.languages"));
@@ -397,7 +406,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
         * @return The supported locale that was found, or the default locale if no
         *         supported locale could be found
         */
-       private Locale findSupportedLocale(Locale forLocale) {
+       private static Locale findSupportedLocale(Locale forLocale) {
                for (Locale locale : SUPPORTED_LOCALES) {
                        if (locale.equals(forLocale)) {
                                return locale;
@@ -459,6 +468,9 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
                ((PreferencesPage) pages.get(PageType.PAGE_PREFERENCES)).setConfigurationLocation(configuration.getConfigurationDirectory());
                ((PreferencesPage) pages.get(PageType.PAGE_PREFERENCES)).setHasNextToJarConfiguration(configuration.getConfigurationLocator().isValidLocation(ConfigurationLocation.NEXT_TO_JAR_FILE));
                ((PreferencesPage) pages.get(PageType.PAGE_PREFERENCES)).setHasCustomConfiguration(configuration.getConfigurationLocator().isValidLocation(ConfigurationLocation.CUSTOM));
+               ((PreferencesPage) pages.get(PageType.PAGE_PREFERENCES)).setUseEarlyEncode(configuration.useEarlyEncode());
+               ((PreferencesPage) pages.get(PageType.PAGE_PREFERENCES)).setPriority(configuration.getPriority());
+               ((PreferencesPage) pages.get(PageType.PAGE_PREFERENCES)).setManifestPutter(configuration.getManifestPutter());
                showPage(PageType.PAGE_PREFERENCES);
                optionsPreferencesAction.setEnabled(false);
                wizard.setNextEnabled(true);
@@ -488,6 +500,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
        /**
         * {@inheritDoc}
         */
+       @Override
        public void valueChanged(ListSelectionEvent e) {
                JList list = (JList) e.getSource();
                int selectedRow = list.getSelectedIndex();
@@ -501,6 +514,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
        /**
         * {@inheritDoc}
         */
+       @Override
        public void wizardNextPressed(TWizard wizard) {
                String pageName = wizard.getPage().getName();
                if ("page.node-manager".equals(pageName)) {
@@ -551,6 +565,9 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
                        ProjectInsertPage projectInsertPage = (ProjectInsertPage) pages.get(PageType.PAGE_INSERT_PROJECT);
                        String tempDirectory = ((PreferencesPage) pages.get(PageType.PAGE_PREFERENCES)).getTempDirectory();
                        projectInsertPage.setTempDirectory(tempDirectory);
+                       projectInsertPage.setUseEarlyEncode(configuration.useEarlyEncode());
+                       projectInsertPage.setPriority(configuration.getPriority());
+                       projectInsertPage.setManifestPutter(configuration.getManifestPutter());
                        projectInsertPage.startInsert();
                        nodeMenu.setEnabled(false);
                        optionsPreferencesAction.setEnabled(false);
@@ -567,6 +584,9 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
                        PreferencesPage preferencesPage = (PreferencesPage) pages.get(PageType.PAGE_PREFERENCES);
                        showPage(PageType.PAGE_PROJECTS);
                        optionsPreferencesAction.setEnabled(true);
+                       configuration.setUseEarlyEncode(preferencesPage.useEarlyEncode());
+                       configuration.setPriority(preferencesPage.getPriority());
+                       configuration.setManifestPutter(preferencesPage.getManifestPutter());
                        configuration.setConfigurationLocation(preferencesPage.getConfigurationLocation());
                }
        }
@@ -574,6 +594,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
        /**
         * {@inheritDoc}
         */
+       @Override
        public void wizardPreviousPressed(TWizard wizard) {
                String pageName = wizard.getPage().getName();
                if ("page.project".equals(pageName) || "page.preferences".equals(pageName)) {
@@ -589,16 +610,23 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
        /**
         * {@inheritDoc}
         */
+       @Override
        public void wizardQuitPressed(TWizard wizard) {
                if (((ProjectPage) pages.get(PageType.PAGE_PROJECTS)).wasUriCopied() || ((ProjectInsertPage) pages.get(PageType.PAGE_INSERT_PROJECT)).wasUriCopied()) {
                        JOptionPane.showMessageDialog(wizard, I18n.getMessage("jsite.project.warning.use-clipboard-now"));
                }
-               if (JOptionPane.showConfirmDialog(wizard, I18n.getMessage("jsite.quit.question"), null, JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE) == JOptionPane.OK_OPTION) {
-                       if (isOverwritingConfiguration()) {
-                               if (JOptionPane.showConfirmDialog(wizard, I18n.getMessage("jsite.quite.overwrite-configuration"), null, JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.OK_OPTION) {
+               if (JOptionPane.showConfirmDialog(wizard, I18n.getMessage("jsite.quit.question"), I18n.getMessage("jsite.quit.question.title"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE) == JOptionPane.OK_OPTION) {
+                       if (isOverwritingConfiguration() && !originalLocation.equals(configuration.getConfigurationDirectory())) {
+                               int overwriteConfigurationAnswer = JOptionPane.showConfirmDialog(wizard, MessageFormat.format(I18n.getMessage("jsite.quit.overwrite-configuration"), configuration.getConfigurationLocator().getFile(configuration.getConfigurationDirectory())), I18n.getMessage("jsite.quit.overwrite-configuration.title"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE);
+                               if (overwriteConfigurationAnswer == JOptionPane.YES_OPTION) {
                                        if (saveConfiguration()) {
                                                System.exit(0);
                                        }
+                               } else if (overwriteConfigurationAnswer == JOptionPane.CANCEL_OPTION) {
+                                       return;
+                               }
+                               if (overwriteConfigurationAnswer == JOptionPane.NO_OPTION) {
+                                       System.exit(0);
                                }
                        } else {
                                if (saveConfiguration()) {
@@ -618,6 +646,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
        /**
         * {@inheritDoc}
         */
+       @Override
        public void nodesUpdated(Node[] nodes) {
                nodeMenu.removeAll();
                ButtonGroup nodeButtonGroup = new ButtonGroup();
@@ -642,6 +671,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
        /**
         * {@inheritDoc}
         */
+       @Override
        public void nodeSelected(Node node) {
                for (Component menuItem : nodeMenu.getMenuComponents()) {
                        if (menuItem instanceof JMenuItem) {
@@ -661,6 +691,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
        /**
         * {@inheritDoc}
         */
+       @Override
        public void actionPerformed(ActionEvent e) {
                Object source = e.getSource();
                if (source instanceof JRadioButtonMenuItem) {
@@ -678,6 +709,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
        /**
         * {@inheritDoc}
         */
+       @Override
        public void foundUpdateData(Version foundVersion, long versionTimestamp) {
                logger.log(Level.FINEST, "Found version {0} from {1,date}.", new Object[] { foundVersion, versionTimestamp });
                if (foundVersion.compareTo(VERSION) > 0) {