X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Ftodesbaum%2Fjsite%2Fgui%2FPreferencesPage.java;h=9ff1a19794b9408b70e30288bb8299b06f3a3502;hb=8db42d2121e8ee465ab8380a66febde1949a0106;hp=5cf258afcdbf56c004663af24972b22366435a10;hpb=0e88169c3e8decfcd99f39f5ecf3a85df50c3fca;p=jSite.git

diff --git a/src/main/java/de/todesbaum/jsite/gui/PreferencesPage.java b/src/main/java/de/todesbaum/jsite/gui/PreferencesPage.java
index 5cf258a..9ff1a19 100644
--- a/src/main/java/de/todesbaum/jsite/gui/PreferencesPage.java
+++ b/src/main/java/de/todesbaum/jsite/gui/PreferencesPage.java
@@ -1,5 +1,5 @@
 /*
- * jSite - PreferencesPage.java - Copyright © 2009–2012 David Roden
+ * jSite - PreferencesPage.java - Copyright © 2009–2019 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
@@ -40,7 +40,6 @@ import javax.swing.JTextField;
 import de.todesbaum.jsite.i18n.I18n;
 import de.todesbaum.jsite.i18n.I18nContainer;
 import de.todesbaum.jsite.main.ConfigurationLocator.ConfigurationLocation;
-import de.todesbaum.util.freenet.fcp2.ClientPutDir.ManifestPutter;
 import de.todesbaum.util.freenet.fcp2.PriorityClass;
 import de.todesbaum.util.swing.TWizard;
 import de.todesbaum.util.swing.TWizardPage;
@@ -112,9 +111,6 @@ public class PreferencesPage extends TWizardPage {
 	/** The insert priority select box. */
 	private JComboBox insertPriorityComboBox;
 
-	/** The manifest putter select box. */
-	private JComboBox manifestPutterComboBox;
-
 	/**
 	 * Creates a new “preferences” page.
 	 *
@@ -131,6 +127,7 @@ public class PreferencesPage extends TWizardPage {
 			/**
 			 * {@inheritDoc}
 			 */
