Changeset 18711

Show
Ignore:
Timestamp:
18.03.2009 19:05:32 (10 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/src/java/org/greenstone/server/BaseServer.java

    r18673 r18711  
    6060    } 
    6161 
    62     // override to write to the correct logs 
    63     protected void initLogger() {} 
    64  
    6562    public void autoStart() 
    6663    { 
     
    7572    } 
    7673 
     74    // package access method 
     75    BaseServerControl getServerControl() {  
     76    return server_control_;  
     77    } 
     78 
    7779    protected int getServerState() 
    7880    { 
     
    8082    } 
    8183 
     84    // override to write to the correct logs 
     85    protected void initLogger() {} 
     86 
    8287    protected abstract int runTarget(String cmd); 
    83  
     88    public abstract String getBrowserURL(); 
     89    public abstract void reload(); // reload properties, since they may have changed 
    8490 
    8591    public void reconfigRequired() 
     
    145151    logger_.info(message); 
    146152    } 
    147  
    148     
    149     public abstract String getBrowserURL(); 
    150     public abstract void reload(); // reload properties, since they may have changed 
    151153 
    152154    public void launchBrowser() { 
     
    214216    public  void reloadBuildProperties() { 
    215217    try { 
    216         //InputStream in = this.getClass().getClassLoader().getResourceAsStream("build.properties"); 
    217218        FileInputStream in = new FileInputStream(build_properties_file); 
    218219