Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Fix] Fixed broken tests

This commit is contained in:
Robert von Burg 2020-08-06 13:16:06 +02:00
parent 4b139931eb
commit 188ab020da
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
li.strolch.agent/src/main/java/li/strolch/runtime/query/enums/DefaultEnumHandler.java
View File

@ -48,14 +48,18 @@ public class DefaultEnumHandler extends StrolchComponent implements EnumHandler
DBC.PRE.assertNotNull("Locale must be given!", locale); //$NON-NLS-1$
try (StrolchTransaction tx = openTx(certificate, true)) {
return getEnum(tx, name);
return getEnum(tx, name, locale);
}
}
@Override
public StrolchEnum getEnum(StrolchTransaction tx, String name) {
return getEnum(tx, name, tx.getLocale());
}
private StrolchEnum getEnum(StrolchTransaction tx, String name, Locale locale) {
Resource enumeration = tx.getResourceBy(TYPE_ENUMERATION, name, true);
ParameterBag enumValuesByLanguage = findParameterBagByLanguage(enumeration, tx.getLocale());
ParameterBag enumValuesByLanguage = findParameterBagByLanguage(enumeration, locale);
List<Parameter<?>> parameters = enumValuesByLanguage.getParameters();
parameters.sort(Comparator.comparing(Parameter::getIndex));
@ -65,7 +69,7 @@ public class DefaultEnumHandler extends StrolchComponent implements EnumHandler
values.put(enumParam.getId(), enumParam.getValue());
}
return new StrolchEnum(name, tx.getLocale(), values);
return new StrolchEnum(name, locale, values);
}
private ParameterBag findParameterBagByLanguage(Resource enumeration, Locale locale) {