Remove some @Override annotations that clash with Java 1.5’s compiler.

[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 ba34c89..44c448b 100644 (file)
--- a/src/de/todesbaum/jsite/gui/PreferencesPage.java
+++ b/src/de/todesbaum/jsite/gui/PreferencesPage.java
@@ -65,6 +65,9 @@ public class PreferencesPage extends TWizardPage {
        /** The “default” button. */
        private JRadioButton defaultTempDirectory;
 
+       /** The “custom” button. */
+       private JRadioButton customTempDirectory;
+
        /**
         * Creates a new “preferences” page.
         *
@@ -81,7 +84,6 @@ public class PreferencesPage extends TWizardPage {
                        /**
                         * {@inheritDoc}
                         */
-                       @Override
                        public void run() {
                                setHeading(I18n.getMessage("jsite.preferences.heading"));
                                setDescription(I18n.getMessage("jsite.preferences.description"));
@@ -112,6 +114,13 @@ public class PreferencesPage extends TWizardPage {
         */
        public void setTempDirectory(String tempDirectory) {
                this.tempDirectory = tempDirectory;
+               tempDirectoryTextField.setText((tempDirectory != null) ? tempDirectory : "");
+               if (tempDirectory != null) {
+                       customTempDirectory.setSelected(true);
+                       chooseTempDirectoryAction.setEnabled(true);
+               } else {
+                       defaultTempDirectory.setSelected(true);
+               }
        }
 
        //
@@ -136,7 +145,6 @@ public class PreferencesPage extends TWizardPage {
                        /**
                         * {@inheritDoc}
                         */
-                       @Override
                        @SuppressWarnings("synthetic-access")
                        public void actionPerformed(ActionEvent actionEvent) {
                                selectDefaultTempDirectory();
@@ -147,7 +155,6 @@ public class PreferencesPage extends TWizardPage {
                        /**
                         * {@inheritDoc}
                         */
-                       @Override
                        @SuppressWarnings("synthetic-access")
                        public void actionPerformed(ActionEvent actionEvent) {
                                selectCustomTempDirectory();
@@ -155,7 +162,6 @@ 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();
@@ -164,7 +170,6 @@ 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"));
@@ -191,7 +196,7 @@ public class PreferencesPage extends TWizardPage {
                defaultTempDirectory = new JRadioButton(selectDefaultTempDirectoryAction);
                tempDirectoryPanel.add(defaultTempDirectory, new GridBagConstraints(0, 1, 3, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.BOTH, new Insets(6, 18, 0, 0), 0, 0));
 
-               final JRadioButton customTempDirectory = new JRadioButton(selectCustomTempDirectoryAction);
+               customTempDirectory = new JRadioButton(selectCustomTempDirectoryAction);
                tempDirectoryPanel.add(customTempDirectory, new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.BOTH, new Insets(0, 18, 0, 0), 0, 0));
 
                ButtonGroup tempDirectoryButtonGroup = new ButtonGroup();
@@ -217,7 +222,6 @@ public class PreferencesPage extends TWizardPage {
                        /**
                         * {@inheritDoc}
                         */
-                       @Override
                        public void run() {
                                tempDirectoryLabel.setText("<html><b>" + I18n.getMessage("jsite.preferences.temp-directory") + "</b></html>");
                        }
@@ -232,6 +236,7 @@ public class PreferencesPage extends TWizardPage {
        private void selectDefaultTempDirectory() {
                tempDirectoryTextField.setEnabled(false);
                chooseTempDirectoryAction.setEnabled(false);
+               tempDirectory = null;
        }
 
        /**
@@ -240,6 +245,12 @@ public class PreferencesPage extends TWizardPage {
        private void selectCustomTempDirectory() {
                tempDirectoryTextField.setEnabled(true);
                chooseTempDirectoryAction.setEnabled(true);
+               if (tempDirectoryTextField.getText().length() == 0) {
+                       chooseTempDirectory();
+                       if (tempDirectoryTextField.getText().length() == 0) {
+                               defaultTempDirectory.setSelected(true);
+                       }
+               }
        }
 
        /**