X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fresources%2FBundle.java;h=b4019de53d67e851e096074021b8b7341b22eef8;hb=62c9ec78bcd5d7016e6d1447b4422955cb55b198;hp=1c63d69f04f84276eeaf19ee3a29e028f52fae54;hpb=ec1f3444e9f238ce1559d5fff32eb5a7ab8aba53;p=fanfix.git
diff --git a/src/be/nikiroo/utils/resources/Bundle.java b/src/be/nikiroo/utils/resources/Bundle.java
index 1c63d69..b4019de 100644
--- a/src/be/nikiroo/utils/resources/Bundle.java
+++ b/src/be/nikiroo/utils/resources/Bundle.java
@@ -1,5 +1,6 @@
package be.nikiroo.utils.resources;
+import java.awt.Color;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileInputStream;
@@ -8,23 +9,24 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.Reader;
-import java.io.UnsupportedEncodingException;
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;
-import be.nikiroo.utils.resources.Bundles;
-import be.nikiroo.utils.resources.Meta;
-
/**
- * 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
*
@@ -35,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.
@@ -48,6 +51,7 @@ public class Bundle> {
protected Bundle(Class type, Enum> name) {
this.type = type;
this.name = name;
+ this.changeMap = new HashMap();
setBundle(name, Locale.getDefault());
}
@@ -61,7 +65,20 @@ public class Bundle> {
* resource file)
*/
public String getString(E id) {
- return getStringX(id, "");
+ 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);
}
/**
@@ -78,8 +95,7 @@ public class Bundle> {
*/
public String getStringX(E id, String suffix) {
String key = id.name()
- + ((suffix == null || suffix.isEmpty()) ? "" : "_"
- + suffix.toUpperCase());
+ + (suffix == null ? "" : "_" + suffix.toUpperCase());
if (containsKey(key)) {
return getString(key).trim();
@@ -88,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}.
*
@@ -112,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
@@ -174,20 +208,91 @@ 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 ' ';
+ 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 def;
}
/**
- * Create/update the .properties file. Will use the most likely candidate as
- * base if the file does not already exists and this resource is
- * translatable (for instance, "en_US" will use "en" as a base if the
- * resource is a translation file).
+ * Return the value associated to the given id as a {@link Color}.
+ *
+ * @param the
+ * id of the value to get
+ *
+ * @return the associated value
+ */
+ public Color getColor(E id) {
+ Color color = null;
+
+ String bg = getString(id).trim();
+ if (bg.startsWith("#") && (bg.length() == 7 || bg.length() == 9)) {
+ try {
+ 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
+ }
+ }
+
+ 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.
+ *
+ * Will use the most likely candidate as base if the file does not already
+ * exists and this resource is translatable (for instance, "en_US" will use
+ * "en" as a base if the resource is a translation file).
*
* @param path
* the path where the .properties files are
@@ -223,6 +328,13 @@ public class Bundle> {
writer.close();
}
+ /**
+ * Reload the {@link Bundle} data files.
+ */
+ public void reload() {
+ setBundle(name, null);
+ }
+
/**
* Check if the internal map contains the given key.
*
@@ -232,6 +344,10 @@ public class Bundle> {
* @return true if it does
*/
protected boolean containsKey(String key) {
+ if (changeMap.containsKey(key)) {
+ return true;
+ }
+
try {
map.getObject(key);
return true;
@@ -241,31 +357,39 @@ public class Bundle> {
}
/**
- * Get the value for the given key if it exists in the internal map.
+ * Get the value for the given key if it exists in the internal map, or NULL
+ * if not.
*
* @param key
* the key to check for
*
- * @return true if it does
+ * @return the value, or NULL
*/
protected String getString(String key) {
+ if (changeMap.containsKey(key)) {
+ return changeMap.get(key);
+ }
+
if (containsKey(key)) {
- try {
- // Note: it is also possible to fix the borked charset issue
- // with a custom ResourceBundle#Control class, but this one,
- // while a workaround, depend less upon the JRE classes, which
- // may change
- return new String(map.getString(key).getBytes("ISO-8859-1"),
- "UTF-8");
- } catch (UnsupportedEncodingException e) {
- // Those 2 encodings are always supported
- e.printStackTrace();
- }
+ 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.
@@ -380,7 +504,7 @@ public class Bundle> {
value = "";
}
- String[] lines = value.replaceAll("\\\t", "\\\\\\t").split("\n");
+ String[] lines = value.replaceAll("\t", "\\\\\\t").split("\n");
for (int i = 0; i < lines.length; i++) {
writer.write(lines[i]);
if (i < lines.length - 1) {
@@ -406,7 +530,7 @@ 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
@@ -415,6 +539,7 @@ public class Bundle> {
*/
protected void setBundle(Enum> name, Locale locale) {
map = null;
+ changeMap.clear();
String dir = Bundles.getDirectory();
if (dir != null) {
@@ -432,7 +557,7 @@ public class Bundle> {
if (map == null) {
map = ResourceBundle.getBundle(type.getPackage().getName() + "."
- + name.name(), locale);
+ + name.name(), locale, new FixedResourceBundleControl());
}
}