Changeset 8232

Timestamp:

2004-10-07T16:56:41+13:00 (20 years ago)

Author:

mdewsnip

Message:

Removed the "config" variable, just to prevent anyone from trying to use it. Configuration requests should go through the now-static Configuration class.

File:

• trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (22 diffs)

trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -96 +96 @@
     /** A public reference to the CollectionManager. */
     static public CollectionManager c_man;
-    /** A public reference to the Gatherer's configuration. */
-    static public Configuration config;
     /** a reference to the Servlet Configuration is GS3 */
     static public ServletConfiguration servlet_config;
@@ -213 +211 @@
         // now set the user specified one
         if (feedback_enabled && feedback_dialog != null) {
-        feedback_dialog.setLocale(config.getLocale("general.locale", true));
+        feedback_dialog.setLocale(Configuration.getLocale("general.locale", true));
         }
         
         // Read Dictionary
-        dictionary = new Dictionary(config.getLocale("general.locale", true), config.getFont("general.font", true));
+        dictionary = new Dictionary(Configuration.getLocale("general.locale", true), Configuration.getFont("general.font", true));
 
 
@@ -225 +223 @@
 
         // If we were given a server run it if neccessary.
-        if (!GS3 && config.exec_file != null) {
+        if (!GS3 && Configuration.exec_file != null) {
         startServerEXE();
         }
 
         // Having loaded the configuration (necessary to determine if certain warnings have been disabled) and dictionary, we now check if the necessary path variables have been provided.
-        if (config.exec_file == null && config.exec_address == null) {
-        if (config.exec_file == null) {
-            Gatherer.println("config.exec_file is null");
-        }
-        if (config.exec_address == null) {
-            Gatherer.println("config.exec_address is null");
-        }
+        if (Configuration.exec_file == null && Configuration.exec_address == null) {
+        Gatherer.println("config.exec_file is null");
+        Gatherer.println("config.exec_address is null");
         missingEXEC();
         }
@@ -247 +241 @@
         // start the Gatherer without providing a perl path
         boolean found_perl = false;
-        if (config.perl_path != null) {
+        if (Configuration.perl_path != null) {
             // See if the file pointed to actually exists
-            File perl_file = new File(config.perl_path);
+            File perl_file = new File(Configuration.perl_path);
             found_perl = perl_file.exists();
             perl_file = null;
         }
-        if (config.perl_path == null || !found_perl) {
+        if (Configuration.perl_path == null || !found_perl) {
             // Run test to see if we can run perl as is.
             PerlTest perl_test = new PerlTest();
@@ -259 +253 @@
             // If so replace the perl path with the system
             // default (or null for unix).
-            config.perl_path = perl_test.toString();
+            Configuration.perl_path = perl_test.toString();
             found_perl = true;
             }
@@ -270 +264 @@
 
         // also check for wget
-        boolean mirror_workflow = config.get(StaticStrings.WORKFLOW_MIRROR, false);
+        boolean mirror_workflow = Configuration.get(StaticStrings.WORKFLOW_MIRROR, false);
         if (mirror_workflow) {
         wget_version_str = StaticStrings.NO_WGET_STR;
@@ -305 +299 @@
         
         // tell the config the new values
-        config.setWGetPath(wget_path);
-        config.setWGetVersion(wget_version_str);
+        Configuration.setWGetPath(wget_path);
+        Configuration.setWGetVersion(wget_version_str);
         }
 
         // Set default font
-        setUIFont(config.getFont("general.font", true), config.getFont("general.tooltip_font", true));
+        setUIFont(Configuration.getFont("general.font", true), Configuration.getFont("general.tooltip_font", true));
         // Set up proxy
         setProxy();
@@ -324 +318 @@
         if (GS3) {
         if (site_name==null) {
-            site_name = config.site_name;
+            site_name = Configuration.site_name;
             servlet_path = null; // need to reset this
         }
         if (servlet_path == null) {
-            servlet_path = config.getServletPath();
+            servlet_path = Configuration.getServletPath();
         }
         }
@@ -334 +328 @@
         // If there was an open collection last session, reopen it.
         if (open_collection == null) {
-        open_collection = config.getString("general.open_collection", true);
+        open_collection = Configuration.getString("general.open_collection", true);
         }
         if (!no_load && open_collection.length() > 0) {
@@ -356 +350 @@
     {
     // Size and place the frame on the screen
-    Rectangle bounds = config.getBounds("general.bounds", true);
+    Rectangle bounds = Configuration.getBounds("general.bounds", true);
     if (bounds == null) {
         // Choose a sensible default value
@@ -367 +361 @@
         size.width = 640;
     }
-    else if (size.width > config.screen_size.width) {
-        size.width = config.screen_size.width;
+    else if (size.width > Configuration.screen_size.width) {
+        size.width = Configuration.screen_size.width;
     }
     if (size.height < 480) {
         size.height = 480;
     }
-    else if (size.height > config.screen_size.height) {
-        size.height = config.screen_size.height;
+    else if (size.height > Configuration.screen_size.height) {
+        size.height = Configuration.screen_size.height;
     }
     
@@ -429 +423 @@
     exit = true;
     // If we have an open collection make note of it.
-    config.setString("general.open_collection", true, null);
+    Configuration.setString("general.open_collection", true, null);
     if(c_man.ready()) {
         ///ystem.err.println("Collection open.");
         if(c_man.saved()) {
         ///ystem.err.println("Collection has been recently saved, so I'll remember it for next time.");
-        config.setString("general.open_collection", true, c_man.getCollectionFilename());
+        Configuration.setString("general.open_collection", true, c_man.getCollectionFilename());
         }
         c_man.closeCollection();
@@ -445 +439 @@
     // Store the current position and size (if reasonable) of the Gatherer for next time
     Rectangle bounds = g_man.getBounds();
-    config.setBounds("general.bounds", true, bounds);
+    Configuration.setBounds("general.bounds", true, bounds);
 
     // Save configuration.
@@ -493 +487 @@
     {
     try {
-        String raw_url = config.exec_address.toString() + command;
+        String raw_url = Configuration.exec_address.toString() + command;
         URL url = new URL(raw_url);
         Gatherer.println("Action: " + raw_url);
@@ -517 +511 @@
     try {
         // need to add the servlet name to the exec address
-        String raw_url = config.exec_address.toString() + config.getServletPath() + command;
+        String raw_url = Configuration.exec_address.toString() + Configuration.getServletPath() + command;
         URL url = new URL(raw_url);
         Gatherer.println("Action: " + raw_url);
@@ -723 +717 @@
     private void loadConfig(String gsdl_path, String gsdl3_path, String exec_path, String perl_path, boolean mirroring_enabled, String site_name) {
     try {
-        config = new Configuration(gsdl_path, gsdl3_path, exec_path, perl_path, mirroring_enabled, site_name);
+        new Configuration(gsdl_path, gsdl3_path, exec_path, perl_path, mirroring_enabled, site_name);
     }
     catch (Exception error) {
@@ -741 +735 @@
     private void saveConfig() {
     try {
-        config.save();
+        Configuration.save();
     } catch (Exception error) {
         Gatherer.printStackTrace(error);
@@ -748 +742 @@
 
     private void startServerEXE() {
-    if(config.exec_file != null && config.exec_address == null && Utility.isWindows() && !GS3) {
+    if(Configuration.exec_file != null && Configuration.exec_address == null && Utility.isWindows() && !GS3) {
         // First of all we create a GSDLSiteCFG object and check if a URL is already present, in which case the server is already running.
-        gsdlsite_cfg = new GSDLSiteConfig(config.exec_file);
+        gsdlsite_cfg = new GSDLSiteConfig(Configuration.exec_file);
         String url = gsdlsite_cfg.getURL();
         // If its already running then set exec address.
         if(url != null) {
         try {
-            config.exec_address = new URL(url);
+            Configuration.exec_address = new URL(url);
         }
         catch(Exception error) {
@@ -761 +755 @@
         }
         // Otherwise its time to run the server in a spawned process.
-        if(config.exec_address == null && config.exec_file.exists()) {
+        if(Configuration.exec_address == null && Configuration.exec_file.exists()) {
         // Configure for immediate entry. Note that this only works if the gsdlsite.cfg file exists.
         gsdlsite_cfg.set();
         // Spawn server
-        String command = config.exec_file.getAbsolutePath() + " " + gsdlsite_cfg.getSiteConfigFilename();
+        String command = Configuration.exec_file.getAbsolutePath() + " " + gsdlsite_cfg.getSiteConfigFilename();
         server = new ExternalApplication(command);
         server.start();
@@ -793 +787 @@
             if((url = gsdlsite_cfg.getURL()) != null) {
             // Ta-da. Now the url should be available.
-            config.exec_address = new URL(url);
+            Configuration.exec_address = new URL(url);
             
             // A quick test involves opening a connection to get the home page  for this collection. If this fails then we try changing the url to be localhost.
             try {
-                Gatherer.println("Try connecting to server on config url: '" + config.exec_address + "'");
-                URLConnection connection = config.exec_address.openConnection();
+                Gatherer.println("Try connecting to server on config url: '" + Configuration.exec_address + "'");
+                URLConnection connection = Configuration.exec_address.openConnection();
                 connection.getContent();
             }
@@ -804 +798 @@
                 try {
                 Gatherer.println("Try connecting to server on local host: '" + gsdlsite_cfg.getLocalHostURL() + "'");
-                config.exec_address = new URL(gsdlsite_cfg.getLocalHostURL  ());
-                URLConnection connection = config.exec_address.openConnection();
+                Configuration.exec_address = new URL(gsdlsite_cfg.getLocalHostURL   ());
+                URLConnection connection = Configuration.exec_address.openConnection();
                 connection.getContent();
                 }
                 catch(IOException worse_url_connection) {
                 Gatherer.println("Can't connect to server on either address.");
-                config.exec_address = null;
-                config.exec_file = null;
+                Configuration.exec_address = null;
+                Configuration.exec_file = null;
                 }
             }
@@ -826 +820 @@
         // Can't do a damb thing.
     }
-    Gatherer.println("Having started server.exe, exec_address is: " + config.exec_address);
+    Gatherer.println("Having started server.exe, exec_address is: " + Configuration.exec_address);
     }
 
     private void stopServerEXE() {
-    if(server != null && config.exec_address != null) {
+    if(server != null && Configuration.exec_address != null) {
         // See if its already exited for some reason.
         gsdlsite_cfg.load();