From b12ae37118ef6431cb6006fd8c1ebc9b0700fba6 Mon Sep 17 00:00:00 2001 From: Ivan Esparza Date: Fri, 1 Apr 2016 18:04:35 -0700 Subject: [PATCH 1/3] Fixes issue 4440 --- app/src/processing/app/Base.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java index 832973fe1ad..d0b47c6454d 100644 --- a/app/src/processing/app/Base.java +++ b/app/src/processing/app/Base.java @@ -123,12 +123,11 @@ public class Base { private final List recentSketchesMenuItems; static public void main(String args[]) throws Exception { + System.setProperty("awt.useSystemAAFontSettings", "on"); System.setProperty("swing.aatext", "true"); System.setProperty("java.net.useSystemProxies", "true"); - splashScreenHelper.splashText(tr("Loading configuration...")); - if (OSUtils.isMacOS()) { ThinkDifferent.init(); } @@ -146,6 +145,8 @@ static public void guardedMain(String args[]) throws Exception { deleteFilesOnShutdownThread.setName("DeleteFilesOnShutdown"); Runtime.getRuntime().addShutdownHook(deleteFilesOnShutdownThread); + + BaseNoGui.initLogger(); initLogger(); @@ -158,8 +159,11 @@ static public void guardedMain(String args[]) throws Exception { BaseNoGui.initParameters(args); + splashScreenHelper.splashText(tr("Loading configuration...")); + BaseNoGui.initVersion(); + // if (System.getProperty("mrj.version") != null) { // //String jv = System.getProperty("java.version"); // String ov = System.getProperty("os.version"); @@ -275,6 +279,7 @@ public Base(String[] args) throws Exception { CommandlineParser parser = new CommandlineParser(args); parser.parseArgumentsPhase1(); + BaseNoGui.checkInstallationFolder(); String sketchbookPath = BaseNoGui.getSketchbookPath(); @@ -291,6 +296,11 @@ public Base(String[] args) throws Exception { } } + + + + + splashScreenHelper.splashText(tr("Initializing packages...")); BaseNoGui.initPackages(); splashScreenHelper.splashText(tr("Preparing boards...")); From 9b4cb276f8f7d0849590948c63031bbbadaeff10 Mon Sep 17 00:00:00 2001 From: Ivan Esparza Date: Fri, 1 Apr 2016 18:46:04 -0700 Subject: [PATCH 2/3] Update Base.java --- app/src/processing/app/Base.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java index d0b47c6454d..580e136a494 100644 --- a/app/src/processing/app/Base.java +++ b/app/src/processing/app/Base.java @@ -145,8 +145,6 @@ static public void guardedMain(String args[]) throws Exception { deleteFilesOnShutdownThread.setName("DeleteFilesOnShutdown"); Runtime.getRuntime().addShutdownHook(deleteFilesOnShutdownThread); - - BaseNoGui.initLogger(); initLogger(); @@ -279,7 +277,6 @@ public Base(String[] args) throws Exception { CommandlineParser parser = new CommandlineParser(args); parser.parseArgumentsPhase1(); - BaseNoGui.checkInstallationFolder(); String sketchbookPath = BaseNoGui.getSketchbookPath(); @@ -295,12 +292,7 @@ public Base(String[] args) throws Exception { defaultFolder.mkdirs(); } } - - - - - - + splashScreenHelper.splashText(tr("Initializing packages...")); BaseNoGui.initPackages(); splashScreenHelper.splashText(tr("Preparing boards...")); From 6257aa030188b9f91045bfd914d8f85697c57790 Mon Sep 17 00:00:00 2001 From: Ivan Esparza Date: Fri, 1 Apr 2016 18:46:44 -0700 Subject: [PATCH 3/3] Update Base.java --- app/src/processing/app/Base.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java index 580e136a494..5ddb4c0632e 100644 --- a/app/src/processing/app/Base.java +++ b/app/src/processing/app/Base.java @@ -123,7 +123,6 @@ public class Base { private final List recentSketchesMenuItems; static public void main(String args[]) throws Exception { - System.setProperty("awt.useSystemAAFontSettings", "on"); System.setProperty("swing.aatext", "true"); System.setProperty("java.net.useSystemProxies", "true"); @@ -161,7 +160,6 @@ static public void guardedMain(String args[]) throws Exception { BaseNoGui.initVersion(); - // if (System.getProperty("mrj.version") != null) { // //String jv = System.getProperty("java.version"); // String ov = System.getProperty("os.version");