Move Splash initialization to EDT and make it no longer modal

 - about 100ms faster startup (main method duration measured) and
   technically more correct anyway
 - use JFrame to get double buffering (no progress bar flicker during
   repaint) and we can use the opportunity to initialize swing
   asynchronously while NB is busy bootstrapping.
 - other change: splash window is no longer modal
 - code renovations

most changes come from the fact that the model needed to be extracted
from UI code so that it can be updated from any thread while the UI
paints on EDT.

Author: mbien

platform/core.startup/src/org/netbeans/core/startup/Main.java

@@ -19,7 +19,6 @@
 
 package org.netbeans.core.startup;
 
-import java.beans.Introspector;
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -89,7 +88,7 @@ public static void initUICustomizations() {
           return;
       }
 
-      Class uiClass = CLIOptions.uiClass;
+      Class<?> uiClass = CLIOptions.uiClass;
       // try again loading L&F class, this time with full module system.
       if (CLIOptions.uiClassName != null && CLIOptions.uiClass == null) {
           // try again
@@ -163,7 +162,7 @@ public static ModuleSystem getModuleSystem(boolean init) {
                 SystemFileSystem.registerMutex(moduleSystem.getManager().mutex());
             } catch (IOException ioe) {
                 // System will be screwed up.
-                throw (IllegalStateException) new IllegalStateException("Module system cannot be created").initCause(ioe); // NOI18N
+                throw new IllegalStateException("Module system cannot be created", ioe); // NOI18N
             }
             StartLog.logProgress ("ModuleSystem created"); // NOI18N
         }
@@ -316,7 +315,6 @@ static void start (String[] args) throws SecurityException {
         level.run();
     }
 
-    Splash.getInstance().setRunning(false);
     Splash.getInstance().dispose();
     StartLog.logProgress ("Splash hidden"); // NOI18N
     StartLog.logEnd ("Preparation"); // NOI18N
@@ -347,7 +345,7 @@ private static void rm(File f) {
     }
 
     /** Loads a class from available class loaders. */
-    private static final Class getKlass(String cls) {
+    private static Class<?> getKlass(String cls) {
         try {
             ClassLoader loader;
             ModuleSystem ms = moduleSystem;
@@ -380,7 +378,7 @@ public boolean shouldDoAnImport () {
                 return classname != null && !installed.exists ();
             }
 
-            
+            @Override
             public void run() {
                 // This module is included in our distro somewhere... may or may not be turned on.
                 // Whatever - try running some classes from it anyway.
@@ -400,16 +398,12 @@ public void run() {
                     } else {
                         LOG.log(Level.WARNING, null, ex);
                     }
-                } catch (Exception e) {
+                } catch (Exception | LinkageError e) {
                     // If exceptions are thrown, notify them - something is broken.
                     LOG.log(Level.WARNING, null, e);
-                } catch (LinkageError e) {
-                    // These too...
-                    LOG.log(Level.WARNING, null, e);
                 }
             }
 
-            
             public boolean canContinue () {
                 if (shouldDoAnImport ()) {
                     try {
@@ -440,7 +434,6 @@ public boolean canContinue () {
             }
         }
 
-        
         ImportHandler handler = new ImportHandler ();
 
         return handler.canContinue ();
@@ -493,12 +486,9 @@ public void run() {
                     } else {
                         LOG.log(Level.WARNING, null, ex);
                     }
-                } catch (Exception ex) {
+                } catch (Exception | LinkageError ex) {
                     // If exceptions are thrown, notify them - something is broken.
                     LOG.log(Level.WARNING, null, ex);
-                } catch (LinkageError ex) {
-                    // These too...
-                    LOG.log(Level.WARNING, null, ex);
                 }
             }
 

platform/core.startup/src/org/netbeans/core/startup/NbEvents.java

@@ -19,14 +19,14 @@
 
 package org.netbeans.core.startup;
 
-import java.awt.Component;
 import java.awt.Desktop;
 import java.awt.Dimension;
 import java.awt.EventQueue;
 import java.awt.GraphicsEnvironment;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -51,7 +51,6 @@
 import org.openide.modules.SpecificationVersion;
 import org.openide.util.NbBundle.Messages;
 import org.openide.util.NbCollections;
-import org.openide.util.RequestProcessor;
 
 /** Report events to the performance logger, status text/splash screen,
  * console, and so on.
@@ -333,9 +332,8 @@ private void notify(String text, boolean warn) {
     private static final class Notifier implements Runnable {
         private static boolean showDialog = true;
 
-        private boolean warn;
+        private final boolean warn;
         private String text;
-        private static RequestProcessor RP = new RequestProcessor("Notify About Module System"); // NOI18N
 
         public Notifier(String text, boolean type) {
             this.warn = type;
@@ -347,7 +345,11 @@ void show() {
                 if (EventQueue.isDispatchThread()) {
                     run();
                 } else {
-                    RP.post(this, 0, Thread.MIN_PRIORITY).waitFinished ();
+                    try {
+                        EventQueue.invokeAndWait(this);
+                    } catch (InterruptedException | InvocationTargetException ex) {
+                        logger.log(Level.SEVERE, "Notifier failed", ex); // NOI18N
+                    }
                 }
             }
         }
@@ -362,17 +364,9 @@ void show() {
             int type = warn ? JOptionPane.WARNING_MESSAGE : JOptionPane.INFORMATION_MESSAGE;
             String msg = warn ? MSG_warning() : MSG_info();
 
-            Splash out = Splash.getInstance();
-            final Component c = out.getComponent() == null ? null : out.getComponent();
             try {
                 UIManager.setLookAndFeel (UIManager.getSystemLookAndFeelClassName ());
-            } catch (ClassNotFoundException ex) {
-                logger.log(Level.INFO, null, ex);
-            } catch (InstantiationException ex) {
-                logger.log(Level.INFO, null, ex);
-            } catch (IllegalAccessException ex) {
-                logger.log(Level.INFO, null, ex);
-            } catch (UnsupportedLookAndFeelException ex) {
+            } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | UnsupportedLookAndFeelException ex) {
                 logger.log(Level.INFO, null, ex);
             }
             JTextPane tp = new JTextPane ();
@@ -423,7 +417,7 @@ void show() {
             Object [] options = new JButton [] {continueButton, exitButton};
             op.setOptions (options);
             op.setInitialValue (options [1]);
-            JDialog d = op.createDialog (c, msg);
+            JDialog d = op.createDialog(Splash.getInstance().getComponent(), msg);
             d.setResizable (true);
             d.pack();
             d.setVisible (true);