From 06766cb4db76abc874f0c31c978e9668eab101c7 Mon Sep 17 00:00:00 2001
From: Karl Tauber <karl@jformdesigner.com>
Date: Wed, 23 Oct 2019 09:03:08 +0200
Subject: [PATCH] Demo: missing SwingUtilities.invokeLater() added

---
 .../com/formdev/flatlaf/FlatChooserTest.java  |  6 ++-
 .../formdev/flatlaf/FlatComponents2Test.java  |  6 ++-
 .../formdev/flatlaf/FlatComponentsTest.java   |  6 ++-
 .../formdev/flatlaf/FlatContainerTest.java    |  6 ++-
 .../com/formdev/flatlaf/FlatMenusTest.java    |  6 ++-
 .../formdev/flatlaf/FlatOptionPaneTest.java   |  6 ++-
 .../com/formdev/flatlaf/demo/FlatLafDemo.java | 43 ++++++++++---------
 .../flatlaf/swingx/FlatSwingXTest.java        |  8 ++--
 8 files changed, 52 insertions(+), 35 deletions(-)

diff --git a/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatChooserTest.java b/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatChooserTest.java
index ba313746..d98f3986 100644
--- a/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatChooserTest.java
+++ b/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatChooserTest.java
@@ -26,8 +26,10 @@ public class FlatChooserTest
 	extends JPanel
 {
 	public static void main( String[] args ) {
-		FlatTestFrame frame = FlatTestFrame.create( args, "FlatChooserTest" );
-		frame.showFrame( new FlatChooserTest() );
+		SwingUtilities.invokeLater( () -> {
+			FlatTestFrame frame = FlatTestFrame.create( args, "FlatChooserTest" );
+			frame.showFrame( new FlatChooserTest() );
+		} );
 	}
 
 	FlatChooserTest() {
diff --git a/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatComponents2Test.java b/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatComponents2Test.java
index 405107f8..6b00985b 100644
--- a/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatComponents2Test.java
+++ b/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatComponents2Test.java
@@ -27,8 +27,10 @@ public class FlatComponents2Test
 	extends JPanel
 {
 	public static void main( String[] args ) {
-		FlatTestFrame frame = FlatTestFrame.create( args, "FlatComponents2Test" );
-		frame.showFrame( new FlatComponents2Test() );
+		SwingUtilities.invokeLater( () -> {
+			FlatTestFrame frame = FlatTestFrame.create( args, "FlatComponents2Test" );
+			frame.showFrame( new FlatComponents2Test() );
+		} );
 	}
 
 	FlatComponents2Test() {
diff --git a/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatComponentsTest.java b/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatComponentsTest.java
index 6c1d6a80..dc381587 100644
--- a/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatComponentsTest.java
+++ b/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatComponentsTest.java
@@ -28,8 +28,10 @@ public class FlatComponentsTest
 	extends JPanel
 {
 	public static void main( String[] args ) {
-		FlatTestFrame frame = FlatTestFrame.create( args, "FlatComponentsTest" );
-		frame.showFrame( new FlatComponentsTest() );
+		SwingUtilities.invokeLater( () -> {
+			FlatTestFrame frame = FlatTestFrame.create( args, "FlatComponentsTest" );
+			frame.showFrame( new FlatComponentsTest() );
+		} );
 	}
 
 	FlatComponentsTest() {
diff --git a/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatContainerTest.java b/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatContainerTest.java
index e599250c..b9831a95 100644
--- a/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatContainerTest.java
+++ b/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatContainerTest.java
@@ -17,8 +17,10 @@ public class FlatContainerTest
 	extends JPanel
 {
 	public static void main( String[] args ) {
-		FlatTestFrame frame = FlatTestFrame.create( args, "FlatContainerTest" );
-		frame.showFrame( new FlatContainerTest() );
+		SwingUtilities.invokeLater( () -> {
+			FlatTestFrame frame = FlatTestFrame.create( args, "FlatContainerTest" );
+			frame.showFrame( new FlatContainerTest() );
+		} );
 	}
 
 	public FlatContainerTest() {
diff --git a/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatMenusTest.java b/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatMenusTest.java
index b34a328d..a99f3c85 100644
--- a/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatMenusTest.java
+++ b/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatMenusTest.java
@@ -29,8 +29,10 @@ public class FlatMenusTest
 	extends JPanel
 {
 	public static void main( String[] args ) {
-		FlatTestFrame frame = FlatTestFrame.create( args, "FlatMenusTest" );
-		frame.showFrame( new FlatMenusTest() );
+		SwingUtilities.invokeLater( () -> {
+			FlatTestFrame frame = FlatTestFrame.create( args, "FlatMenusTest" );
+			frame.showFrame( new FlatMenusTest() );
+		} );
 	}
 
 	FlatMenusTest() {
diff --git a/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatOptionPaneTest.java b/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatOptionPaneTest.java
index 816a2221..8edf697b 100644
--- a/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatOptionPaneTest.java
+++ b/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatOptionPaneTest.java
@@ -30,8 +30,10 @@ public class FlatOptionPaneTest
 	extends JPanel
 {
 	public static void main( String[] args ) {
-		FlatTestFrame frame = FlatTestFrame.create( args, "FlatOptionPaneTest" );
-		frame.showFrame( new FlatOptionPaneTest() );
+		SwingUtilities.invokeLater( () -> {
+			FlatTestFrame frame = FlatTestFrame.create( args, "FlatOptionPaneTest" );
+			frame.showFrame( new FlatOptionPaneTest() );
+		} );
 	}
 
 	FlatOptionPaneTest() {
diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/FlatLafDemo.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/FlatLafDemo.java
index ee39f72e..344c7fbe 100644
--- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/FlatLafDemo.java
+++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/FlatLafDemo.java
@@ -17,6 +17,7 @@
 package com.formdev.flatlaf.demo;
 
 import java.util.prefs.Preferences;
+import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import com.formdev.flatlaf.FlatLightLaf;
 
@@ -32,29 +33,31 @@ public class FlatLafDemo
 	static Preferences prefs;
 
 	public static void main( String[] args ) {
-		prefs = Preferences.userRoot().node( PREFS_ROOT_PATH );
+		SwingUtilities.invokeLater( () -> {
+			prefs = Preferences.userRoot().node( PREFS_ROOT_PATH );
 
-		// set look and feel
-		try {
-			if( args.length > 0 )
-				UIManager.setLookAndFeel( args[0] );
-			else {
-				String lafClassName = prefs.get( KEY_LAF, FlatLightLaf.class.getName() );
-				UIManager.setLookAndFeel( lafClassName );
+			// set look and feel
+			try {
+				if( args.length > 0 )
+					UIManager.setLookAndFeel( args[0] );
+				else {
+					String lafClassName = prefs.get( KEY_LAF, FlatLightLaf.class.getName() );
+					UIManager.setLookAndFeel( lafClassName );
+				}
+			} catch( Exception ex ) {
+				ex.printStackTrace();
+
+				// fallback
+				FlatLightLaf.install();
 			}
-		} catch( Exception ex ) {
-			ex.printStackTrace();
 
-			// fallback
-			FlatLightLaf.install();
-		}
+			// create frame
+			DemoFrame frame = new DemoFrame();
 
-		// create frame
-		DemoFrame frame = new DemoFrame();
-
-		// show frame
-		frame.pack();
-		frame.setLocationRelativeTo( null );
-		frame.setVisible( true );
+			// show frame
+			frame.pack();
+			frame.setLocationRelativeTo( null );
+			frame.setVisible( true );
+		} );
 	}
 }
diff --git a/flatlaf-swingx/src/test/java/com/formdev/flatlaf/swingx/FlatSwingXTest.java b/flatlaf-swingx/src/test/java/com/formdev/flatlaf/swingx/FlatSwingXTest.java
index 3c507b10..62982df0 100644
--- a/flatlaf-swingx/src/test/java/com/formdev/flatlaf/swingx/FlatSwingXTest.java
+++ b/flatlaf-swingx/src/test/java/com/formdev/flatlaf/swingx/FlatSwingXTest.java
@@ -31,9 +31,11 @@ public class FlatSwingXTest
 	extends JPanel
 {
 	public static void main( String[] args ) {
-		FlatTestFrame frame = FlatTestFrame.create( args, "FlatSwingXTest" );
-		frame.useApplyComponentOrientation = true;
-		frame.showFrame( new FlatSwingXTest() );
+		SwingUtilities.invokeLater( () -> {
+			FlatTestFrame frame = FlatTestFrame.create( args, "FlatSwingXTest" );
+			frame.useApplyComponentOrientation = true;
+			frame.showFrame( new FlatSwingXTest() );
+		} );
 	}
 
 	FlatSwingXTest() {