Changeset 18708 for greenstone3/trunk/src/java/org/greenstone/server/Server3Settings.java

Timestamp:

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

Author:

ak19

Message:

1. Bugfix on saving and working out the servlet; 2. Variables related to the servlet and the saving of servlet data have been moved into Server3Settings from BaseServerSettings since servlets are unique to GS3.

File:

• greenstone3/trunk/src/java/org/greenstone/server/Server3Settings.java (modified) (3 diffs)

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

@@ -17 +17 @@
 
 public class Server3Settings extends BaseServerSettings
+{
+    protected String servletDefault = null;
+    protected JComboBox servlet_combobox;
+    protected HashMap url_mappings = null;
 
-{
     public Server3Settings(BaseServer server) 
     {
     super(server);
-    this.servletDefault = server.build_properties.getProperty(BaseServer.Property.DEFAULT_SERVLET).replaceAll("/","");
     }
 
     protected JPanel createServletPanel()
     {
-
     JLabel servlet_label = new JLabel(server.dictionary.get(BaseServer.Property.SERVER_SETTINGS+".URL"));
 
+    this.servletDefault = server.build_properties.getProperty(BaseServer.Property.DEFAULT_SERVLET).replaceAll("/","");
+    
     servlet_combobox = new JComboBox();
     servlet_combobox.setMaximumRowCount(5);
@@ -57 +60 @@
         }
 
-        if (name.equals(servletDefault)) {
+        if (pattern.replaceAll("/","").equals(servletDefault)) {
         servlet_combobox.setSelectedItem(name);
         }
@@ -71 +74 @@
     }
 
+    public String onSave() 
+    {
+    String result = "";
+    if (!servletDefault.equals((String)url_mappings.get(servlet_combobox.getSelectedItem()))) {
+        result += "changed";
+        result += "restart";
+    }
+    return result;
+    }
+
+    public void save(ScriptReadWrite scriptReadWrite, ArrayList newFileLines) 
+    {
+    String newServletDef = (String) servlet_combobox.getSelectedItem();
+    newFileLines = scriptReadWrite.queryReplace(newFileLines,BaseServer.Property.DEFAULT_SERVLET, (String) url_mappings.get(newServletDef));    
+    }
+
 }