diff --git a/src/main/java/kst4contest/view/Kst4ContestApplication.java b/src/main/java/kst4contest/view/Kst4ContestApplication.java index 385ed4b6..5f0f9d16 100644 --- a/src/main/java/kst4contest/view/Kst4ContestApplication.java +++ b/src/main/java/kst4contest/view/Kst4ContestApplication.java @@ -1187,10 +1187,6 @@ public class Kst4ContestApplication extends Application implements StatusUpdateL baseCallsign = member.getCallSign(); } - if (isSelectedBandOfferForMainView(member)) { - baseCallsign += " ★"; - } - callsgn.setValue(baseCallsign); // System.out.println(member.getCallSign() + " / " + member.getState()+ " <<<<<<<<<<<<<<<<<< state "); @@ -1609,7 +1605,7 @@ public class Kst4ContestApplication extends Application implements StatusUpdateL @Override public ObservableValue call(CellDataFeatures cellDataFeatures) { - return new SimpleStringProperty(formatWorkedAnyGridStatus(cellDataFeatures.getValue())); + return new SimpleStringProperty(formatWorkedAnyGridStatusForMainView(cellDataFeatures.getValue())); } }); wkdAny_subcol.prefWidthProperty().bind(tbl_chatMemberTable.widthProperty().divide(14)); @@ -9691,6 +9687,14 @@ public class Kst4ContestApplication extends Application implements StatusUpdateL return "xo"; } + private String formatWorkedAnyGridStatusForMainView(ChatMember member) { + String baseStatus = formatWorkedAnyGridStatus(member); + if (member != null && !member.isWorked() && isSelectedBandOfferForMainView(member)) { + return baseStatus + " ★"; + } + return baseStatus; + } + if (callWorked) { return "x"; }