Merge branch 'master' into jide-oss-update

improve some checks when switching look and feel
update jar to version 3.7.15
2025-12-26 23:57:25 +01:00 · 2025-08-06 23:20:37 +02:00 · 2025-07-15 12:51:49 +02:00 · 2025-07-15 12:51:24 +02:00
3 changed files with 39 additions and 37 deletions
--- a/lib/jide-oss.jar
+++ b/lib/jide-oss.jar
--- a/src/com/gpl/rpg/atcontentstudio/ATContentStudio.java
+++ b/src/com/gpl/rpg/atcontentstudio/ATContentStudio.java
@@ -65,22 +65,8 @@ public class ATContentStudio {

        ConfigCache.init();

-        try {
-            String laf = ConfigCache.getFavoriteLaFClassName();
-            if (laf == null)
-                laf = UIManager.getSystemLookAndFeelClassName();
-            UIManager.setLookAndFeel(laf);
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        } catch (InstantiationException e) {
-            e.printStackTrace();
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        } catch (UnsupportedLookAndFeelException e) {
-            e.printStackTrace();
-        }
-
-        scaleUIFont();
+        String laf = ConfigCache.getFavoriteLaFClassName();
+        setLookAndFeel(laf);

        // Need to keep a strong reference to it, to avoid garbage collection that'll
        // reset this setting.
@@ -116,7 +102,6 @@ public class ATContentStudio {
                            frame.setVisible(true);
                            frame.setDefaultCloseOperation(StudioFrame.DO_NOTHING_ON_CLOSE);
                        }
-
                    });
                    for (File f : ConfigCache.getKnownWorkspaces()) {
                        if (workspaceRoot.equals(f)) {
@@ -134,6 +119,34 @@ public class ATContentStudio {
        });
    }

+    public static void setLookAndFeel(String laf) {
+        if (laf == null)
+        {
+            System.out.println("No look and feel specified, using system default.");
+            laf = UIManager.getSystemLookAndFeelClassName();
+        }
+        System.out.println("Info: Setting look and feel to: " + laf);
+
+        try {
+            UIManager.setLookAndFeel(laf);
+        } catch (ClassNotFoundException e) {
+            System.err.println("Failed to load system look and feel. ");
+            System.err.println("Installed look and feel classes: ");
+            for (UIManager.LookAndFeelInfo info : UIManager.getInstalledLookAndFeels()) {
+                System.err.println("  " + info.getName() + " (" + info.getClassName() + ")");
+            }
+            System.err.println("Tried to load: " + laf + " but got this error:");
+
+            e.printStackTrace();
+        } catch (InstantiationException | UnsupportedLookAndFeelException | IllegalAccessException e) {
+            e.printStackTrace();
+        }
+        var newLaF = UIManager.getLookAndFeel();
+        System.out.println("Using look and feel: " + newLaF.getName() + " (" + newLaF.getClass().getName() + ")");
+
+        scaleUIFont();
+    }
+
    private static void checkUpdate() {
        BufferedReader in = null;
        try {
@@ -156,13 +169,13 @@ public class ATContentStudio {
                style.append("font-weight:" + (font.isBold() ? "bold" : "normal") + ";");
                style.append("font-size:" + font.getSize() + "pt;");
                style.append("background-color: rgb(" + color.getRed() + "," + color.getGreen() + "," + color.getBlue()
-                                     + ");");
+                        + ");");

                JEditorPane ep = new JEditorPane("text/html",
-                                                 "<html><body style=\"" + style + "\">" + "You are not running the latest ATCS version.<br/>"
-                                                         + "You can get the latest version (" + lastLine + ") by clicking the link below.<br/>"
-                                                         + "<a href=\"" + DOWNLOAD_URL + "\">" + DOWNLOAD_URL + "</a><br/>" + "<br/>"
-                                                         + "</body></html>");
+                        "<html><body style=\"" + style + "\">" + "You are not running the latest ATCS version.<br/>"
+                                + "You can get the latest version (" + lastLine + ") by clicking the link below.<br/>"
+                                + "<a href=\"" + DOWNLOAD_URL + "\">" + DOWNLOAD_URL + "</a><br/>" + "<br/>"
+                                + "</body></html>");

                ep.setEditable(false);
                ep.setBorder(null);
--- a/src/com/gpl/rpg/atcontentstudio/ui/StudioFrame.java
+++ b/src/com/gpl/rpg/atcontentstudio/ui/StudioFrame.java
@@ -145,20 +145,10 @@ public class StudioFrame extends JFrame {
            lafItem.addActionListener(new ActionListener() {
                @Override
                public void actionPerformed(ActionEvent e) {
-                    try {
-                        UIManager.setLookAndFeel(i.getClassName());
-                        ATContentStudio.scaleUIFont();
-                        SwingUtilities.updateComponentTreeUI(ATContentStudio.frame);
-                        ConfigCache.setFavoriteLaFClassName(i.getClassName());
-                    } catch (ClassNotFoundException e1) {
-                        e1.printStackTrace();
-                    } catch (InstantiationException e1) {
-                        e1.printStackTrace();
-                    } catch (IllegalAccessException e1) {
-                        e1.printStackTrace();
-                    } catch (UnsupportedLookAndFeelException e1) {
-                        e1.printStackTrace();
-                    }
+                    String lookAndFeel = i.getClassName();
+                    ATContentStudio.setLookAndFeel(lookAndFeel);
+                    SwingUtilities.updateComponentTreeUI(ATContentStudio.frame);
+                    ConfigCache.setFavoriteLaFClassName(lookAndFeel);
                }
            });
        }
@@ -231,5 +221,4 @@ public class StudioFrame extends JFrame {
        editors.showAbout();
    }

-
 }
Author	SHA1	Message	Date
OMGeeky	2bf64c417f	Merge branch 'master' into jide-oss-update	2025-08-06 23:20:37 +02:00
OMGeeky	bc3333bd0e	improve some checks when switching look and feel	2025-07-15 12:51:49 +02:00
OMGeeky	e6d9d8fbda	update jar to version 3.7.15 this should improve compatibility with newer jdk versions	2025-07-15 12:51:24 +02:00