git://git.nikiroo.be
/
nikiroo-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add 'src/jexer/' from commit 'cf01c92f5809a0732409e280fb0f32f27393618d'
[nikiroo-utils.git]
/
src
/
be
/
nikiroo
/
utils
/
resources
/
Bundle.java
diff --git
a/src/be/nikiroo/utils/resources/Bundle.java
b/src/be/nikiroo/utils/resources/Bundle.java
index 21021e065f05a938f4521bfb5fd399b40847a77d..0c57bf992b495d8777b40753e850f9b827e47c39 100644
(file)
--- a/
src/be/nikiroo/utils/resources/Bundle.java
+++ b/
src/be/nikiroo/utils/resources/Bundle.java
@@
-92,7
+92,7
@@
public class Bundle<E extends Enum<E>> {
/**
* Check if the setting is set into this {@link Bundle}.
*
/**
* Check if the setting is set into this {@link Bundle}.
*
- * @param
id
+ * @param
name
* the id of the setting to check
* @param includeDefaultValue
* TRUE to only return false when the setting is not set AND
* the id of the setting to check
* @param includeDefaultValue
* TRUE to only return false when the setting is not set AND
@@
-215,11
+215,7
@@
public class Bundle<E extends Enum<E>> {
setString(id.name(), value);
} else {
List<String> values = getList(id);
setString(id.name(), value);
} else {
List<String> values = getList(id);
- for (int i = values.size(); i < item; i++) {
- values.add(null);
- }
- values.set(item, value);
- setString(id.name(), BundleHelper.fromList(values));
+ setString(id.name(), BundleHelper.fromList(values, value, item));
}
}
}
}
@@
-277,9
+273,6
@@
public class Bundle<E extends Enum<E>> {
* the id of the value to get
* @param suffix
* the runtime suffix
* the id of the value to get
* @param suffix
* the runtime suffix
- * @param item
- * the item number to get for an array of values, or -1 for
- * non-arrays
* @param def
* the default value when it is not present in the config file
* @param item
* @param def
* the default value when it is not present in the config file
* @param item
@@
-577,6
+570,9
@@
public class Bundle<E extends Enum<E>> {
* @param def
* the default value when it is not present in the config file or
* if it is not a char value
* @param def
* the default value when it is not present in the config file or
* if it is not a char value
+ * @param item
+ * the item number to get for an array of values, or -1 for
+ * non-arrays
*
* @return the associated value
*/
*
* @return the associated value
*/
@@
-645,6
+641,9
@@
public class Bundle<E extends Enum<E>> {
*
* @param id
* the id of the value to get
*
* @param id
* 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
*/
*
* @return the associated value
*/
@@
-667,6
+666,12
@@
public class Bundle<E extends Enum<E>> {
*
* @param id
* the id of the value to get
*
* @param id
* 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
+ * @param item
+ * the item number to get for an array of values, or -1 for
+ * non-arrays
*
* @return the associated value
*/
*
* @return the associated value
*/
@@
-733,6
+738,9
@@
public class Bundle<E extends Enum<E>> {
*
* @param id
* the id of the value to get
*
* @param id
* 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 list, empty if the value is empty, NULL if it is
* not found or cannot be parsed as a list
*
* @return the associated list, empty if the value is empty, NULL if it is
* not found or cannot be parsed as a list
@@
-754,6
+762,12
@@
public class Bundle<E extends Enum<E>> {
*
* @param id
* the id of the value to get
*
* @param id
* 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
+ * @param item
+ * the item number to get for an array of values, or -1 for
+ * non-arrays
*
* @return the associated list, empty if the value is empty, NULL if it is
* not found or cannot be parsed as a list
*
* @return the associated list, empty if the value is empty, NULL if it is
* not found or cannot be parsed as a list
@@
-1167,7
+1181,7
@@
public class Bundle<E extends Enum<E>> {
}
/**
}
/**
- * Reset the backing map to the content of the given bundle, or with
default
+ * Reset the backing map to the content of the given bundle, or with
NULL
* values if bundle is NULL.
*
* @param bundle
* values if bundle is NULL.
*
* @param bundle
@@
-1185,7
+1199,7
@@
public class Bundle<E extends Enum<E>> {
if (bundle != null) {
value = bundle.getString(id.name());
} else {
if (bundle != null) {
value = bundle.getString(id.name());
} else {
- value =
meta.def()
;
+ value =
null
;
}
this.map.put(id.name(), value == null ? null : value.trim());
}
this.map.put(id.name(), value == null ? null : value.trim());