diff --git a/ugs-platform/pom.xml b/ugs-platform/pom.xml index 9a3422dfb..dae6ecf82 100644 --- a/ugs-platform/pom.xml +++ b/ugs-platform/pom.xml @@ -15,7 +15,7 @@ yyyy.MM.dd.HH.mm - RELEASE180 + RELEASE230 Universal Gcode Sender ${project.version} Universal Gcode Sender 2 diff --git a/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/lifecycle/LookAndFeelInstaller.java b/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/lifecycle/LookAndFeelInstaller.java index fe1a5e9ab..2a6a460f1 100644 --- a/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/lifecycle/LookAndFeelInstaller.java +++ b/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/lifecycle/LookAndFeelInstaller.java @@ -18,7 +18,6 @@ This file is part of Universal Gcode Sender (UGS). */ package com.willwinder.ugs.nbp.core.lifecycle; -import org.apache.commons.lang3.SystemUtils; import org.openide.modules.ModuleInstall; import org.openide.util.NbPreferences; @@ -31,12 +30,7 @@ public class LookAndFeelInstaller extends ModuleInstall { @Override public void validate() { - if (SystemUtils.IS_OS_MAC_OSX) { - // FlatlLaf look and feel doesn't work on MacOSXs - setMacOSLaF(); - } else { - setLaF(); - } + setLaF(); } private void setLaF() { @@ -45,12 +39,4 @@ private void setLaF() { prefs.put("laf", "com.formdev.flatlaf.FlatLightLaf"); } } - - private void setMacOSLaF() { - Preferences prefs = NbPreferences.root().node("laf"); - String currentLaF = prefs.get("laf", ""); - if (currentLaF.isBlank() || currentLaF.equals("com.formdev.flatlaf.FlatLightLaf")) { - prefs.put("laf", "com.apple.laf.AquaLookAndFeel"); - } - } }