Anonymous avatar Anonymous committed aab004e

Showing the splash dialog after the upgrade wizard check. As a result we do not need to show/hide/show it. On the other hand one has to wait a bit longer to see it. The simplicity of the behaviour has however been prefered in this case.

Comments (0)

Files changed (1)

o.n.core/src/org/netbeans/core/NonGui.java

         } catch (Exception e) {
             ErrorManager.getDefault().notify(e);
         }
-        finally {
-            showSplashAgain();
-        }
         StartLog.logProgress ("Upgrade wizard consulted"); // NOI18N
+        
+        //
+        // 8.5 - we can show the splash only after the upgrade wizard finished
+        //
+        
+        showSplash ();
 
         // -----------------------------------------------------------------------------------------------------
         // 9. Modules
         StartLog.logProgress ("LoaderPool notified"); // NOI18N
         Main.incrementSplashProgressBar(10);
 
-        //-------------------------------------------------------------------------------------------------------
-        // setup wizard
-        /*try {
-                if ((System.getProperty ("netbeans.full.hack") == null) && (System.getProperty ("netbeans.close") == null)) {
-                SwingUtilities.invokeAndWait(new Runnable() {
-                    public void run() {
-                        org.netbeans.core.ui.SetupWizard.showSetupWizard(false, getSplash());
-                    }
-                });
-            }
-        } catch (Exception e) {
-            ErrorManager.getDefault().notify(e);
-        }
-        finally {
-            showSplashAgain();
-        }
-        StartLog.logProgress ("SetupWizard done"); // NOI18N
-        */
         Main.incrementSplashProgressBar(10);
         // wait until mounting really occurs
         automount.waitFinished ();
      *
      * It does nothing in NonGui implementation.
      */
-    protected void showSplashAgain() {
+    protected void showSplash () {
     }
 
     /** Return splash screen if available.
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.