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
ConfigItem upgrade
[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 5932cfff71db0793a074a0bddccf9b56a5b34e25..85abfe73da7ae5c3139c20acc98e103abf0a4e7b 100644
(file)
--- a/
src/be/nikiroo/utils/resources/Bundle.java
+++ b/
src/be/nikiroo/utils/resources/Bundle.java
@@
-182,7
+182,7
@@
public class Bundle<E extends Enum<E>> {
return def;
}
return def;
}
-
+
/**
* Set the value associated to the given id as a {@link Boolean}.
*
/**
* Set the value associated to the given id as a {@link Boolean}.
*
@@
-196,7
+196,6
@@
public class Bundle<E extends Enum<E>> {
setString(id.name(), BundleHelper.fromBoolean(value));
}
setString(id.name(), BundleHelper.fromBoolean(value));
}
-
/**
* Return the value associated to the given id as an {@link Integer}.
*
/**
* Return the value associated to the given id as an {@link Integer}.
*
@@
-240,7
+239,7
@@
public class Bundle<E extends Enum<E>> {
public void setInteger(E id, int value) {
setString(id.name(), BundleHelper.fromInteger(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}.
*
/**
* Return the value associated to the given id as a {@link Character}.
*
@@
-505,12
+504,11
@@
public class Bundle<E extends Enum<E>> {
String[] list = meta.list();
boolean nullable = meta.nullable();
String def = meta.def();
String[] list = meta.list();
boolean nullable = meta.nullable();
String def = meta.def();
- String info = meta.info();
boolean array = meta.array();
// Default, empty values -> NULL
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;
}
return null;
}
@@
-525,7
+523,7
@@
public class Bundle<E extends Enum<E>> {
} else {
builder.append(" (FORMAT: ").append(format)
.append(nullable ? "" : " (required)");
} else {
builder.append(" (FORMAT: ").append(format)
.append(nullable ? "" : " (required)");
- builder.append(") ")
.append(info)
;
+ builder.append(") ");
if (list.length > 0) {
builder.append("\n# ALLOWED VALUES:");
if (list.length > 0) {
builder.append("\n# ALLOWED VALUES:");