From f324424b3e53f14689ec392e9534f34903492649 Mon Sep 17 00:00:00 2001 From: anhefti Date: Wed, 5 Aug 2020 16:58:16 +0200 Subject: [PATCH] fixed some prefix for tooltip --- .../seb/sebserver/gui/service/ResourceService.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/ResourceService.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/ResourceService.java index 2576bbaa..c68b38b7 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/ResourceService.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/ResourceService.java @@ -20,9 +20,6 @@ import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collectors; -import ch.ethz.seb.sebserver.gbl.model.sebconfig.SEBClientConfig; -import ch.ethz.seb.sebserver.gbl.util.Tuple3; -import ch.ethz.seb.sebserver.gbl.util.Utils; import org.apache.commons.lang3.StringUtils; import org.joda.time.DateTimeZone; import org.springframework.beans.factory.annotation.Value; @@ -47,6 +44,7 @@ import ch.ethz.seb.sebserver.gbl.model.sebconfig.AttributeType; import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationNode; import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationNode.ConfigurationStatus; import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationNode.ConfigurationType; +import ch.ethz.seb.sebserver.gbl.model.sebconfig.SEBClientConfig; import ch.ethz.seb.sebserver.gbl.model.sebconfig.TemplateAttribute; import ch.ethz.seb.sebserver.gbl.model.sebconfig.View; import ch.ethz.seb.sebserver.gbl.model.session.ClientConnection.ConnectionStatus; @@ -60,6 +58,8 @@ import ch.ethz.seb.sebserver.gbl.model.user.UserRole; import ch.ethz.seb.sebserver.gbl.profile.GuiProfile; import ch.ethz.seb.sebserver.gbl.util.Result; import ch.ethz.seb.sebserver.gbl.util.Tuple; +import ch.ethz.seb.sebserver.gbl.util.Tuple3; +import ch.ethz.seb.sebserver.gbl.util.Utils; import ch.ethz.seb.sebserver.gui.service.i18n.I18nSupport; import ch.ethz.seb.sebserver.gui.service.i18n.LocTextKey; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestService; @@ -364,7 +364,7 @@ public class ResourceService { type.name(), this.i18nSupport.getText(EXAM_TYPE_PREFIX + type.name()), Utils.formatLineBreaks(this.i18nSupport.getText( - EXAM_INDICATOR_TYPE_PREFIX + type.name() + Constants.TOOLTIP_TEXT_KEY_SUFFIX, + EXAM_TYPE_PREFIX + type.name() + Constants.TOOLTIP_TEXT_KEY_SUFFIX, StringUtils.EMPTY)))) .sorted(RESOURCE_COMPARATOR) .collect(Collectors.toList()); @@ -387,9 +387,9 @@ public class ResourceService { type.name(), this.i18nSupport.getText(EXAMCONFIG_STATUS_PREFIX + type.name()), Utils.formatLineBreaks(this.i18nSupport.getText( - this.i18nSupport.getText(EXAMCONFIG_STATUS_PREFIX + type.name()) + Constants.TOOLTIP_TEXT_KEY_SUFFIX, - StringUtils.EMPTY)) - )) + this.i18nSupport.getText(EXAMCONFIG_STATUS_PREFIX + type.name()) + + Constants.TOOLTIP_TEXT_KEY_SUFFIX, + StringUtils.EMPTY)))) .sorted(RESOURCE_COMPARATOR) .collect(Collectors.toList()); }