Declare all possibly-static methods as static.

[jSite.git] / src / de / todesbaum / jsite / gui / PreferencesPage.java

diff --git a/src/de/todesbaum/jsite/gui/PreferencesPage.java b/src/de/todesbaum/jsite/gui/PreferencesPage.java
index 66ab6ab..914e74b 100644 (file)
--- a/src/de/todesbaum/jsite/gui/PreferencesPage.java
+++ b/src/de/todesbaum/jsite/gui/PreferencesPage.java
@@ -40,6 +40,7 @@ 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;
@@ -111,6 +112,9 @@ 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.
         *
@@ -127,6 +131,7 @@ public class PreferencesPage extends TWizardPage {
                        /**
                         * {@inheritDoc}
                         */
+                       @Override
                        public void run() {
                                setHeading(I18n.getMessage("jsite.preferences.heading"));
                                setDescription(I18n.getMessage("jsite.preferences.description"));
@@ -261,6 +266,25 @@ 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
@@ -294,6 +318,7 @@ public class PreferencesPage extends TWizardPage {
                        /**
                         * {@inheritDoc}
                         */
+                       @Override
                        @SuppressWarnings("synthetic-access")
                        public void actionPerformed(ActionEvent actionEvent) {
                                selectDefaultTempDirectory();
@@ -304,6 +329,7 @@ public class PreferencesPage extends TWizardPage {
                        /**
                         * {@inheritDoc}
                         */
+                       @Override
                        @SuppressWarnings("synthetic-access")
                        public void actionPerformed(ActionEvent actionEvent) {
                                selectCustomTempDirectory();
@@ -311,6 +337,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();
@@ -318,6 +345,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;
@@ -325,6 +353,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;
@@ -332,6 +361,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;
@@ -339,6 +369,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();
@@ -346,6 +377,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();
@@ -354,6 +386,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"));
@@ -431,18 +464,26 @@ public class PreferencesPage extends TWizardPage {
 
                insertPriorityComboBox = new JComboBox(new PriorityClass[] { PriorityClass.MINIMUM, PriorityClass.PREFETCH, PriorityClass.BULK, PriorityClass.UPDATABLE, PriorityClass.SEMI_INTERACTIVE, PriorityClass.INTERACTIVE, PriorityClass.MAXIMUM });
                insertPriorityComboBox.setAction(priorityAction);
-               preferencesPanel.add(insertPriorityComboBox, new GridBagConstraints(1, 9, 2, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.VERTICAL, new Insets(0, 18, 0, 0), 0, 0));
+               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"));
                        }
                });