/*
* jSite - a tool for uploading websites into Freenet
- * Copyright (C) 2006 David Roden
+ * Copyright (C) 2006-2009 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
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.Date;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
+import java.util.logging.ConsoleHandler;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
-import de.todesbaum.jsite.application.FileOption;
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.gui.NodeManagerListener;
import de.todesbaum.jsite.gui.NodeManagerPage;
+import de.todesbaum.jsite.gui.PreferencesPage;
import de.todesbaum.jsite.gui.ProjectFilesPage;
import de.todesbaum.jsite.gui.ProjectInsertPage;
import de.todesbaum.jsite.gui.ProjectPage;
*
* @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 logger. */
+ private static final Logger logger = Logger.getLogger(Main.class.getName());
+
+ /** The version. */
+ private static final Version VERSION = new Version(0, 9, 2);
/** 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;
PAGE_PROJECT_FILES,
/** The project insert page. */
- PAGE_INSERT_PROJECT
+ PAGE_INSERT_PROJECT,
+
+ /** The preferences page. */
+ PAGE_PREFERENCES
}
/** The supported locales. */
- private static final Locale[] SUPPORTED_LOCALES = new Locale[] { Locale.ENGLISH, Locale.GERMAN, Locale.FRENCH, Locale.ITALIAN, new Locale("pl") };
+ private static final Locale[] SUPPORTED_LOCALES = new Locale[] { Locale.ENGLISH, Locale.GERMAN, Locale.FRENCH };
/** The actions that switch the language. */
private Map<Locale, Action> languageActions = new HashMap<Locale, Action>();
/** The “manage nodes” action. */
private Action manageNodeAction;
+ /** The “preferences” action. */
+ private Action optionsPreferencesAction;
+
+ /** The “check for updates” action. */
+ private Action checkForUpdatesAction;
+
/** The “about jSite” action. */
private Action aboutAction;
if (!configuration.createLockFile()) {
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) {
- return;
+ throw new IllegalStateException("Lockfile override not active, refusing start.");
}
configuration.removeLockfileOnExit();
}
jSiteIcon = IconLoader.loadIcon("/jsite-icon.png");
wizard.setIcon(jSiteIcon);
+ updateChecker = new UpdateChecker(freenetInterface);
+ updateChecker.addUpdateListener(this);
+ updateChecker.start();
+
initPages();
showPage(PageType.PAGE_PROJECTS);
}
@SuppressWarnings("synthetic-access")
public void actionPerformed(ActionEvent actionEvent) {
showPage(PageType.PAGE_NODE_MANAGER);
+ optionsPreferencesAction.setEnabled(true);
wizard.setPreviousName(I18n.getMessage("jsite.wizard.previous"));
wizard.setNextName(I18n.getMessage("jsite.wizard.next"));
}
};
+ optionsPreferencesAction = new AbstractAction(I18n.getMessage("jsite.menu.options.preferences")) {
+
+ /**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("synthetic-access")
+ public void actionPerformed(ActionEvent actionEvent) {
+ optionsPreferences();
+ }
+ };
+ 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);
}
};
@SuppressWarnings("synthetic-access")
public void run() {
manageNodeAction.putValue(Action.NAME, I18n.getMessage("jsite.menu.nodes.manage-nodes"));
+ optionsPreferencesAction.putValue(Action.NAME, I18n.getMessage("jsite.menu.options.preferences"));
+ checkForUpdatesAction.putValue(Action.NAME, I18n.getMessage("jsite.menu.help.check-for-updates"));
aboutAction.putValue(Action.NAME, I18n.getMessage("jsite.menu.help.about"));
}
});
selectedNode = configuration.getSelectedNode();
nodesUpdated(configuration.getNodes());
+ final JMenu optionsMenu = new JMenu(I18n.getMessage("jsite.menu.options"));
+ menuBar.add(optionsMenu);
+ optionsMenu.add(optionsPreferencesAction);
+
/* evil hack to right-align the help menu */
JPanel panel = new JPanel();
panel.setOpaque(false);
final JMenu helpMenu = new JMenu(I18n.getMessage("jsite.menu.help"));
menuBar.add(helpMenu);
+ helpMenu.add(checkForUpdatesAction);
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"));
+ optionsMenu.setText(I18n.getMessage("jsite.menu.options"));
helpMenu.setText(I18n.getMessage("jsite.menu.help"));
for (Map.Entry<Locale, Action> languageActionEntry : languageActions.entrySet()) {
languageActionEntry.getValue().putValue(Action.NAME, I18n.getMessage("jsite.menu.language." + languageActionEntry.getKey().getLanguage()));
pages.put(PageType.PAGE_PROJECT_FILES, projectFilesPage);
ProjectInsertPage projectInsertPage = new ProjectInsertPage(wizard);
- projectInsertPage.setDebug(debug);
projectInsertPage.setName("page.project.insert");
projectInsertPage.setFreenetInterface(freenetInterface);
pages.put(PageType.PAGE_INSERT_PROJECT, projectInsertPage);
+
+ PreferencesPage preferencesPage = new PreferencesPage(wizard);
+ preferencesPage.setName("page.preferences");
+ preferencesPage.setTempDirectory(configuration.getTempDirectory());
+ pages.put(PageType.PAGE_PREFERENCES, preferencesPage);
}
/**
ProjectPage projectPage = (ProjectPage) pages.get(PageType.PAGE_PROJECTS);
configuration.setProjects(projectPage.getProjects());
+ PreferencesPage preferencesPage = (PreferencesPage) pages.get(PageType.PAGE_PREFERENCES);
+ configuration.setTempDirectory(preferencesPage.getTempDirectory());
+
return configuration.save();
}
return SUPPORTED_LOCALES[0];
}
+ /**
+ * Returns the version.
+ *
+ * @return The version
+ */
+ public static final Version getVersion() {
+ return VERSION;
+ }
+
//
// ACTIONS
//
configuration.setLocale(supportedLocale);
}
+ /**
+ * Shows a dialog with general preferences.
+ */
+ private void optionsPreferences() {
+ showPage(PageType.PAGE_PREFERENCES);
+ optionsPreferencesAction.setEnabled(false);
+ wizard.setNextEnabled(true);
+ wizard.setNextName(I18n.getMessage("jsite.wizard.next"));
+ }
+
+ /**
+ * 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
//
ProjectPage projectPage = (ProjectPage) wizard.getPage();
Project project = projectPage.getSelectedProject();
if ((project.getLocalPath() == null) || (project.getLocalPath().trim().length() == 0)) {
- JOptionPane.showMessageDialog(wizard, I18n.getMessage("jsite.project.warning.no-local-path"), null, JOptionPane.ERROR_MESSAGE);
+ JOptionPane.showMessageDialog(wizard, I18n.getMessage("jsite.warning.no-local-path"), null, JOptionPane.ERROR_MESSAGE);
return;
}
if ((project.getPath() == null) || (project.getPath().trim().length() == 0)) {
- JOptionPane.showMessageDialog(wizard, I18n.getMessage("jsite.project.warning.no-path"), null, JOptionPane.ERROR_MESSAGE);
+ JOptionPane.showMessageDialog(wizard, I18n.getMessage("jsite.warning.no-path"), null, JOptionPane.ERROR_MESSAGE);
return;
}
((ProjectFilesPage) pages.get(PageType.PAGE_PROJECT_FILES)).setProject(project);
ProjectPage projectPage = (ProjectPage) pages.get(PageType.PAGE_PROJECTS);
Project project = projectPage.getSelectedProject();
if (selectedNode == null) {
- JOptionPane.showMessageDialog(wizard, I18n.getMessage("jsite.project-files.no-node-selected"), null, JOptionPane.ERROR_MESSAGE);
+ JOptionPane.showMessageDialog(wizard, I18n.getMessage("jsite.error.no-node-selected"), null, JOptionPane.ERROR_MESSAGE);
return;
}
- if (project.getIndexFile() == null) {
- if (JOptionPane.showConfirmDialog(wizard, I18n.getMessage("jsite.project-files.empty-index"), null, JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE) != JOptionPane.OK_OPTION) {
+ CheckReport checkReport = ProjectInserter.validateProject(project);
+ for (Issue issue : checkReport) {
+ if (issue.isFatal()) {
+ JOptionPane.showMessageDialog(wizard, MessageFormat.format(I18n.getMessage("jsite." + issue.getErrorKey()), (Object[]) issue.getParameters()), null, JOptionPane.ERROR_MESSAGE);
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;
- }
- }
- 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 (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;
- }
- }
- Map<String, FileOption> fileOptions = project.getFileOptions();
- Set<Entry<String, FileOption>> fileOptionEntries = fileOptions.entrySet();
- for (Entry<String, FileOption> fileOptionEntry : fileOptionEntries) {
- FileOption fileOption = fileOptionEntry.getValue();
- if (!fileOption.isInsert() && ((fileOption.getCustomKey().length() == 0) || "CHK@".equals(fileOption.getCustomKey()))) {
- JOptionPane.showMessageDialog(wizard, MessageFormat.format(I18n.getMessage("jsite.project-files.no-custom-key"), fileOptionEntry.getKey()), null, JOptionPane.ERROR_MESSAGE);
+ if (JOptionPane.showConfirmDialog(wizard, MessageFormat.format(I18n.getMessage("jsite." + issue.getErrorKey()), (Object[]) issue.getParameters()), null, JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE) != JOptionPane.OK_OPTION) {
return;
}
}
/* ignore. */
}
if (!nodeRunning) {
- JOptionPane.showMessageDialog(wizard, I18n.getMessage("jsite.project-files.no-node-running"), null, JOptionPane.ERROR_MESSAGE);
+ JOptionPane.showMessageDialog(wizard, I18n.getMessage("jsite.error.no-node-running"), null, JOptionPane.ERROR_MESSAGE);
return;
}
configuration.save();
showPage(PageType.PAGE_INSERT_PROJECT);
- ((ProjectInsertPage) pages.get(PageType.PAGE_INSERT_PROJECT)).startInsert();
+ ProjectInsertPage projectInsertPage = (ProjectInsertPage) pages.get(PageType.PAGE_INSERT_PROJECT);
+ String tempDirectory = ((PreferencesPage) pages.get(PageType.PAGE_PREFERENCES)).getTempDirectory();
+ projectInsertPage.setTempDirectory(tempDirectory);
+ projectInsertPage.startInsert();
nodeMenu.setEnabled(false);
+ optionsPreferencesAction.setEnabled(false);
} else if ("page.project.insert".equals(pageName)) {
+ ProjectInsertPage projectInsertPage = (ProjectInsertPage) pages.get(PageType.PAGE_INSERT_PROJECT);
+ if (projectInsertPage.isRunning()) {
+ projectInsertPage.stopInsert();
+ } else {
+ showPage(PageType.PAGE_PROJECTS);
+ nodeMenu.setEnabled(true);
+ optionsPreferencesAction.setEnabled(true);
+ }
+ } else if ("page.preferences".equals(pageName)) {
showPage(PageType.PAGE_PROJECTS);
- nodeMenu.setEnabled(true);
+ optionsPreferencesAction.setEnabled(true);
}
}
*/
public void wizardPreviousPressed(TWizard wizard) {
String pageName = wizard.getPage().getName();
- if ("page.project".equals(pageName)) {
+ if ("page.project".equals(pageName) || "page.preferences".equals(pageName)) {
showPage(PageType.PAGE_NODE_MANAGER);
+ optionsPreferencesAction.setEnabled(true);
} else if ("page.project.files".equals(pageName)) {
showPage(PageType.PAGE_PROJECTS);
} else if ("page.project.insert".equals(pageName)) {
* {@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);
}
//
+ // INTERFACE UpdateListener
+ //
+
+ /**
+ * {@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);
+ }
+ }
+
+ //
// MAIN METHOD
//
* The command-line arguments
*/
public static void main(String[] args) {
+ /* initialize logger. */
+ Logger logger = Logger.getLogger("de.todesbaum");
+ Handler handler = new ConsoleHandler();
+ logger.addHandler(handler);
String configFilename = null;
boolean nextIsConfigFilename = false;
for (String argument : args) {
printHelp();
return;
} else if ("--debug".equals(argument)) {
- debug = true;
+ logger.setLevel(Level.ALL);
+ handler.setLevel(Level.ALL);
} else if ("--config-file".equals(argument)) {
nextIsConfigFilename = true;
}
projects / jSite.git / blobdiff