X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Ftodesbaum%2Fjsite%2Fmain%2FMain.java;h=60fb64aee12b9e8501af7783dfe192c3c1562aa2;hb=f936411037a6ec1afbc5efbb17dc9b0136adda76;hp=8a4f905318535e7e8e9ba1aa0fde7b6ce994ee55;hpb=7e470976ab9d4d7430e43ba96c9c100f799240ed;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 8a4f905..60fb64a 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
@@ -80,7 +80,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, 11, 1);
+	private static final Version VERSION = new Version(0, 12);
 
 	/** The configuration. */
 	private Configuration configuration;
@@ -122,7 +122,13 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 	}
 
 	/** The supported locales. */
-	private static final Locale[] SUPPORTED_LOCALES = new Locale[] { Locale.ENGLISH, Locale.GERMAN, Locale.FRENCH, new Locale("pl") };
+	private static final Locale[] SUPPORTED_LOCALES = new Locale[] {
+			Locale.ENGLISH,
+			Locale.GERMAN,
+			Locale.FRENCH,
+			new Locale("pl"),
+			new Locale("fi")
+	};
 
 	/** The actions that switch the language. */
 	private Map<Locale, Action> languageActions = new HashMap<Locale, Action>();
@@ -195,7 +201,6 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 		updateChecker.start();
 
 		webOfTrustInterface = new WebOfTrustInterface(freenetInterface);
-		webOfTrustInterface.start();
 
 		initPages();
 		showPage(PageType.PAGE_PROJECTS);
@@ -478,7 +483,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);
@@ -506,7 +510,6 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 	 */
 	private void quit() {
 		updateChecker.stop();
-		webOfTrustInterface.stop();
 		System.exit(0);
 	}
 
@@ -584,7 +587,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);
@@ -603,7 +605,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());
 		}
 	}