X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fmain%2FMain.java;h=005fc376ff31c1e35d813da96ef8134bec876be9;hb=96ae100ae97bd4b8bd33f942fac3689af9bd5996;hp=230f2ec49c8cf1da6df38cfbc3e349d8913bce74;hpb=0bf8d542053724e3ac96435d00f437889b0a9953;p=jSite.git diff --git a/src/de/todesbaum/jsite/main/Main.java b/src/de/todesbaum/jsite/main/Main.java index 230f2ec..005fc37 100644 --- a/src/de/todesbaum/jsite/main/Main.java +++ b/src/de/todesbaum/jsite/main/Main.java @@ -74,7 +74,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen PAGE_NODE_MANAGER, PAGE_PROJECTS, PAGE_PROJECT_FILES, PAGE_INSERT_PROJECT } - private static final Locale[] SUPPORTED_LOCALES = new Locale[] { Locale.ENGLISH, Locale.GERMAN, Locale.FRENCH }; + private static final Locale[] SUPPORTED_LOCALES = new Locale[] { Locale.ENGLISH, Locale.GERMAN, Locale.FRENCH, Locale.ITALIAN }; protected Map languageActions = new HashMap(); protected Action manageNodeAction; protected Action aboutAction; @@ -86,7 +86,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen private Main() { this(null); } - + private Main(String configFilename) { if (configFilename != null) { configuration = new Configuration(configFilename); @@ -135,7 +135,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen JOptionPane.showMessageDialog(wizard, MessageFormat.format(I18n.getMessage("jsite.about.message"), Version.getVersion()), null, JOptionPane.INFORMATION_MESSAGE, jSiteIcon); } }; - + I18nContainer.getInstance().registerRunnable(new Runnable() { public void run() { manageNodeAction.putValue(Action.NAME, I18n.getMessage("jsite.menu.nodes.manage-nodes")); @@ -172,7 +172,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen final JMenu helpMenu = new JMenu(I18n.getMessage("jsite.menu.help")); menuBar.add(helpMenu); helpMenu.add(aboutAction); - + I18nContainer.getInstance().registerRunnable(new Runnable() { public void run() { languageMenu.setText(I18n.getMessage("jsite.menu.languages")); @@ -183,7 +183,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen } } }); - + return menuBar; } @@ -328,12 +328,14 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen return; } } - if (!project.getFileOption(project.getIndexFile()).getContainer().equals("")) { + String indexFile = project.getIndexFile(); + boolean hasIndexFile = (indexFile != null); + if (hasIndexFile && !project.getFileOption(indexFile).getContainer().equals("")) { if (JOptionPane.showConfirmDialog(wizard, I18n.getMessage("jsite.project-files.container-index"), null, JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE) != JOptionPane.OK_OPTION) { return; } } - if (!project.getFileOption(project.getIndexFile()).getMimeType().equals("text/html")) { + if (hasIndexFile && !project.getFileOption(indexFile).getMimeType().equals("text/html")) { if (JOptionPane.showConfirmDialog(wizard, I18n.getMessage("jsite.project-files.index-not-html"), null, JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE) != JOptionPane.OK_OPTION) { return; } @@ -467,5 +469,5 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen System.out.println("--debug\tenables some debug output"); System.out.println("--config-file \tuse specified configuration file"); } - + }