Changeset 18655

Timestamp:

2009-03-10T17:50:13+13:00 (15 years ago)

Author:

ak19

Message:

Made some ServerProperty variables final.

Location:

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

Files:

• BaseProperty.java (modified) (1 diff)
• Server2Property.java (modified) (1 diff)
• Server3Property.java (modified) (1 diff)

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

@@ -3 +3 @@
 public class BaseProperty {
 
-    public String GSDL_HOME = "gsdl3.home";
-    public String GSDL_VERSION = "gsdl3.version";
-    public String AUTOSTART = "server.auto.start";
-    public String DEFAULT_SERVLET = "server.default.servlet";
+    public final String GSDL_HOME;
+    public final String GSDL_VERSION;
+    public final String AUTOSTART = "server.auto.start";
+    public final String DEFAULT_SERVLET = "server.default.servlet";
 
-    public String WEB_PORT = "tomcat.port";
+    public final String WEB_PORT;
 
-    public String WIN_9X_OPEN_COMMAND = "command.com /c start %1";
-    public String WIN_OPEN_COMMAND = "cmd.exe /c start \"\" %1";
-    public String MAC_OPEN_COMMAND = "open %1";
+    public final String WIN_9X_OPEN_COMMAND = "command.com /c start %1";
+    public final String WIN_OPEN_COMMAND = "cmd.exe /c start \"\" %1";
+    public final String MAC_OPEN_COMMAND = "open %1";
 
-    public String BROWSER_PATH = "browser.path";
+    public final String BROWSER_PATH = "browser.path";
+
+    protected BaseProperty(String gsdl_home, 
+               String gsdl_version, String web_port) 
+    {
+    GSDL_HOME = gsdl_home;
+    GSDL_VERSION = gsdl_version;
+    WEB_PORT = web_port;
+    }
+
 }

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

@@ -7 +7 @@
     Server2Property()
     {
-    GSDL_HOME = "gsdl2.home";
-    GSDL_VERSION = "gsdl2.version";
+    // Initialising customised final variables 
+    // GSDL_HOME, GSDL_VERSION, WEB_PORT
+    super("gsdl2.home", "gsdl2.version", "apache.port");
     }
 

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

@@ -7 +7 @@
     Server3Property()
     {
-    GSDL_HOME = "gsdl3.home";
-    GSDL_VERSION = "gsdl3.version";
+    // Initialising customised final variables 
+    // GSDL_HOME, GSDL_VERSION, WEB_PORT
+    super("gsdl3.home", "gsdl3.version", "tomcat.port");
     }