Changeset 1239 in josm for trunk/src

Timestamp:

2009-01-11T03:44:18+01:00 (16 years ago)

Author:

ulfl

Message:

add the splash screen also to Main, so we can see the "message of the day" download time

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• gui/MainApplication.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -49 +49 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.PleaseWaitDialog;
+import org.openstreetmap.josm.gui.SplashScreen;
 import org.openstreetmap.josm.gui.download.BoundingBoxSelection;
 import org.openstreetmap.josm.gui.download.DownloadDialog.DownloadTask;
@@ -194 +195 @@
 
     public Main() {
+        this(null);
+    }
+    
+    public Main(SplashScreen splash) {
         main = this;
 //        platform = determinePlatformHook();
         platform.startupHook();
         contentPane.add(panel, BorderLayout.CENTER);
+        if(splash != null) splash.setStatus(tr("Download \"Message of the day\""));
         panel.add(new GettingStarted(), BorderLayout.CENTER);
+        
+        if(splash != null) splash.setStatus(tr("Creating main GUI"));
         menu = new MainMenu();
 

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -46 +46 @@
      * display the frame.
      */
-    public MainApplication(JFrame mainFrame) {
-        super();
+    public MainApplication(JFrame mainFrame, SplashScreen splash) {
+        super(splash);
         mainFrame.setContentPane(contentPane);
         mainFrame.setJMenuBar(menu);
@@ -206 +206 @@
         JFrame mainFrame = new JFrame(tr("Java OpenStreetMap Editor"));
         Main.parent = mainFrame;
-        final Main main = new MainApplication(mainFrame);
+        final Main main = new MainApplication(mainFrame, splash);
         splash.setStatus(tr("Loading plugins"));
         Main.loadPlugins(false);