Changeset 18711

Timestamp:

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

Author:

ak19

Message:

Added package-access method getServerControl so that the Settings Dialog can be initialised upon creation with the server object's ServerControl JFrame as parent frame, instead of the Settings Dialog floating away annoyingly under all the regular linux windows.

File:

• greenstone3/trunk/src/java/org/greenstone/server/BaseServer.java (modified) (5 diffs)

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

@@ -60 +60 @@
     }
 
-    // override to write to the correct logs
-    protected void initLogger() {}
-
     public void autoStart()
     {
@@ -75 +72 @@
     }
 
+    // package access method
+    BaseServerControl getServerControl() { 
+    return server_control_; 
+    }
+
     protected int getServerState()
     {
@@ -80 +82 @@
     }
 
+    // override to write to the correct logs
+    protected void initLogger() {}
+
     protected abstract int runTarget(String cmd);
-
+    public abstract String getBrowserURL();
+    public abstract void reload(); // reload properties, since they may have changed
 
     public void reconfigRequired()
@@ -145 +151 @@
     logger_.info(message);
     }
-
-   
-    public abstract String getBrowserURL();
-    public abstract void reload(); // reload properties, since they may have changed
 
     public void launchBrowser() {
@@ -214 +216 @@
     public  void reloadBuildProperties() {
     try {
-        //InputStream in = this.getClass().getClassLoader().getResourceAsStream("build.properties");
         FileInputStream in = new FileInputStream(build_properties_file);