git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 3.1.4: error handling for traces in Server
[fanfix.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 bad7f3e6c46679c31622b8e34bb8b6b0c0bb955a..40177da6cbfc23050e4e266d65253fde52060f27 100644
(file)
--- a/
src/be/nikiroo/utils/resources/Bundle.java
+++ b/
src/be/nikiroo/utils/resources/Bundle.java
@@
-384,7
+384,7
@@
public class Bundle<E extends Enum<E>> {
for (Field field : type.getDeclaredFields()) {
Meta meta = field.getAnnotation(Meta.class);
if (meta != null) {
for (Field field : type.getDeclaredFields()) {
Meta meta = field.getAnnotation(Meta.class);
if (meta != null) {
- E id = E.valueOf(type, field.getName());
+ E id = E
num
.valueOf(type, field.getName());
String info = getMetaInfo(meta);
if (info != null) {
String info = getMetaInfo(meta);
if (info != null) {
@@
-657,7
+657,7
@@
public class Bundle<E extends Enum<E>> {
* @param bundle
* the bundle to copy
*/
* @param bundle
* the bundle to copy
*/
- pr
ivate
void resetMap(ResourceBundle bundle) {
+ pr
otected
void resetMap(ResourceBundle bundle) {
this.map.clear();
if (bundle != null) {
this.map.clear();
if (bundle != null) {
@@
-739,9
+739,9
@@
public class Bundle<E extends Enum<E>> {
file = new File(dir, name + loc + ".properties");
if (file.exists()) {
break;
file = new File(dir, name + loc + ".properties");
if (file.exists()) {
break;
- } else {
- file = null;
}
}
+
+ file = null;
}
return file;
}
return file;