From: Ben Soares Date: Thu, 8 Jun 2023 10:12:17 +0000 (+0100) Subject: JAL-3416 FlatLaf SystemInfo failing in JalviewJS. Look and Feel not relevant to... X-Git-Tag: Release_2_11_4_0~213^2~20 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=a27b3832ad1bbe70548bcc53301446c75d02672a;p=jalview.git JAL-3416 FlatLaf SystemInfo failing in JalviewJS. Look and Feel not relevant to JalviewJS so setLookAndFeel commented out for j2s with @j2sIgnore --- diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java index c109836..6d2866a 100755 --- a/src/jalview/bin/Jalview.java +++ b/src/jalview/bin/Jalview.java @@ -1006,7 +1006,7 @@ public class Jalview ex.printStackTrace(System.err); } } - + if (groovyscript != null) { // Execute the groovy script after we've done all the rendering stuff @@ -1220,93 +1220,102 @@ public class Jalview private static void setLookAndFeel() { - // property laf = "crossplatform", "system", "gtk", "metal", "nimbus", - // "mac" or "flat" - // If not set (or chosen laf fails), use the normal SystemLaF and if on Mac, - // try Quaqua/Vaqua. - String lafProp = System.getProperty("laf"); - String lafSetting = Cache.getDefault("PREFERRED_LAF", null); - String laf = "none"; - if (lafProp != null) - { - laf = lafProp; - } - else if (lafSetting != null) - { - laf = lafSetting; - } - boolean lafSet = false; - switch (laf) + if (!Platform.isJS()) + /** + * Java only + * + * @j2sIgnore + */ { - case "crossplatform": - lafSet = setCrossPlatformLookAndFeel(); - if (!lafSet) - { - Console.error("Could not set requested laf=" + laf); - } - break; - case "system": - lafSet = setSystemLookAndFeel(); - if (!lafSet) - { - Console.error("Could not set requested laf=" + laf); + // property laf = "crossplatform", "system", "gtk", "metal", "nimbus", + // "mac" or "flat" + // If not set (or chosen laf fails), use the normal SystemLaF and if on + // Mac, + // try Quaqua/Vaqua. + String lafProp = System.getProperty("laf"); + String lafSetting = Cache.getDefault("PREFERRED_LAF", null); + String laf = "none"; + if (lafProp != null) + { + laf = lafProp; } - break; - case "gtk": - lafSet = setGtkLookAndFeel(); - if (!lafSet) + else if (lafSetting != null) { - Console.error("Could not set requested laf=" + laf); + laf = lafSetting; } - break; - case "metal": - lafSet = setMetalLookAndFeel(); - if (!lafSet) - { - Console.error("Could not set requested laf=" + laf); - } - break; - case "nimbus": - lafSet = setNimbusLookAndFeel(); - if (!lafSet) - { - Console.error("Could not set requested laf=" + laf); - } - break; - case "flat": - lafSet = setFlatLookAndFeel(); - if (!lafSet) - { - Console.error("Could not set requested laf=" + laf); - } - break; - case "mac": - lafSet = setMacLookAndFeel(); - if (!lafSet) + boolean lafSet = false; + switch (laf) { - Console.error("Could not set requested laf=" + laf); + case "crossplatform": + lafSet = setCrossPlatformLookAndFeel(); + if (!lafSet) + { + Console.error("Could not set requested laf=" + laf); + } + break; + case "system": + lafSet = setSystemLookAndFeel(); + if (!lafSet) + { + Console.error("Could not set requested laf=" + laf); + } + break; + case "gtk": + lafSet = setGtkLookAndFeel(); + if (!lafSet) + { + Console.error("Could not set requested laf=" + laf); + } + break; + case "metal": + lafSet = setMetalLookAndFeel(); + if (!lafSet) + { + Console.error("Could not set requested laf=" + laf); + } + break; + case "nimbus": + lafSet = setNimbusLookAndFeel(); + if (!lafSet) + { + Console.error("Could not set requested laf=" + laf); + } + break; + case "flat": + lafSet = setFlatLookAndFeel(); + if (!lafSet) + { + Console.error("Could not set requested laf=" + laf); + } + break; + case "mac": + lafSet = setMacLookAndFeel(); + if (!lafSet) + { + Console.error("Could not set requested laf=" + laf); + } + break; + case "none": + break; + default: + Console.error("Requested laf=" + laf + " not implemented"); } - break; - case "none": - break; - default: - Console.error("Requested laf=" + laf + " not implemented"); - } - if (!lafSet) - { - // Flatlaf default for everyone! - lafSet = setFlatLookAndFeel(); if (!lafSet) { - setSystemLookAndFeel(); - } - if (Platform.isLinux()) - { - setLinuxLookAndFeel(); - } - if (Platform.isMac()) - { - setMacLookAndFeel(); + // Flatlaf default for everyone! + lafSet = setFlatLookAndFeel(); + if (!lafSet) + { + setSystemLookAndFeel(); + } + if (Platform.isLinux()) + { + setLinuxLookAndFeel(); + } + if (Platform.isMac()) + { + setMacLookAndFeel(); + } } } }