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

SEBSERV-347 fixed duplicate sorting

Browse source
This commit is contained in:
anhefti 2022-11-02 13:03:02 +01:00
parent 95e3a70d34
commit eecdcd33a4
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/ch/ethz/seb/sebserver/gui/service/session/ClientConnectionTable.java
View file

@ -454,6 +454,7 @@ public final class ClientConnectionTable implements FullPageMonitoringGUIUpdate
private ClientStaticData staticData = ClientStaticData.NULL_DATA; private ClientStaticData staticData = ClientStaticData.NULL_DATA;
private int thresholdsWeight; private int thresholdsWeight;
private int[] indicatorWeights = null; private int[] indicatorWeights = null;
private boolean marked = false;
UpdatableTableItem(final Long connectionId) { UpdatableTableItem(final Long connectionId) {
this.connectionId = connectionId; this.connectionId = connectionId;
@ -496,15 +497,18 @@ public final class ClientConnectionTable implements FullPageMonitoringGUIUpdate
} }
private void updateDuplicateColor(final TableItem tableItem) { private void updateDuplicateColor(final TableItem tableItem) {
//System.out.println("ClientConnectionTable.this.duplicates : " + ClientConnectionTable.this.duplicates);
if (ClientConnectionTable.this.duplicates.contains(this.connectionId) && if (ClientConnectionTable.this.duplicates.contains(this.connectionId) &&
tableItem.getBackground(0) != ClientConnectionTable.this.colorData.color3) { tableItem.getBackground(0) != ClientConnectionTable.this.colorData.color3) {
tableItem.setBackground(0, ClientConnectionTable.this.colorData.color3); tableItem.setBackground(0, ClientConnectionTable.this.colorData.color3);
tableItem.setForeground(0, ClientConnectionTable.this.lightFontColor); tableItem.setForeground(0, ClientConnectionTable.this.lightFontColor);
this.marked = true;
ClientConnectionTable.this.needsSort = true;
} else if (!ClientConnectionTable.this.duplicates.contains(this.connectionId) && } else if (!ClientConnectionTable.this.duplicates.contains(this.connectionId) &&
tableItem.getBackground(0) == ClientConnectionTable.this.colorData.color3) { tableItem.getBackground(0) == ClientConnectionTable.this.colorData.color3) {
tableItem.setBackground(0, null); tableItem.setBackground(0, null);
tableItem.setForeground(0, ClientConnectionTable.this.darkFontColor); tableItem.setForeground(0, ClientConnectionTable.this.darkFontColor);
ClientConnectionTable.this.needsSort = true;
this.marked = false;
} }
} }
@ -602,7 +606,7 @@ public final class ClientConnectionTable implements FullPageMonitoringGUIUpdate
} }
int notificationWeight() { int notificationWeight() {
return BooleanUtils.isTrue(this.monitoringData.pendingNotification) ? -1 : 0; return BooleanUtils.isTrue(this.monitoringData.pendingNotification) || this.marked ? -1 : 0;
} }
int statusWeight() { int statusWeight() {