X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fresources%2FBundle.java;h=4420109caa157a8358f1298b8186c71a05bec4c2;hb=da5bfa4878661329b6e13610d5596dc7d06a5455;hp=ca61f6d8e509c2616f307f3d2076a1475575d2ad;hpb=009196a48ec0820288dac580f661c8884e1c1108;p=fanfix.git
diff --git a/src/be/nikiroo/utils/resources/Bundle.java b/src/be/nikiroo/utils/resources/Bundle.java
index ca61f6d..4420109 100644
--- a/src/be/nikiroo/utils/resources/Bundle.java
+++ b/src/be/nikiroo/utils/resources/Bundle.java
@@ -12,16 +12,21 @@ import java.io.Reader;
import java.io.Writer;
import java.lang.reflect.Field;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Locale;
+import java.util.Map;
import java.util.MissingResourceException;
import java.util.PropertyResourceBundle;
import java.util.ResourceBundle;
/**
- * This class encapsulate a {@link ResourceBundle} in UTF-8. It only allows to
+ * This class encapsulate a {@link ResourceBundle} in UTF-8. It allows to
* retrieve values associated to an enumeration, and allows some additional
* methods.
+ *
+ * It also sports a writable change map, and you can save back the
+ * {@link Bundle} to file with {@link Bundle#updateFile(String)}.
*
* @author niki
*
@@ -32,6 +37,7 @@ public class Bundle> {
protected Class type;
protected Enum> name;
private ResourceBundle map;
+ private Map changeMap;
/**
* Create a new {@link Bundles} of the given name.
@@ -45,7 +51,8 @@ public class Bundle> {
protected Bundle(Class type, Enum> name) {
this.type = type;
this.name = name;
- setBundle(name, Locale.getDefault());
+ this.changeMap = new HashMap();
+ setBundle(name, Locale.getDefault(), false);
}
/**
@@ -61,6 +68,19 @@ public class Bundle> {
return getStringX(id, null);
}
+ /**
+ * Set the value associated to the given id as a {@link String}.
+ *
+ * @param mame
+ * the id of the value to get
+ * @param value
+ * the value
+ *
+ */
+ public void setString(E id, String value) {
+ setStringX(id, null, value);
+ }
+
/**
* Return the value associated to the given id as a {@link String} suffixed
* with the runtime value "_suffix" (that is, "_" and suffix).
@@ -84,6 +104,24 @@ public class Bundle> {
return null;
}
+ /**
+ * Set the value associated to the given id as a {@link String} suffixed
+ * with the runtime value "_suffix" (that is, "_" and suffix).
+ *
+ * @param mame
+ * the id of the value to get
+ * @param suffix
+ * the runtime suffix
+ * @param value
+ * the value
+ */
+ public void setStringX(E id, String suffix, String value) {
+ String key = id.name()
+ + (suffix == null ? "" : "_" + suffix.toUpperCase());
+
+ setString(key, value);
+ }
+
/**
* Return the value associated to the given id as a {@link Boolean}.
*
@@ -108,7 +146,7 @@ public class Bundle> {
}
/**
- * Return the value associated to the given id as a {@link boolean}.
+ * Return the value associated to the given id as a {@link Boolean}.
*
* @param mame
* the id of the value to get
@@ -170,13 +208,33 @@ public class Bundle> {
*
* @return the associated value
*/
- public char getChar(E id) {
+ public Character getCharacter(E id) {
+ String s = getString(id).trim();
+ if (s.length() > 0) {
+ return s.charAt(0);
+ }
+
+ return null;
+ }
+
+ /**
+ * Return the value associated to the given id as a {@link Character}.
+ *
+ * @param mame
+ * the id of the value to get
+ * @param def
+ * the default value when it is not present in the config file or
+ * if it is not a char value
+ *
+ * @return the associated value
+ */
+ public char getCharacter(E id, char def) {
String s = getString(id).trim();
if (s.length() > 0) {
return s.charAt(0);
}
- return ' ';
+ return def;
}
/**
@@ -191,11 +249,16 @@ public class Bundle> {
Color color = null;
String bg = getString(id).trim();
- if (bg.startsWith("#") && bg.length() == 7) {
+ if (bg.startsWith("#") && (bg.length() == 7 || bg.length() == 9)) {
try {
- color = new Color(Integer.parseInt(bg.substring(1, 3), 16),
- Integer.parseInt(bg.substring(3, 5), 16),
- Integer.parseInt(bg.substring(5, 7), 16));
+ int r = Integer.parseInt(bg.substring(1, 3), 16);
+ int g = Integer.parseInt(bg.substring(3, 5), 16);
+ int b = Integer.parseInt(bg.substring(5, 7), 16);
+ int a = 255;
+ if (bg.length() == 9) {
+ a = Integer.parseInt(bg.substring(7, 9), 16);
+ }
+ color = new Color(r, g, b, a);
} catch (NumberFormatException e) {
color = null; // no changes
}
@@ -204,6 +267,26 @@ public class Bundle> {
return color;
}
+ /**
+ * Set the value associated to the given id as a {@link Color}.
+ *
+ * @param the
+ * id of the value to get
+ *
+ * @return the associated value
+ */
+ public void setColor(E id, Color color) {
+ String r = Integer.toString(color.getRed(), 16);
+ String g = Integer.toString(color.getGreen(), 16);
+ String b = Integer.toString(color.getBlue(), 16);
+ String a = "";
+ if (color.getAlpha() < 255) {
+ a = Integer.toString(color.getAlpha(), 16);
+ }
+
+ setString(id, "#" + r + g + b + a);
+ }
+
/**
* Create/update the .properties file.
*
@@ -247,9 +330,14 @@ public class Bundle> {
/**
* Reload the {@link Bundle} data files.
+ *
+ * @param resetToDefault
+ * reset to the default configuration (do not look into the
+ * possible user configuration files, only take the original
+ * configuration)
*/
- public void reload() {
- setBundle(name, null);
+ public void reload(boolean resetToDefault) {
+ setBundle(name, null, resetToDefault);
}
/**
@@ -261,12 +349,19 @@ public class Bundle> {
* @return true if it does
*/
protected boolean containsKey(String key) {
- try {
- map.getObject(key);
+ if (changeMap.containsKey(key)) {
return true;
- } catch (MissingResourceException e) {
- return false;
}
+
+ if (map != null) {
+ try {
+ map.getObject(key);
+ return true;
+ } catch (MissingResourceException e) {
+ }
+ }
+
+ return false;
}
/**
@@ -279,13 +374,30 @@ public class Bundle> {
* @return the value, or NULL
*/
protected String getString(String key) {
- if (containsKey(key)) {
+ if (changeMap.containsKey(key)) {
+ return changeMap.get(key);
+ }
+
+ if (map != null && containsKey(key)) {
return map.getString(key);
}
return null;
}
+ /**
+ * Set the value for this key, in the change map (it is kept in memory, not
+ * yet on disk).
+ *
+ * @param key
+ * the key
+ * @param value
+ * the associated value
+ */
+ protected void setString(String key, String value) {
+ changeMap.put(key, value);
+ }
+
/**
* Return formated, display-able information from the {@link Meta} field
* given. Each line will always starts with a "#" character.
@@ -426,18 +538,23 @@ public class Bundle> {
}
/**
- * Change the currently used bundle.
+ * Change the currently used bundle, and reset all changes.
*
* @param name
* the name of the bundle to load
* @param locale
* the {@link Locale} to use
+ * @param resetToDefault
+ * reset to the default configuration (do not look into the
+ * possible user configuration files, only take the original
+ * configuration)
*/
- protected void setBundle(Enum> name, Locale locale) {
+ protected void setBundle(Enum> name, Locale locale, boolean resetToDefault) {
map = null;
+ changeMap.clear();
String dir = Bundles.getDirectory();
- if (dir != null) {
+ if (!resetToDefault && dir != null) {
try {
File file = getPropertyFile(dir, name.name(), locale);
if (file != null) {
@@ -451,8 +568,47 @@ public class Bundle> {
}
if (map == null) {
- map = ResourceBundle.getBundle(type.getPackage().getName() + "."
- + name.name(), locale, new FixedResourceBundleControl());
+ try {
+ map = ResourceBundle.getBundle(type.getPackage().getName()
+ + "." + name.name(), locale,
+ new FixedResourceBundleControl());
+ } catch (Exception e) {
+ // We have no bundle for this Bundle
+ map = null;
+ }
+ }
+ }
+
+ /**
+ * Take a snapshot of the changes in memory in this {@link Bundle} made by
+ * the "set" methods ( {@link Bundle#setString(Enum, String)}...) at the
+ * current time.
+ *
+ * @return a snapshot to use with {@link Bundle#restoreChanges(Object)}
+ */
+ protected Object takeChangesSnapshot() {
+ return new HashMap(changeMap);
+ }
+
+ /**
+ * Restore a snapshot taken with {@link Bundle}, or reset the current
+ * changes if the snapshot is NULL.
+ *
+ * @param snap
+ * the snapshot or NULL
+ */
+ @SuppressWarnings("unchecked")
+ protected void restoreChanges(Object snap) {
+ if (snap == null) {
+ changeMap.clear();
+ } else {
+ if (snap instanceof Map) {
+ changeMap = (Map) snap;
+ } else {
+ throw new Error(
+ "Restoring changes in a Bundle must be done on a changes snapshot, "
+ + "or NULL to discard current changes");
+ }
}
}