X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fmain%2FMain.java;h=8dd2e55c673ca5aba18383df38adb94ddcdaa4a2;hb=b70ed36d591de97b742f19e037e71b9b7e790eaf;hp=ee06ec751ad369e34580602f9cfbfb1596ef5fe0;hpb=6e372a5cc19a399d4236eb1d9cb40ebcfd0aca90;p=jSite.git

diff --git a/src/de/todesbaum/jsite/main/Main.java b/src/de/todesbaum/jsite/main/Main.java
index ee06ec7..8dd2e55 100644
--- a/src/de/todesbaum/jsite/main/Main.java
+++ b/src/de/todesbaum/jsite/main/Main.java
@@ -1,5 +1,5 @@
 /*
- * jSite - Main.java - Copyright © 2006–2011 David Roden
+ * jSite - Main.java - Copyright © 2006–2012 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
@@ -147,6 +147,9 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 	/** Mapping from page type to page. */
 	private final Map<PageType, TWizardPage> pages = new HashMap<PageType, TWizardPage>();
 
+	/** The original location of the configuration file. */
+	private ConfigurationLocation originalLocation;
+
 	/**
 	 * Creates a new core with the default configuration file.
 	 */
@@ -167,9 +170,9 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 			configurationLocator.setCustomLocation(configFilename);
 		}
 
-		ConfigurationLocation preferredLocation = configurationLocator.findPreferredLocation();
-		logger.log(Level.CONFIG, "Using configuration from " + preferredLocation + ".");
-		configuration = new Configuration(configurationLocator, preferredLocation);
+		originalLocation = configurationLocator.findPreferredLocation();
+		logger.log(Level.CONFIG, "Using configuration from " + originalLocation + ".");
+		configuration = new Configuration(configurationLocator, originalLocation);
 
 		Locale.setDefault(configuration.getLocale());
 		I18n.setLocale(configuration.getLocale());
@@ -458,6 +461,9 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 		((PreferencesPage) pages.get(PageType.PAGE_PREFERENCES)).setConfigurationLocation(configuration.getConfigurationDirectory());
 		((PreferencesPage) pages.get(PageType.PAGE_PREFERENCES)).setHasNextToJarConfiguration(configuration.getConfigurationLocator().isValidLocation(ConfigurationLocation.NEXT_TO_JAR_FILE));
 		((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);
@@ -550,6 +556,9 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 			ProjectInsertPage projectInsertPage = (ProjectInsertPage) pages.get(PageType.PAGE_INSERT_PROJECT);
 			String tempDirectory = ((PreferencesPage) pages.get(PageType.PAGE_PREFERENCES)).getTempDirectory();
 			projectInsertPage.setTempDirectory(tempDirectory);
+			projectInsertPage.setUseEarlyEncode(configuration.useEarlyEncode());
+			projectInsertPage.setPriority(configuration.getPriority());
+			projectInsertPage.setManifestPutter(configuration.getManifestPutter());
 			projectInsertPage.startInsert();
 			nodeMenu.setEnabled(false);
 			optionsPreferencesAction.setEnabled(false);
@@ -566,6 +575,9 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 			PreferencesPage preferencesPage = (PreferencesPage) pages.get(PageType.PAGE_PREFERENCES);
 			showPage(PageType.PAGE_PROJECTS);
 			optionsPreferencesAction.setEnabled(true);
+			configuration.setUseEarlyEncode(preferencesPage.useEarlyEncode());
+			configuration.setPriority(preferencesPage.getPriority());
+			configuration.setManifestPutter(preferencesPage.getManifestPutter());
 			configuration.setConfigurationLocation(preferencesPage.getConfigurationLocation());
 		}
 	}