Changeset 10517

Timestamp:

2005-08-16T12:38:10+12:00 (19 years ago)

Author:

mdewsnip

Message:

Made some Gatherer variables and functions static, and removed the completely unnecessary "self" variable.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (9 diffs)
• LocalLibraryServer.java (modified) (1 diff)
• file/FileManager.java (modified) (1 diff)
• gui/CreatePane.java (modified) (1 diff)
• gui/GUIManager.java (modified) (1 diff)

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

@@ -73 +73 @@
 
     /** All of the external applications that must exit before we close the Gatherer. */
-    public Vector apps = new Vector();
+    static private Vector apps = new Vector();
     static private String non_standard_collect_directory_path = null;
     static public String open_collection_file_path = null;
@@ -88 +88 @@
     static private boolean g_man_built = false;
 
-    /** A static reference to ourselves. */
-    static public Gatherer self;
     /** We are using the GLI for GS3 */
     static public boolean GS3 = false;
@@ -120 +118 @@
     public Gatherer(String[] args) 
     {
-    this.self = this;
     JarTools.initialise(this); 
 
@@ -468 +465 @@
      * @see org.greenstone.gatherer.gui.GUIManager
      */
-    public void exit()
+    static public void exit()
     {
     System.err.println("In Gatherer.exit()...");
@@ -629 +626 @@
      * @see org.greenstone.gatherer.Gatherer.ExternalApplication
      */
-    public void spawnApplication(File file) {
+    static public void spawnApplication(File file) {
     String [] commands = assoc_man.getCommand(file);
     if(commands != null) {
@@ -642 +639 @@
 
 
-    public void spawnApplication(String command)
+    static public void spawnApplication(String command)
     {
     ExternalApplication app = new ExternalApplication(command);
@@ -654 +651 @@
      * @see org.greenstone.gatherer.Gatherer.BrowserApplication
      */    
-    public void spawnBrowser(String url) {
+    static public void spawnBrowser(String url) {
     String command = assoc_man.getBrowserCommand(url);
     if (command != null) {
@@ -766 +763 @@
     
     /** This private class contains an instance of an external application running within a JVM shell. It is important that this process sits in its own thread, but its more important that when we exit the Gatherer we don't actually System.exit(0) the Gatherer object until the user has volunteerily ended all of these child processes. Otherwise when we quit the Gatherer any changes the users may have made in external programs will be lost and the child processes are automatically deallocated. */
-    private class ExternalApplication
+    static private class ExternalApplication
     extends Thread {
     private Process process = null;
@@ -827 +824 @@
     }
     /** This private class contains an instance of an external application running within a JVM shell. It is important that this process sits in its own thread, but its more important that when we exit the Gatherer we don't actually System.exit(0) the Gatherer object until the user has volunteerily ended all of these child processes. Otherwise when we quit the Gatherer any changes the users may have made in external programs will be lost and the child processes are automatically deallocated. */
-    private class BrowserApplication
+    static private class BrowserApplication
     extends Thread {
     private Process process = null;

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

@@ -129 +129 @@
     // Spawn local library server process
     String local_library_server_command = local_library_server_file.getAbsolutePath() + " " + gsdlsite_cfg_file.getSiteConfigFilename();
-    Gatherer.self.spawnApplication(local_library_server_command);
+    Gatherer.spawnApplication(local_library_server_command);
 
     // Wait until program has started, by reloading and checking the URL field

trunk/gli/src/org/greenstone/gatherer/file/FileManager.java

@@ -153 +153 @@
     }
 
-    Gatherer.self.spawnApplication(file);
+    Gatherer.spawnApplication(file);
     }
 

trunk/gli/src/org/greenstone/gatherer/gui/CreatePane.java

@@ -794 +794 @@
         Gatherer.c_man.getCollection().cdm.save(); // save the config file just in case
         configureHomeURL();
-        Gatherer.self.spawnBrowser(homepage);
+        Gatherer.spawnBrowser(homepage);
 
     }

trunk/gli/src/org/greenstone/gatherer/gui/GUIManager.java

@@ -439 +439 @@
     // If we're running as an applet we don't quit here (we quit when the browser calls GathererApplet.destroy())
     if (!Gatherer.isApplet) {
-        Gatherer.self.exit();
+        Gatherer.exit();
     }
     }