From 755f9ba24e642c20bf413a6209b017d5d5c438dc Mon Sep 17 00:00:00 2001
From: Joacim Breiler <joacim@breiler.com>
Date: Sat, 5 Oct 2024 08:21:33 +0200
Subject: [PATCH] Update Netbeans and make MacOSX use FlatLAF

---
 ugs-platform/pom.xml                             |  2 +-
 .../nbp/core/lifecycle/LookAndFeelInstaller.java | 16 +---------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/ugs-platform/pom.xml b/ugs-platform/pom.xml
index 9a3422dfb5..dae6ecf82d 100644
--- a/ugs-platform/pom.xml
+++ b/ugs-platform/pom.xml
@@ -15,7 +15,7 @@
 
     <properties>
       <maven.build.timestamp.format>yyyy.MM.dd.HH.mm</maven.build.timestamp.format>
-      <netbeans.version>RELEASE180</netbeans.version>
+      <netbeans.version>RELEASE230</netbeans.version>
       <ugs.app.title>Universal Gcode Sender ${project.version}</ugs.app.title>
       <ugs.appbundle.name>Universal Gcode Sender</ugs.appbundle.name>
       <parsedVersion.majorVersion>2</parsedVersion.majorVersion>
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 fe1a5e9ab3..2a6a460f19 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");
-        }
-    }
 }