Show a warning when the user wants to quit and copied an URI before that.

[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 2efe017..f74da36 100644 (file)
--- a/src/de/todesbaum/jsite/main/Main.java
+++ b/src/de/todesbaum/jsite/main/Main.java
@@ -24,8 +24,10 @@ import java.awt.event.ActionListener;
 import java.io.File;
 import java.io.IOException;
 import java.text.MessageFormat;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
@@ -75,11 +77,10 @@ import de.todesbaum.util.swing.WizardListener;
 public class Main implements ActionListener, ListSelectionListener, WizardListener, NodeManagerListener, UpdateListener {
 
        /** The logger. */
-       @SuppressWarnings("unused")
        private static final Logger logger = Logger.getLogger(Main.class.getName());
 
        /** The version. */
-       private static final Version VERSION = new Version(0, 7, 1);
+       private static final Version VERSION = new Version(0, 8);
 
        /** The configuration. */
        private Configuration configuration;
@@ -531,7 +532,8 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
                                        return;
                                }
                        }
-                       if (hasIndexFile && !project.getFileOption(indexFile).getMimeType().equals("text/html")) {
+                       List<String> allowedIndexContentTypes = Arrays.asList("text/html", "application/xhtml+xml");
+                       if (hasIndexFile && !allowedIndexContentTypes.contains(project.getFileOption(indexFile).getMimeType())) {
                                if (JOptionPane.showConfirmDialog(wizard, I18n.getMessage("jsite.project-files.index-not-html"), null, JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE) != JOptionPane.OK_OPTION) {
                                        return;
                                }
@@ -562,9 +564,11 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
                        projectInsertPage.setTempDirectory(tempDirectory);
                        projectInsertPage.startInsert();
                        nodeMenu.setEnabled(false);
+                       optionsPreferencesAction.setEnabled(false);
                } else if ("page.project.insert".equals(pageName)) {
                        showPage(PageType.PAGE_PROJECTS);
                        nodeMenu.setEnabled(true);
+                       optionsPreferencesAction.setEnabled(true);
                } else if ("page.preferences".equals(pageName)) {
                        showPage(PageType.PAGE_PROJECTS);
                        optionsPreferencesAction.setEnabled(true);
@@ -589,6 +593,9 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
         * {@inheritDoc}
         */
        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 (saveConfiguration()) {
                                System.exit(0);
@@ -648,6 +655,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
         * {@inheritDoc}
         */
        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) {
                        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);
                }