Changeset 8525 in josm for trunk

Timestamp:

2015-06-23T09:02:53+02:00 (9 years ago)

Author:

simon04

Message:

see #11591, see #11355 - Splash screen: attempt to fix lock issue (2)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainApplication.java (modified) (2 diffs)
• SplashScreen.java (modified) (1 diff)

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

@@ -38 +38 @@
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.concurrent.Callable;
 
 import javax.swing.JFrame;
@@ -402 +403 @@
         OAuthAccessTokenHolder.getInstance().init(Main.pref, CredentialsManager.getInstance());
 
-        final SplashScreen splash = new SplashScreen();
+        final SplashScreen splash = GuiHelper.runInEDTAndWaitAndReturn(new Callable<SplashScreen>() {
+            @Override
+            public SplashScreen call() {
+                return new SplashScreen();
+            }
+        });
         final SplashScreen.SplashProgressMonitor monitor = splash.getProgressMonitor();
         monitor.beginTask(tr("Initializing"));

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

@@ -391 +391 @@
             lblTaskTitle.setText(LABEL_HTML + tasks);
             lblTaskTitle.setCaretPosition(lblTaskTitle.getDocument().getLength());
-            repaint();
         }
     }