X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fmain%2FMain.java;h=b063587b6b657ebf91e477166ef5ae4c61502491;hb=1bddbc8f7d06e61dbf6c838ca1f8aed75ebe2cd2;hp=4891f8f4f7e8aa21bcecb71600f28b21b29ae097;hpb=6f1a8216cfba28add0ef365b46a08d16d4eb87fe;p=jSite.git
diff --git a/src/de/todesbaum/jsite/main/Main.java b/src/de/todesbaum/jsite/main/Main.java
index 4891f8f..b063587 100644
--- a/src/de/todesbaum/jsite/main/Main.java
+++ b/src/de/todesbaum/jsite/main/Main.java
@@ -21,6 +21,7 @@ package de.todesbaum.jsite.main;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.io.File;
import java.io.IOException;
import java.text.MessageFormat;
import java.util.HashMap;
@@ -52,6 +53,7 @@ import de.todesbaum.jsite.gui.ProjectFilesPage;
import de.todesbaum.jsite.gui.ProjectInsertPage;
import de.todesbaum.jsite.gui.ProjectPage;
import de.todesbaum.jsite.i18n.I18n;
+import de.todesbaum.jsite.i18n.I18nContainer;
import de.todesbaum.util.image.IconLoader;
import de.todesbaum.util.swing.TWizard;
import de.todesbaum.util.swing.TWizardPage;
@@ -59,12 +61,12 @@ import de.todesbaum.util.swing.WizardListener;
/**
* @author David Roden
- * @version $Id: Main.java 456 2006-04-03 17:54:44Z bombe $
+ * @version $Id$
*/
public class Main implements ActionListener, ListSelectionListener, WizardListener, NodeManagerListener {
private static boolean debug = false;
- private Configuration configuration = new Configuration();
+ private Configuration configuration;
private Freenet7Interface freenetInterface = new Freenet7Interface();
protected Icon jSiteIcon;
@@ -72,16 +74,25 @@ 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 };
- private Map languageActions = new HashMap();
- private Action manageNodeAction;
- private Action aboutAction;
+ private static final Locale[] SUPPORTED_LOCALES = new Locale[] { Locale.ENGLISH, Locale.GERMAN, Locale.FRENCH, Locale.ITALIAN, new Locale("pl") };
+ protected Map languageActions = new HashMap();
+ protected Action manageNodeAction;
+ protected Action aboutAction;
protected TWizard wizard;
protected JMenu nodeMenu;
private Node selectedNode;
private final Map pages = new HashMap();
private Main() {
+ this(null);
+ }
+
+ private Main(String configFilename) {
+ if (configFilename != null) {
+ configuration = new Configuration(configFilename);
+ } else {
+ configuration = new Configuration();
+ }
Locale.setDefault(configuration.getLocale());
I18n.setLocale(configuration.getLocale());
if (!configuration.createLockFile()) {
@@ -91,8 +102,6 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
wizard = new TWizard();
createActions();
wizard.setJMenuBar(createMenuBar());
- wizard.setPreviousName(I18n.getMessage("jsite.wizard.previous"));
- wizard.setNextName(I18n.getMessage("jsite.wizard.next"));
wizard.setQuitName(I18n.getMessage("jsite.wizard.quit"));
wizard.setPreviousEnabled(false);
wizard.setNextEnabled(true);
@@ -102,12 +111,11 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
initPages();
showPage(PageType.PAGE_PROJECTS);
- wizard.setPreviousName((String) manageNodeAction.getValue(Action.NAME));
}
private void createActions() {
for (final Locale locale: SUPPORTED_LOCALES) {
- languageActions.put(locale, new AbstractAction(I18n.getMessage("jsite.menu.language." + locale.getLanguage())) {
+ languageActions.put(locale, new AbstractAction(I18n.getMessage("jsite.menu.language." + locale.getLanguage()), IconLoader.loadIcon("/flag-" + locale.getLanguage() + ".png")) {
public void actionPerformed(ActionEvent actionEvent) {
switchLanguage(locale);
@@ -117,6 +125,8 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
manageNodeAction = new AbstractAction(I18n.getMessage("jsite.menu.nodes.manage-nodes")) {
public void actionPerformed(ActionEvent actionEvent) {
showPage(PageType.PAGE_NODE_MANAGER);
+ wizard.setPreviousName(I18n.getMessage("jsite.wizard.previous"));
+ wizard.setNextName(I18n.getMessage("jsite.wizard.next"));
}
};
aboutAction = new AbstractAction(I18n.getMessage("jsite.menu.help.about")) {
@@ -125,11 +135,18 @@ 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"));
+ aboutAction.putValue(Action.NAME, I18n.getMessage("jsite.menu.help.about"));
+ }
+ });
}
private JMenuBar createMenuBar() {
JMenuBar menuBar = new JMenuBar();
- JMenu languageMenu = new JMenu(I18n.getMessage("jsite.menu.languages"));
+ final JMenu languageMenu = new JMenu(I18n.getMessage("jsite.menu.languages"));
menuBar.add(languageMenu);
ButtonGroup languageButtonGroup = new ButtonGroup();
for (Locale locale: SUPPORTED_LOCALES) {
@@ -152,31 +169,43 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
panel.setOpaque(false);
menuBar.add(panel);
- JMenu helpMenu = new JMenu(I18n.getMessage("jsite.menu.help"));
+ 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"));
+ nodeMenu.setText(I18n.getMessage("jsite.menu.nodes"));
+ helpMenu.setText(I18n.getMessage("jsite.menu.help"));
+ for (Map.Entry languageActionEntry: languageActions.entrySet()) {
+ languageActionEntry.getValue().putValue(Action.NAME, I18n.getMessage("jsite.menu.language." + languageActionEntry.getKey().getLanguage()));
+ }
+ }
+ });
+
return menuBar;
}
private void initPages() {
- NodeManagerPage nodeManagerPage = new NodeManagerPage();
+ NodeManagerPage nodeManagerPage = new NodeManagerPage(wizard);
nodeManagerPage.setName("page.node-manager");
nodeManagerPage.addNodeManagerListener(this);
nodeManagerPage.setNodes(configuration.getNodes());
pages.put(PageType.PAGE_NODE_MANAGER, nodeManagerPage);
- ProjectPage projectPage = new ProjectPage();
+ ProjectPage projectPage = new ProjectPage(wizard);
projectPage.setName("page.project");
projectPage.setProjects(configuration.getProjects());
projectPage.setFreenetInterface(freenetInterface);
projectPage.addListSelectionListener(this);
pages.put(PageType.PAGE_PROJECTS, projectPage);
- ProjectFilesPage projectFilesPage = new ProjectFilesPage();
+ ProjectFilesPage projectFilesPage = new ProjectFilesPage(wizard);
projectFilesPage.setName("page.project.files");
pages.put(PageType.PAGE_PROJECT_FILES, projectFilesPage);
- ProjectInsertPage projectInsertPage = new ProjectInsertPage();
+ ProjectInsertPage projectInsertPage = new ProjectInsertPage(wizard);
projectInsertPage.setDebug(debug);
projectInsertPage.setName("page.project.insert");
projectInsertPage.setFreenetInterface(freenetInterface);
@@ -231,11 +260,15 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
Action languageAction = languageActions.get(supportedLocale);
JRadioButtonMenuItem menuItem = (JRadioButtonMenuItem) languageAction.getValue("menuItem");
menuItem.setSelected(true);
- /* show the restart message in the other language! */
- Locale currentLocale = I18n.getLocale();
I18n.setLocale(supportedLocale);
- JOptionPane.showMessageDialog(wizard, I18n.getMessage("jsite.menu.language.change.restart-message"), null, JOptionPane.INFORMATION_MESSAGE);
- I18n.setLocale(currentLocale);
+ for (Runnable i18nRunnable: I18nContainer.getInstance()) {
+ try {
+ i18nRunnable.run();
+ } catch (Throwable t) {
+ /* we probably shouldn't swallow this. */
+ }
+ }
+ wizard.setPage(wizard.getPage());
configuration.setLocale(supportedLocale);
}
@@ -263,7 +296,6 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
String pageName = wizard.getPage().getName();
if ("page.node-manager".equals(pageName)) {
showPage(PageType.PAGE_PROJECTS);
- wizard.setPreviousName((String) manageNodeAction.getValue(Action.NAME));
} else if ("page.project".equals(pageName)) {
ProjectPage projectPage = (ProjectPage) wizard.getPage();
Project project = projectPage.getSelectedProject();
@@ -278,7 +310,6 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
((ProjectFilesPage) pages.get(PageType.PAGE_PROJECT_FILES)).setProject(project);
((ProjectInsertPage) pages.get(PageType.PAGE_INSERT_PROJECT)).setProject(project);
showPage(PageType.PAGE_PROJECT_FILES);
- wizard.setPreviousName(I18n.getMessage("jsite.wizard.previous"));
} else if ("page.project.files".equals(pageName)) {
ProjectPage projectPage = (ProjectPage) pages.get(PageType.PAGE_PROJECTS);
Project project = projectPage.getSelectedProject();
@@ -290,13 +321,21 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
if (JOptionPane.showConfirmDialog(wizard, I18n.getMessage("jsite.project-files.empty-index"), null, JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE) != JOptionPane.OK_OPTION) {
return;
}
+ } else {
+ File indexFile = new File(project.getLocalPath(), project.getIndexFile());
+ if (!indexFile.exists()) {
+ JOptionPane.showMessageDialog(wizard, I18n.getMessage("jsite.project-files.index-missing"), null, JOptionPane.ERROR_MESSAGE);
+ 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;
}
@@ -319,7 +358,9 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
JOptionPane.showMessageDialog(wizard, I18n.getMessage("jsite.project-files.no-node-running"), null, JOptionPane.ERROR_MESSAGE);
return;
}
+ configuration.save();
showPage(PageType.PAGE_INSERT_PROJECT);
+ ((ProjectInsertPage) pages.get(PageType.PAGE_INSERT_PROJECT)).startInsert();
nodeMenu.setEnabled(false);
} else if ("page.project.insert".equals(pageName)) {
showPage(PageType.PAGE_PROJECTS);
@@ -334,10 +375,8 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
String pageName = wizard.getPage().getName();
if ("page.project".equals(pageName)) {
showPage(PageType.PAGE_NODE_MANAGER);
- wizard.setPreviousName(I18n.getMessage("jsite.wizard.previous"));
} else if ("page.project.files".equals(pageName)) {
showPage(PageType.PAGE_PROJECTS);
- wizard.setPreviousName((String) manageNodeAction.getValue(Action.NAME));
} else if ("page.project.insert".equals(pageName)) {
showPage(PageType.PAGE_PROJECT_FILES);
}
@@ -401,13 +440,34 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
//
// MAIN METHOD
//
-
public static void main(String[] args) {
- System.setProperty("swing.plaf.metal.userFont", "Tahoma");
- System.setProperty("swing.plaf.metal.controlFont", "Tahoma");
- System.setProperty("swing.aatext", "true");
- debug = (args.length > 0) && (args[0].equals("--debug"));
- new Main();
+ String configFilename = null;
+ boolean nextIsConfigFilename = false;
+ for (String argument: args) {
+ if (nextIsConfigFilename) {
+ configFilename = argument;
+ nextIsConfigFilename = false;
+ }
+ if ("--help".equals(argument)) {
+ printHelp();
+ return;
+ } else if ("--debug".equals(argument)) {
+ debug = true;
+ } else if ("--config-file".equals(argument)) {
+ nextIsConfigFilename = true;
+ }
+ }
+ if (nextIsConfigFilename) {
+ System.out.println("--config-file needs parameter!");
+ return;
+ }
+ new Main(configFilename);
+ }
+
+ private static void printHelp() {
+ System.out.println("--help\tshows this cruft");
+ System.out.println("--debug\tenables some debug output");
+ System.out.println("--config-file \tuse specified configuration file");
}
}