Changeset 9058

Timestamp:

2005-02-16T12:08:01+13:00 (19 years ago)

Author:

mdewsnip

Message:

Removed splash screen. It is no longer needed because the GLI now opens fully before opening the last loaded collection.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (4 diffs)
• GathererApplet.java (modified) (2 diffs)
• GathererProg.java (modified) (3 diffs)
• gui/Splash.java (deleted)

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

@@ -46 +46 @@
 import org.greenstone.gatherer.file.FileAssociationManager;
 import org.greenstone.gatherer.gui.GUIManager;
-import org.greenstone.gatherer.gui.Splash;
 import org.greenstone.gatherer.gui.URLField;
 import org.greenstone.gatherer.gui.WarningDialog;
@@ -326 +325 @@
 
 
-    public void run(Dimension size, Splash splash, GUIManager g_man) 
+    public void run(Dimension size, GUIManager g_man) 
     {
     // Size and place the frame on the screen
@@ -349 +348 @@
         size.height = Configuration.screen_size.height;
     }
-    
-    if (splash != null) { splash.toFront(); }
 
     if (!g_man_built) {
@@ -379 +376 @@
     else {
         g_man.setVisible(true);
-    }
-
-    if (splash != null) {
-        // Hide the splash screen
-        splash.setVisible(false);
-        splash.destroy();
-        splash = null;
     }
     }

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

@@ -41 +41 @@
 import org.greenstone.gatherer.feedback.ActionRecorderDialog;
 import org.greenstone.gatherer.gui.GUIManager;
-import org.greenstone.gatherer.gui.Splash;
 import org.greenstone.gatherer.util.Utility;
+
 
 public class GathererApplet extends JApplet implements ActionListener
@@ -201 +201 @@
     public void actionPerformed(ActionEvent e)
     {
-    Splash splash = null;
-
-    gatherer.run(size, splash, g_man);
+    gatherer.run(size, g_man);
 
     // If there was an open collection last session, reopen it.

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

@@ -33 +33 @@
 import org.greenstone.gatherer.feedback.ActionRecorderDialog;
 import org.greenstone.gatherer.gui.GUIManager;
-import org.greenstone.gatherer.gui.Splash;
+
 
 /** Containing the main() method for the Gatherer, this class is the
@@ -92 +92 @@
     }
 
-    // Splash screen.
-    Splash splash = new Splash();
     GUIManager g_man 
         = gatherer.init(size, go.gsdl_path, go.gsdl3_path, go.local_library_path,
@@ -99 +97 @@
                  go.no_load, go.filename, go.site_name, 
                  go.servlet_path, go.wget_version_str, go.wget_path);
-    gatherer.run(size,splash,g_man);
+    gatherer.run(size, g_man);
 
     // If there was an open collection last session, reopen it.