Execute Swing init code in Swing event thread.

laurentg · Oct 2, 2014 · 5d619be · 5d619be
1 parent 1e107d6
commit 5d619be
Showing 1 changed file with 24 additions and 14 deletions.
diff --git a/src/main/java/org/truffautronic/Main.java b/src/main/java/org/truffautronic/Main.java
@@ -23,26 +23,36 @@
 import java.io.File;
 import java.util.Locale;
 
+import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 
 import org.truffautronic.controller.AppController;
 import org.truffautronic.controller.I18N;
 
 public class Main {
 
-	public static void main(String[] args) throws Exception {
-
-		I18N.setLocale(Locale.getDefault());
-
-		UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-
-		UIManager.put("TabbedPane.selected", Color.YELLOW);
-		UIManager.put("ToggleButton.select", Color.YELLOW);
-
-		AppController appController = new AppController();
-		if (args.length >= 1) {
-			appController.openInitialFile(new File(args[0]));
-		}
-		appController.run();
+	public static void main(final String[] args) throws Exception {
+
+		SwingUtilities.invokeLater(new Runnable() {
+			public void run() {
+				I18N.setLocale(Locale.getDefault());
+
+				try {
+					UIManager.setLookAndFeel(UIManager
+							.getSystemLookAndFeelClassName());
+				} catch (Exception e) {
+					throw new RuntimeException(e);
+				}
+
+				UIManager.put("TabbedPane.selected", Color.YELLOW);
+				UIManager.put("ToggleButton.select", Color.YELLOW);
+
+				AppController appController = new AppController();
+				if (args.length >= 1) {
+					appController.openInitialFile(new File(args[0]));
+				}
+				appController.run();
+			}
+		});
 	}
 }