From 4821f3090c0edaacc5f2730ac79d30612ec6b4b6 Mon Sep 17 00:00:00 2001 From: Roman Kennke Date: Tue, 19 Apr 2005 06:36:27 +0000 Subject: [PATCH] UIManager.java: Make the UIManager respect the swing.defaultlaf system property. 2005-04-19 Roman Kennke * javax/swing/UIManager.java: Make the UIManager respect the swing.defaultlaf system property. From-SVN: r98389 --- libjava/ChangeLog | 6 ++++++ libjava/javax/swing/UIManager.java | 21 ++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 6091c6bb210..fefa1be0732 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2005-04-19 Roman Kennke + + * javax/swing/UIManager.java: + Make the UIManager respect the swing.defaultlaf system + property. + 2005-04-19 Tom Tromey * java/lang/natVMClassLoader.cc (loadClass): Call resolveClass, diff --git a/libjava/javax/swing/UIManager.java b/libjava/javax/swing/UIManager.java index dfc6a82ac46..dee67d9762e 100644 --- a/libjava/javax/swing/UIManager.java +++ b/libjava/javax/swing/UIManager.java @@ -83,7 +83,26 @@ public class UIManager implements Serializable static LookAndFeel[] aux_installed; static LookAndFeel look_and_feel = new MetalLookAndFeel(); - + + static + { + String defaultlaf = System.getProperty("swing.defaultlaf"); + try { + if (defaultlaf != null) + { + Class lafClass = Class.forName(defaultlaf); + LookAndFeel laf = (LookAndFeel) lafClass.newInstance(); + setLookAndFeel(laf); + } + } + catch (Exception ex) + { + System.err.println("cannot initialize Look and Feel: " + defaultlaf); + System.err.println("errot: " + ex.getMessage()); + System.err.println("falling back to Metal Look and Feel"); + } + } + public UIManager() { // Do nothing here. -- 2.30.2