Better look and feel

Author: rcx

src/main/java/club/bytecode/the/jda/JDA.java

@@ -14,6 +14,7 @@
 import club.bytecode.the.jda.util.GuiUtils;
 import club.bytecode.the.jda.util.MiscUtils;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory;
 import org.fife.ui.rsyntaxtextarea.TokenMakerFactory;
 import org.fife.ui.rsyntaxtextarea.folding.CurlyFoldParser;
@@ -62,15 +63,13 @@ public class JDA {
      * @param args files you want to open or CLI
      */
     public static void main(String[] args) {
-        try {
-            // Fix antialiasing
-            System.setProperty("awt.useSystemAAFontSettings", "lcd");
-            System.setProperty("swing.aatext", "true");
+        // Fix antialiasing
+        System.setProperty("awt.useSystemAAFontSettings", "lcd");
+        System.setProperty("swing.aatext", "true");
+        if (SystemUtils.IS_OS_LINUX) {
             GuiUtils.setWmClassName("JDA");
-            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-        } catch (Exception e) {
-            new ExceptionUI(e);
         }
+        GuiUtils.setLookAndFeel();
         try {
             System.out.println("JDA (BCV Fork) v" + version);
             getJDADirectory();

src/main/java/club/bytecode/the/jda/util/GuiUtils.java

@@ -7,11 +7,16 @@
 import java.awt.image.BufferedImage;
 
 public class GuiUtils {
-    public static void setWmClassName(String className) throws NoSuchFieldException, IllegalAccessException {
+    public static void setWmClassName(String className) {
         Toolkit xToolkit = Toolkit.getDefaultToolkit();
-        java.lang.reflect.Field awtAppClassNameField = xToolkit.getClass().getDeclaredField("awtAppClassName");
-        awtAppClassNameField.setAccessible(true);
-        awtAppClassNameField.set(xToolkit, className);
+        java.lang.reflect.Field awtAppClassNameField = null;
+        try {
+            awtAppClassNameField = xToolkit.getClass().getDeclaredField("awtAppClassName");
+            awtAppClassNameField.setAccessible(true);
+            awtAppClassNameField.set(xToolkit, className);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     public static BufferedImage resize(BufferedImage image, int width, int height) {
@@ -26,4 +31,21 @@ public static ImageIcon resize(Icon icon, int width, int height){
         BufferedImage resized = resize(srcImg, width, height);
         return new ImageIcon(resized);
     }
+
+    public static void setLookAndFeel() {
+        try {
+            for (UIManager.LookAndFeelInfo info : UIManager.getInstalledLookAndFeels()) {
+                if ("Nimbus".equals(info.getName())) {
+                    UIManager.setLookAndFeel(info.getClassName());
+                    break;
+                }
+            }
+        } catch (Exception e) {
+            try {
+                UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+            } catch (Exception e1) {
+                e1.printStackTrace();
+            }
+        }
+    }
 }

src/main/java/club/bytecode/the/jda/util/MiscUtils.java

@@ -1,5 +1,7 @@
 package club.bytecode.the.jda.util;
 
+import org.apache.commons.lang3.SystemUtils;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.InputStream;