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

Merge branch 'dev-1.3' into development

Browse source 
Conflicts:
	pom.xml
This commit is contained in:
anhefti 2022-04-12 08:22:39 +02:00
commit 0921b713f5
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/ch/ethz/seb/sebserver/gui/widget/MultiSelectionCheckbox.java
View file

@ -82,11 +82,15 @@ public final class MultiSelectionCheckbox extends Composite implements Selection
WidgetFactory.setARIALabel(button, tuple._2); WidgetFactory.setARIALabel(button, tuple._2);
this.checkboxes.put(tuple._1, button); this.checkboxes.put(tuple._1, button);
try {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
final Tuple3<String> tuple3 = tuple.adaptTo(Tuple3.class); final Tuple3<String> tuple3 = tuple.adaptTo(Tuple3.class);
if (tuple3 != null && StringUtils.isNotBlank(tuple3._3)) { if (tuple3 != null && StringUtils.isNotBlank(tuple3._3)) {
button.setToolTipText(tuple3._3); button.setToolTipText(tuple3._3);
} }
} catch (final Exception e) {
// ignore
}
} }
if (StringUtils.isNotBlank(selectionValue)) { if (StringUtils.isNotBlank(selectionValue)) {