X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fresources%2FBundle.java;h=85abfe73da7ae5c3139c20acc98e103abf0a4e7b;hb=d18e136e69f03efe5fd6b8e6536cf8ad9033da1a;hp=92b02eb43e75cc59eec8cb5a6c3bf80c20c7f300;hpb=e8aa5bf9227a0d6a6d0bb6a8bc0cc04d0f4d601a;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/resources/Bundle.java b/src/be/nikiroo/utils/resources/Bundle.java
index 92b02eb..85abfe7 100644
--- a/src/be/nikiroo/utils/resources/Bundle.java
+++ b/src/be/nikiroo/utils/resources/Bundle.java
@@ -89,7 +89,7 @@ public class Bundle<E extends Enum<E>> {
 	 * Set the value associated to the given id as a {@link String}.
 	 * 
 	 * @param id
-	 *            the id of the value to get
+	 *            the id of the value to set
 	 * @param value
 	 *            the value
 	 * 
@@ -133,7 +133,7 @@ public class Bundle<E extends Enum<E>> {
 	 * Will only accept suffixes that form an existing id.
 	 * 
 	 * @param id
-	 *            the id of the value to get
+	 *            the id of the value to set
 	 * @param suffix
 	 *            the runtime suffix
 	 * @param value
@@ -161,17 +161,7 @@ public class Bundle<E extends Enum<E>> {
 	 */
 	public Boolean getBoolean(E id) {
 		String str = getString(id);
-		if (str != null && str.length() > 0) {
-			if (str.equalsIgnoreCase("true") || str.equalsIgnoreCase("on")
-					|| str.equalsIgnoreCase("yes"))
-				return true;
-			if (str.equalsIgnoreCase("false") || str.equalsIgnoreCase("off")
-					|| str.equalsIgnoreCase("no"))
-				return false;
-
-		}
-
-		return null;
+		return BundleHelper.parseBoolean(str);
 	}
 
 	/**
@@ -193,6 +183,19 @@ public class Bundle<E extends Enum<E>> {
 		return def;
 	}
 
+	/**
+	 * Set the value associated to the given id as a {@link Boolean}.
+	 * 
+	 * @param id
+	 *            the id of the value to set
+	 * @param value
+	 *            the value
+	 * 
+	 */
+	public void setBoolean(E id, boolean value) {
+		setString(id.name(), BundleHelper.fromBoolean(value));
+	}
+
 	/**
 	 * Return the value associated to the given id as an {@link Integer}.
 	 * 
@@ -202,12 +205,7 @@ public class Bundle<E extends Enum<E>> {
 	 * @return the associated value
 	 */
 	public Integer getInteger(E id) {
-		try {
-			return Integer.parseInt(getString(id));
-		} catch (Exception e) {
-		}
-
-		return null;
+		return BundleHelper.parseInteger(getString(id));
 	}
 
 	/**
@@ -229,6 +227,19 @@ public class Bundle<E extends Enum<E>> {
 		return def;
 	}
 
+	/**
+	 * Set the value associated to the given id as a {@link Integer}.
+	 * 
+	 * @param id
+	 *            the id of the value to set
+	 * @param value
+	 *            the value
+	 * 
+	 */
+	public void setInteger(E id, int value) {
+		setString(id.name(), BundleHelper.fromInteger(value));
+	}
+
 	/**
 	 * Return the value associated to the given id as a {@link Character}.
 	 * 
@@ -238,12 +249,7 @@ public class Bundle<E extends Enum<E>> {
 	 * @return the associated value
 	 */
 	public Character getCharacter(E id) {
-		String s = getString(id).trim();
-		if (s.length() > 0) {
-			return s.charAt(0);
-		}
-
-		return null;
+		return BundleHelper.parseCharacter(getString(id));
 	}
 
 	/**
@@ -258,10 +264,9 @@ public class Bundle<E extends Enum<E>> {
 	 * @return the associated value
 	 */
 	public char getCharacter(E id, char def) {
-		String s = getString(id);
-		if (s != null && s.length() > 0) {
-			return s.trim().charAt(0);
-		}
+		Character car = getCharacter(id);
+		if (car != null)
+			return car;
 
 		return def;
 	}
@@ -278,92 +283,13 @@ public class Bundle<E extends Enum<E>> {
 	 * @return the associated value
 	 */
 	public Integer getColor(E id) {
-		Integer rep = null;
-
-		String bg = getString(id).trim();
-
-		int r = 0, g = 0, b = 0, a = -1;
-		if (bg.startsWith("#") && (bg.length() == 7 || bg.length() == 9)) {
-			try {
-				r = Integer.parseInt(bg.substring(1, 3), 16);
-				g = Integer.parseInt(bg.substring(3, 5), 16);
-				b = Integer.parseInt(bg.substring(5, 7), 16);
-				if (bg.length() == 9) {
-					a = Integer.parseInt(bg.substring(7, 9), 16);
-				} else {
-					a = 255;
-				}
-
-			} catch (NumberFormatException e) {
-				// no changes
-			}
-		}
-
-		// Try by name if still not found
-		if (a == -1) {
-			if ("black".equalsIgnoreCase(bg)) {
-				a = 255;
-				r = 0;
-				g = 0;
-				b = 0;
-			} else if ("white".equalsIgnoreCase(bg)) {
-				a = 255;
-				r = 255;
-				g = 255;
-				b = 255;
-			} else if ("red".equalsIgnoreCase(bg)) {
-				a = 255;
-				r = 255;
-				g = 0;
-				b = 0;
-			} else if ("green".equalsIgnoreCase(bg)) {
-				a = 255;
-				r = 0;
-				g = 255;
-				b = 0;
-			} else if ("blue".equalsIgnoreCase(bg)) {
-				a = 255;
-				r = 0;
-				g = 0;
-				b = 255;
-			} else if ("grey".equalsIgnoreCase(bg)
-					|| "gray".equalsIgnoreCase(bg)) {
-				a = 255;
-				r = 128;
-				g = 128;
-				b = 128;
-			} else if ("cyan".equalsIgnoreCase(bg)) {
-				a = 255;
-				r = 0;
-				g = 255;
-				b = 255;
-			} else if ("magenta".equalsIgnoreCase(bg)) {
-				a = 255;
-				r = 255;
-				g = 0;
-				b = 255;
-			} else if ("yellow".equalsIgnoreCase(bg)) {
-				a = 255;
-				r = 255;
-				g = 255;
-				b = 0;
-			}
-		}
-
-		if (a != -1) {
-			rep = ((a & 0xFF) << 24) //
-					| ((r & 0xFF) << 16) //
-					| ((g & 0xFF) << 8) //
-					| ((b & 0xFF) << 0);
-		}
-
-		return rep;
+		return BundleHelper.parseColor(getString(id));
 	}
 
 	/**
 	 * Set the value associated to the given id as a colour.
 	 * <p>
-	 * The value is an BGRA value.
+	 * The value is a BGRA value.
 	 * 
 	 * @param id
 	 *            the id of the value to set
@@ -371,20 +297,33 @@ public class Bundle<E extends Enum<E>> {
 	 *            the new colour
 	 */
 	public void setColor(E id, Integer color) {
-		int a = (color >> 24) & 0xFF;
-		int r = (color >> 16) & 0xFF;
-		int g = (color >> 8) & 0xFF;
-		int b = (color >> 0) & 0xFF;
-
-		String rs = Integer.toString(r, 16);
-		String gs = Integer.toString(g, 16);
-		String bs = Integer.toString(b, 16);
-		String as = "";
-		if (a < 255) {
-			as = Integer.toString(a, 16);
-		}
+		setString(id, BundleHelper.fromColor(color));
+	}
+
+	/**
+	 * Return the value associated to the given id as a list of values if it is
+	 * found and can be parsed.
+	 * 
+	 * @param id
+	 *            the id of the value to get
+	 * 
+	 * @return the associated list, empty if the value is empty, NULL if it is
+	 *         not found or cannot be parsed as a list
+	 */
+	public List<String> getList(E id) {
+		return BundleHelper.parseList(getString(id));
+	}
 
-		setString(id, "#" + rs + gs + bs + as);
+	/**
+	 * Set the value associated to the given id as a list of values.
+	 * 
+	 * @param id
+	 *            the id of the value to set
+	 * @param list
+	 *            the new list of values
+	 */
+	public void setList(E id, List<String> list) {
+		setString(id, BundleHelper.fromList(list));
 	}
 
 	/**
@@ -565,12 +504,11 @@ public class Bundle<E extends Enum<E>> {
 		String[] list = meta.list();
 		boolean nullable = meta.nullable();
 		String def = meta.def();
-		String info = meta.info();
 		boolean array = meta.array();
 
 		// Default, empty values -> NULL
-		if (desc.length() + list.length + info.length() + def.length() == 0
-				&& !group && nullable && format == Meta.Format.STRING) {
+		if (desc.length() + list.length + def.length() == 0 && !group
+				&& nullable && format == Meta.Format.STRING) {
 			return null;
 		}
 
@@ -585,7 +523,7 @@ public class Bundle<E extends Enum<E>> {
 		} else {
 			builder.append(" (FORMAT: ").append(format)
 					.append(nullable ? "" : " (required)");
-			builder.append(") ").append(info);
+			builder.append(") ");
 
 			if (list.length > 0) {
 				builder.append("\n# ALLOWED VALUES:");