Changeset 20868 for greenstone3/trunk/src/java/org/greenstone/server/BaseServerSettings.java

Timestamp:

2009-10-30T19:53:03+13:00 (14 years ago)

Author:

ak19

Message:

Fixed a bug that Diego Spano found: in the Settings dialog, the browser path for the Other Browser option was not getting saved previously.

File:

• greenstone3/trunk/src/java/org/greenstone/server/BaseServerSettings.java (modified) (6 diffs)

greenstone3/trunk/src/java/org/greenstone/server/BaseServerSettings.java

@@ -12 +12 @@
 import org.apache.log4j.*;
 
-public abstract class BaseServerSettings extends JDialog
+public abstract class BaseServerSettings extends JDialog implements ActionListener
 {
     static Logger logger = Logger.getLogger(BaseServerSettings.class.getName());
     static final int DEFPORT = 8080;
-
-    JCheckBox autoEnter;
+    static final Color bg_color = Color.white;
+
+    protected JCheckBox autoEnter;
 
     protected JSpinner portNumber_spinner = null;
@@ -25 +26 @@
     protected JRadioButton other_browser_button = null;
     protected Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
-
-    static final Color bg_color = Color.white; 
 
     protected int portNum = DEFPORT;
@@ -125 +124 @@
         default_browser_button = new JRadioButton(BaseServer.dictionary.get("ServerSettings.DefaultBrowser"));
         other_browser_button = new JRadioButton(BaseServer.dictionary.get("ServerSettings.OtherBrowser"));
-        other_browser_button.addActionListener(new BrowserSelectionListener());
-        default_browser_button.addActionListener(new BrowserSelectionListener());
+    default_browser_button.addActionListener(this);
+    other_browser_button.addActionListener(this);   
 
     ButtonGroup bg = new ButtonGroup();
@@ -157 +156 @@
         other_browser_button.setSelected(true);
     }
-        browse_button.addActionListener(new BrowseActionListener());       
+    browse_button.addActionListener(this);
         
         JPanel down_panel = new JPanel();
@@ -186 +185 @@
 
 
-    private class BrowseActionListener 
-    implements ActionListener {
-    
-    public void actionPerformed(ActionEvent ev) {
+    public void actionPerformed(ActionEvent ev) {
+    if(ev.getSource() == browse_button) {
         JFileChooser chooser = new JFileChooser();
-           int returnVal = chooser.showOpenDialog(self);        
-       
+        int returnVal = chooser.showOpenDialog(self);        
+        
         if(returnVal == JFileChooser.APPROVE_OPTION) {
-                File program_path = chooser.getSelectedFile();
+        File program_path = chooser.getSelectedFile();
         program_path_field.setText(program_path.getPath());
-        } 
-    }
-
-     }
-
-    private class BrowserSelectionListener 
-    implements ActionListener {
-    
-    public void actionPerformed(ActionEvent ev) {
+       } 
+    } else { // one of the two Choose Browser radiobuttons
         if (default_browser_button.isSelected()){
         program_path_field.setEnabled(false);
-                browse_button.setEnabled(false);
-        }
-            else{
+        browse_button.setEnabled(false);
+        }
+        else{
         program_path_field.setEnabled(true);
-                browse_button.setEnabled(true);
-        }
-    }
-
-     }
+        browse_button.setEnabled(true);
+        }
+    }       
+    }
     
 
@@ -277 +266 @@
             browserPath = browserPath.replaceAll("\\\\","/");
         }
-        newFileLines = scriptReadWrite.queryReplace(newFileLines,BaseServer.Property.BROWSER_PATH, browserPath);
-
-        scriptReadWrite.writeOutFile(BaseServer.config_properties_file,
-                         newFileLines);
+        newFileLines = scriptReadWrite.replaceOrAddLine(newFileLines, BaseServer.Property.BROWSER_PATH, browserPath, true);
+
+        scriptReadWrite.writeOutFile(BaseServer.config_properties_file, newFileLines);
+
         server.reloadConfigProperties();
         server.reload(); // work out the URL again in case it has changed