+			@Override
 			public void run() {
 				setHeading(I18n.getMessage("jsite.preferences.heading"));
 				setDescription(I18n.getMessage("jsite.preferences.description"));
@@ -265,25 +262,6 @@ public class PreferencesPage extends TWizardPage {
 	}
 
 	/**
-	 * Returns the selected manifest putter.
-	 *
-	 * @return The selected manifest putter
-	 */
-	public ManifestPutter getManifestPutter() {
-		return (ManifestPutter) manifestPutterComboBox.getSelectedItem();
-	}
-
-	/**
-	 * Sets the manifest putter.
-	 *
-	 * @param manifestPutter
-	 *            The manifest putter
-	 */
-	public void setManifestPutter(ManifestPutter manifestPutter) {
-		manifestPutterComboBox.setSelectedItem(manifestPutter);
-	}
-
-	/**
 	 * {@inheritDoc}
 	 */
 	@Override
@@ -317,6 +295,7 @@ public class PreferencesPage extends TWizardPage {
 			/**
 			 * {@inheritDoc}
 			 */
+			@Override
 			@SuppressWarnings("synthetic-access")
 			public void actionPerformed(ActionEvent actionEvent) {
 				selectDefaultTempDirectory();
@@ -327,6 +306,7 @@ public class PreferencesPage extends TWizardPage {
 			/**
 			 * {@inheritDoc}
 			 */
+			@Override
 			@SuppressWarnings("synthetic-access")
 			public void actionPerformed(ActionEvent actionEvent) {
 				selectCustomTempDirectory();
@@ -334,6 +314,7 @@ public class PreferencesPage extends TWizardPage {
 		};
 		chooseTempDirectoryAction = new AbstractAction(I18n.getMessage("jsite.preferences.temp-directory.choose")) {
 
+			@Override
 			@SuppressWarnings("synthetic-access")
 			public void actionPerformed(ActionEvent e) {
 				chooseTempDirectory();
@@ -341,6 +322,7 @@ public class PreferencesPage extends TWizardPage {
 		};
 		nextToJarFileAction = new AbstractAction(I18n.getMessage("jsite.preferences.config-directory.jar")) {
 
+			@Override
 			@SuppressWarnings("synthetic-access")
 			public void actionPerformed(ActionEvent actionevent) {
 				configurationLocation = ConfigurationLocation.NEXT_TO_JAR_FILE;
@@ -348,6 +330,7 @@ public class PreferencesPage extends TWizardPage {
 		};
 		homeDirectoryAction = new AbstractAction(I18n.getMessage("jsite.preferences.config-directory.home")) {
 
+			@Override
 			@SuppressWarnings("synthetic-access")
 			public void actionPerformed(ActionEvent actionevent) {
 				configurationLocation = ConfigurationLocation.HOME_DIRECTORY;
@@ -355,6 +338,7 @@ public class PreferencesPage extends TWizardPage {
 		};
 		customDirectoryAction = new AbstractAction(I18n.getMessage("jsite.preferences.config-directory.custom")) {
 
+			@Override
 			@SuppressWarnings("synthetic-access")
 			public void actionPerformed(ActionEvent actionEvent) {
 				configurationLocation = ConfigurationLocation.CUSTOM;
@@ -362,6 +346,7 @@ public class PreferencesPage extends TWizardPage {
 		};
 		useEarlyEncodeAction = new AbstractAction(I18n.getMessage("jsite.preferences.insert-options.use-early-encode")) {
 
+			@Override
 			@SuppressWarnings("synthetic-access")
 			public void actionPerformed(ActionEvent actionEvent) {
 				useEarlyEncode = useEarlyEncodeCheckBox.isSelected();
@@ -369,6 +354,7 @@ public class PreferencesPage extends TWizardPage {
 		};
 		priorityAction = new AbstractAction(I18n.getMessage("jsite.preferences.insert-options.priority")) {
 
+			@Override
 			@SuppressWarnings("synthetic-access")
 			public void actionPerformed(ActionEvent actionEvent) {
 				priority = (PriorityClass) insertPriorityComboBox.getSelectedItem();
@@ -377,6 +363,7 @@ public class PreferencesPage extends TWizardPage {
 
 		I18nContainer.getInstance().registerRunnable(new Runnable() {
 
+			@Override
 			@SuppressWarnings("synthetic-access")
 			public void run() {
 				selectDefaultTempDirectoryAction.putValue(Action.NAME, I18n.getMessage("jsite.preferences.temp-directory.default"));
@@ -456,23 +443,17 @@ public class PreferencesPage extends TWizardPage {
 		insertPriorityComboBox.setAction(priorityAction);
 		preferencesPanel.add(insertPriorityComboBox, new GridBagConstraints(1, 9, 2, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(0, 18, 0, 0), 0, 0));
 
-		final JLabel manifestPutterLabel = new JLabel(I18n.getMessage("jsite.preferences.insert-options.manifest-putter"));
-		preferencesPanel.add(manifestPutterLabel, new GridBagConstraints(0, 10, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 18, 0, 0), 0, 0));
-
-		manifestPutterComboBox = new JComboBox(ManifestPutter.values());
-		preferencesPanel.add(manifestPutterComboBox, new GridBagConstraints(1, 10, 2, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL, new Insets(0, 18, 0, 0), 0, 0));
-
 		I18nContainer.getInstance().registerRunnable(new Runnable() {
 
 			/**
 			 * {@inheritDoc}
 			 */
+			@Override
 			public void run() {
 				tempDirectoryLabel.setText("<html><b>" + I18n.getMessage("jsite.preferences.temp-directory") + "</b></html>");
 				configurationDirectoryLabel.setText("<html><b>" + I18n.getMessage("jsite.preferences.config-directory") + "</b></html>");
 				insertOptionsLabel.setText("<html><b>" + I18n.getMessage("jsite.preferences.insert-options") + "</b></html>");
 				insertPriorityLabel.setText(I18n.getMessage("jsite.preferences.insert-options.priority"));
-				manifestPutterLabel.setText(I18n.getMessage("jsite.preferences.insert-options.manifest-putter"));
 			}
 		});