X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Ftodesbaum%2Fjsite%2Fmain%2FMain.java;h=a8d70e767da2770235563ad1759e952f203cf2b9;hb=2d6256e4191697fdc4d033e93d53a59308a516fe;hp=1c6e8de19dfbf2c49c88314c0bf3c3cc36a9ef82;hpb=09151c7de967b7ce409fc10e08e5bd3448eb80dc;p=jSite.git

diff --git a/src/main/java/de/todesbaum/jsite/main/Main.java b/src/main/java/de/todesbaum/jsite/main/Main.java
index 1c6e8de..a8d70e7 100644
--- a/src/main/java/de/todesbaum/jsite/main/Main.java
+++ b/src/main/java/de/todesbaum/jsite/main/Main.java
@@ -1,5 +1,5 @@
 /*
- * jSite - Main.java - Copyright © 2006–2012 David Roden
+ * jSite - Main.java - Copyright © 2006–2014 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
@@ -47,15 +47,16 @@ import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
 import net.pterodactylus.util.image.IconLoader;
+
 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.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.application.WebOfTrustInterface;
+import de.todesbaum.jsite.application.validation.CheckReport;
+import de.todesbaum.jsite.application.validation.Issue;
+import de.todesbaum.jsite.application.validation.ProjectValidator;
 import de.todesbaum.jsite.gui.NodeManagerListener;
 import de.todesbaum.jsite.gui.NodeManagerPage;
 import de.todesbaum.jsite.gui.PreferencesPage;
@@ -80,7 +81,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, 10);
+	private static final Version VERSION = new Version(0, 13);
 
 	/** The configuration. */
 	private Configuration configuration;
@@ -122,7 +123,14 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 	}
 
 	/** The supported locales. */
-	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,
+			new Locale("pl"),
+			new Locale("fi")
+	};
 
 	/** The actions that switch the language. */
 	private Map<Locale, Action> languageActions = new HashMap<Locale, Action>();
@@ -190,12 +198,11 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 		jSiteIcon = IconLoader.loadIcon("/jsite-icon.png");
 		wizard.setIcon(jSiteIcon);
 
-		updateChecker = new UpdateChecker(freenetInterface);
+		updateChecker = new UpdateChecker(freenetInterface, getVersion());
 		updateChecker.addUpdateListener(this);
 		updateChecker.start();
 
 		webOfTrustInterface = new WebOfTrustInterface(freenetInterface);
-		webOfTrustInterface.start();
 
 		initPages();
 		showPage(PageType.PAGE_PROJECTS);
@@ -341,6 +348,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 		projectPage.setName("page.project");
 		projectPage.setProjects(configuration.getProjects());
 		projectPage.setFreenetInterface(freenetInterface);
+		projectPage.setWebOfTrustInterface(webOfTrustInterface);
 		projectPage.addListSelectionListener(this);
 		pages.put(PageType.PAGE_PROJECTS, projectPage);
 
@@ -477,7 +485,6 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 		((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);
@@ -500,6 +507,14 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 		}
 	}
 
+	/**
+	 * Quits jSite, stopping all background services.
+	 */
+	private void quit() {
+		updateChecker.stop();
+		System.exit(0);
+	}
+
 	//
 	// INTERFACE ListSelectionListener
 	//
@@ -547,7 +562,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 				JOptionPane.showMessageDialog(wizard, I18n.getMessage("jsite.error.no-node-selected"), null, JOptionPane.ERROR_MESSAGE);
 				return;
 			}
-			CheckReport checkReport = ProjectInserter.validateProject(project);
+			CheckReport checkReport = ProjectValidator.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);
@@ -574,7 +589,6 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 			projectInsertPage.setTempDirectory(tempDirectory);
 			projectInsertPage.setUseEarlyEncode(configuration.useEarlyEncode());
 			projectInsertPage.setPriority(configuration.getPriority());
-			projectInsertPage.setManifestPutter(configuration.getManifestPutter());
 			projectInsertPage.startInsert();
 			nodeMenu.setEnabled(false);
 			optionsPreferencesAction.setEnabled(false);
@@ -593,7 +607,6 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 			optionsPreferencesAction.setEnabled(true);
 			configuration.setUseEarlyEncode(preferencesPage.useEarlyEncode());
 			configuration.setPriority(preferencesPage.getPriority());
-			configuration.setManifestPutter(preferencesPage.getManifestPutter());
 			configuration.setConfigurationLocation(preferencesPage.getConfigurationLocation());
 		}
 	}
@@ -627,21 +640,21 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 				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);
+						quit();
 					}
 				} else if (overwriteConfigurationAnswer == JOptionPane.CANCEL_OPTION) {
 					return;
 				}
 				if (overwriteConfigurationAnswer == JOptionPane.NO_OPTION) {
-					System.exit(0);
+					quit();
 				}
 			} else {
 				if (saveConfiguration()) {
-					System.exit(0);
+					quit();
 				}
 			}
 			if (JOptionPane.showConfirmDialog(wizard, I18n.getMessage("jsite.quit.config-not-saved"), null, JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.OK_OPTION) {
-				System.exit(0);
+				quit();
 			}
 		}
 	}