From b9839223367364225470e6d8f67d8fe1a9f103ba Mon Sep 17 00:00:00 2001
From: Niki Roo <niki@nikiroo.be>
Date: Wed, 6 May 2020 17:22:22 +0200
Subject: [PATCH] more laf options, jdoc

---
 resources/Bundle.java | 42 ++++++++++++++++++++----------------------
 ui/UIUtils.java       | 35 ++++++++++++++++++++++++++++-------
 2 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/resources/Bundle.java b/resources/Bundle.java
index c757e2b..84efcea 100644
--- a/resources/Bundle.java
+++ b/resources/Bundle.java
@@ -133,8 +133,8 @@ public class Bundle<E extends Enum<E>> {
 	 * @param def
 	 *            the default value when it is not present in the config file
 	 * 
-	 * @return the associated value, or NULL if not found (not present in the
-	 *         resource file)
+	 * @return the associated value, or <tt>def</tt> if not found (not present
+	 *         in the resource file)
 	 */
 	public String getString(E id, String def) {
 		return getString(id, def, -1);
@@ -154,8 +154,9 @@ public class Bundle<E extends Enum<E>> {
 	 *            the item number to get for an array of values, or -1 for
 	 *            non-arrays
 	 * 
-	 * @return the associated value, or NULL if not found (not present in the
-	 *         resource file)
+	 * @return the associated value, <tt>def</tt> if not found (not present in
+	 *         the resource file) or NULL if the item is specified (not -1) and
+	 *         does not exist
 	 */
 	public String getString(E id, String def, int item) {
 		String rep = getString(id.name(), null);
@@ -163,7 +164,7 @@ public class Bundle<E extends Enum<E>> {
 			rep = getMetaDef(id.name());
 		}
 
-		if (rep == null || rep.isEmpty()) {
+		if (rep.isEmpty()) {
 			return def;
 		}
 
@@ -273,8 +274,9 @@ public class Bundle<E extends Enum<E>> {
 	 *            the item number to get for an array of values, or -1 for
 	 *            non-arrays
 	 * 
-	 * @return the associated value, or NULL if not found (not present in the
-	 *         resource file)
+	 * @return the associated value, <tt>def</tt> if not found (not present in
+	 *         the resource file), NULL if the item is specified (not -1) but
+	 *         does not exist and NULL if bad key
 	 */
 	public String getStringX(E id, String suffix, String def, int item) {
 		String key = id.name()
@@ -932,7 +934,7 @@ public class Bundle<E extends Enum<E>> {
 	}
 
 	/**
-	 * The default {@link MetaInfo.def} value for the given enumeration name.
+	 * The default {@link Meta#def()} value for the given enumeration name.
 	 * 
 	 * @param id
 	 *            the enumeration name (the "id")
@@ -1209,22 +1211,18 @@ public class Bundle<E extends Enum<E>> {
 	 */
 	protected void resetMap(ResourceBundle bundle) {
 		this.map.clear();
-		for (Field field : type.getDeclaredFields()) {
-			try {
-				Meta meta = field.getAnnotation(Meta.class);
-				if (meta != null) {
-					E id = Enum.valueOf(type, field.getName());
-
-					String value;
-					if (bundle != null) {
-						value = bundle.getString(id.name());
-					} else {
-						value = null;
+		if (bundle != null) {
+			for (Field field : type.getDeclaredFields()) {
+				try {
+					Meta meta = field.getAnnotation(Meta.class);
+					if (meta != null) {
+						E id = Enum.valueOf(type, field.getName());
+						String value = bundle.getString(id.name());
+						this.map.put(id.name(),
+								value == null ? null : value.trim());
 					}
-
-					this.map.put(id.name(), value == null ? null : value.trim());
+				} catch (MissingResourceException e) {
 				}
-			} catch (MissingResourceException e) {
 			}
 		}
 	}
diff --git a/ui/UIUtils.java b/ui/UIUtils.java
index 5861d00..7d78d1e 100644
--- a/ui/UIUtils.java
+++ b/ui/UIUtils.java
@@ -20,24 +20,45 @@ import javax.swing.UnsupportedLookAndFeelException;
  */
 public class UIUtils {
 	/**
-	 * Set a fake "native look &amp; feel" for the application if possible
+	 * Set a fake "native Look &amp; Feel" for the application if possible
 	 * (check for the one currently in use, then try GTK).
 	 * <p>
 	 * <b>Must</b> be called prior to any GUI work.
+	 * 
+	 * @return TRUE if it succeeded
 	 */
-	static public void setLookAndFeel() {
+	static public boolean setLookAndFeel() {
 		// native look & feel
+		String noLF = "javax.swing.plaf.metal.MetalLookAndFeel";
+		String lf = UIManager.getSystemLookAndFeelClassName();
+		if (lf.equals(noLF))
+			lf = "com.sun.java.swing.plaf.gtk.GTKLookAndFeel";
+		
+		return setLookAndFeel(lf);
+	}
+
+	/**
+	 * Switch to the given Look &amp; Feel for the application if possible
+	 * (check for the one currently in use, then try GTK).
+	 * <p>
+	 * <b>Must</b> be called prior to any GUI work.
+	 * 
+	 * @param laf
+	 *            the Look &amp; Feel to use
+	 * 
+	 * @return TRUE if it succeeded
+	 */
+	static public boolean setLookAndFeel(String laf) {
 		try {
-			String noLF = "javax.swing.plaf.metal.MetalLookAndFeel";
-			String lf = UIManager.getSystemLookAndFeelClassName();
-			if (lf.equals(noLF))
-				lf = "com.sun.java.swing.plaf.gtk.GTKLookAndFeel";
-			UIManager.setLookAndFeel(lf);
+			UIManager.setLookAndFeel(laf);
+			return true;
 		} catch (InstantiationException e) {
 		} catch (ClassNotFoundException e) {
 		} catch (UnsupportedLookAndFeelException e) {
 		} catch (IllegalAccessException e) {
 		}
+
+		return false;
 	}
 
 	/**
-- 
2.27.0