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

Timestamp:

2009-03-18T19:03:27+13:00 (15 years ago)

Author:

ak19

Message:

Moved some things from BaseServerSettings to the specific subclasses as appropriate, and added definitions for overloadable methods.

File:

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

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

@@ -13 +13 @@
 
 public abstract class BaseServerSettings extends JDialog
-
 {
-
     static Logger logger = Logger.getLogger(BaseServerSettings.class.getName());
     static final int DEFPORT = 8080;
 
     JCheckBox autoEnter;
-    JComboBox servlet_combobox;
 
     protected JSpinner portNumber_spinner = null;
@@ -34 +31 @@
     protected int portNum = DEFPORT;
     protected boolean autoStart = false;
-    protected String servletDefault = null;
     protected String browserPath = "";
     protected boolean useDefaultBrowser = true;
 
-    protected HashMap url_mappings = null;
     protected JDialog self;
     protected BaseServer server;
@@ -44 +39 @@
     public BaseServerSettings(BaseServer server) 
     {
-    super((Frame)null, "", true);
+    super(server.getServerControl(), "", true);
     this.self = this;
         this.server = server;
@@ -82 +77 @@
 
     portNumber_spinner = new JSpinner(new SpinnerNumberModel(portNum,1,65535,1));
-    portNumber_spinner.setEditor(new JSpinner.NumberEditor(portNumber_spinner, "#####")); 
+    portNumber_spinner.setEditor(new JSpinner.NumberEditor(portNumber_spinner, "#####"));
 
     autoEnter = new JCheckBox(server.dictionary.get("ServerSettings.Auto_Start"));
@@ -186 +181 @@
 
 
+    protected String onSave() { return ""; }
+    protected void save(ScriptReadWrite scriptReadWrite, ArrayList newFileLines) {}
     protected abstract JPanel createServletPanel();
 
@@ -238 +235 @@
                 has_changed = true;
         }
-        if(servletDefault != null && servlet_combobox != null) {
-        if (!servletDefault.equals(servlet_combobox.getSelectedItem())) {
-            has_changed = true;
-            require_restart = true; 
-        }
-        }
+
+        // call subclass' onSave method
+        String result = onSave();
+        if(result.indexOf("changed") != -1) {
+        has_changed = true;
+        }
+        if(result.indexOf("restart") != -1) {
+        require_restart = true;
+        }
+
             //changed to use other browser
             if (useDefaultBrowser && other_browser_button.isSelected()){
@@ -274 +275 @@
         newFileLines = scriptReadWrite.queryReplace(newFileLines, BaseServer.Property.AUTOSTART, newAutoEnter);
         
-        String newServletDef = (String) servlet_combobox.getSelectedItem();
-        newFileLines = scriptReadWrite.queryReplace(newFileLines,BaseServer.Property.DEFAULT_SERVLET, (String) url_mappings.get(newServletDef));
-
+        // call the subclass' save() method to save custom elements
+        save(scriptReadWrite, newFileLines);
+        
         String osName = System.getProperty("os.name");
                 if (osName.startsWith("Windows")){