From ff6e38d97f31739a39779b164c8f47a3b95bc72f Mon Sep 17 00:00:00 2001 From: anhefti Date: Tue, 17 Nov 2020 12:28:21 +0100 Subject: [PATCH 1/2] SEBSERV-146 fixed --- .../gui/service/session/ClientConnectionTable.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/session/ClientConnectionTable.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/session/ClientConnectionTable.java index e7b0dbdc..70b53006 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/session/ClientConnectionTable.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/session/ClientConnectionTable.java @@ -296,12 +296,12 @@ public final class ClientConnectionTable { } public void updateValues() { - if (this.statusFilterChanged) { + if (this.statusFilterChanged || this.forceUpdateAll) { this.toDelete.clear(); this.toDelete.addAll(this.tableMapping.keySet()); } this.restCallBuilder - .withHeader(API.EXAM_MONITORING_STATE_FILTER, (this.forceUpdateAll) ? "" : this.statusFilterParam) + .withHeader(API.EXAM_MONITORING_STATE_FILTER, this.statusFilterParam) .call() .get(error -> { log.error("Error poll connection data: ", error); @@ -312,7 +312,7 @@ public final class ClientConnectionTable { data.getConnectionId(), UpdatableTableItem::new); tableItem.push(data); - if (this.statusFilterChanged) { + if (this.statusFilterChanged || this.forceUpdateAll) { this.toDelete.remove(data.getConnectionId()); } }); From 1b9b201da92b8ff1ca376bdccefab2ec4bbad8bf Mon Sep 17 00:00:00 2001 From: anhefti Date: Tue, 17 Nov 2020 12:29:56 +0100 Subject: [PATCH 2/2] minor message fix --- .../sebserver/gui/service/page/impl/ComposerServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/ComposerServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/ComposerServiceImpl.java index 9b4b1edc..ae8e83b8 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/ComposerServiceImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/ComposerServiceImpl.java @@ -22,6 +22,7 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import ch.ethz.seb.sebserver.gbl.profile.GuiProfile; +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.page.ComposerService; @@ -131,7 +132,7 @@ public class ComposerServiceImpl implements ComposerService { final MessageBox logoutSuccess = new Message( pageContext.getShell(), this.i18nSupport.getText("sebserver.logout"), - this.i18nSupport.getText("sebserver.logout.invalid-session.message"), + Utils.formatLineBreaks(this.i18nSupport.getText("sebserver.logout.invalid-session.message")), SWT.ICON_INFORMATION, this.i18nSupport); logoutSuccess.open(null);