zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed errors

Browse source
This commit is contained in:
anhefti 2021-12-01 14:54:11 +01:00
parent 70c4fe1571
commit 6a989f50b2
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/main/java/ch/ethz/seb/sebserver/gui/widget/WidgetFactory.java
View file

@ -399,7 +399,11 @@ public class WidgetFactory {
final Button button = new Button(parent, type);
setARIARole(button, AriaRole.button);
setTestId(button, locTextKey.name);
if (locTextKey != null) {
setTestId(button, locTextKey.name);
} else if (toolTipKey != null) {
setTestId(button, toolTipKey.name);
}
this.polyglotPageService.injectI18n(button, locTextKey, toolTipKey);
return button;
}
@ -781,7 +785,13 @@ public class WidgetFactory {
final Supplier<List<Tuple<String>>> itemsSupplier,
final LocTextKey toolTipTextKey) {
return this.selectionLocalized(type, parent, itemsSupplier, toolTipTextKey, null, toolTipTextKey.name);
return this.selectionLocalized(
type,
parent,
itemsSupplier,
toolTipTextKey,
null,
(toolTipTextKey != null) ? toolTipTextKey.name : null);
}
public Selection selectionLocalized(
@ -791,8 +801,13 @@ public class WidgetFactory {
final LocTextKey toolTipTextKey,
final Supplier<List<Tuple<String>>> itemsToolTipSupplier) {
return selectionLocalized(type, parent, itemsSupplier, toolTipTextKey, itemsToolTipSupplier,
toolTipTextKey.name);
return selectionLocalized(
type,
parent,
itemsSupplier,
toolTipTextKey,
itemsToolTipSupplier,
(toolTipTextKey != null) ? toolTipTextKey.name : null);
}
public Selection selectionLocalized(