From 4f727df3b9ebe33465cca75ee996878ace979302 Mon Sep 17 00:00:00 2001 From: wsbrenk Date: Sun, 5 May 2024 18:14:19 +0200 Subject: [PATCH] #2063 add 5 new countries to international flags module (review) --- src/main/java/module/ifa/FlagPanel.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/main/java/module/ifa/FlagPanel.java b/src/main/java/module/ifa/FlagPanel.java index 1d4a5b78e..5428a3ba8 100644 --- a/src/main/java/module/ifa/FlagPanel.java +++ b/src/main/java/module/ifa/FlagPanel.java @@ -74,7 +74,7 @@ private void initialize(boolean away, IfaModel ifaModel, FlagDisplayModel flagDi constraints.gridwidth = 1; if (this.flagLabels != null) { - int i=0; + int i = 0; for (var flagLabel : this.flagLabels) { constraints.gridx = i % flagDisplayModel.getFlagWidth(); constraints.gridy = 2 + i / flagDisplayModel.getFlagWidth(); @@ -96,9 +96,9 @@ void setHeaderVisible(boolean enable) { private void createFlagLabels(boolean away, IfaModel ifaModel, FlagDisplayModel flagDisplayModel) { this.flagLabels = new ArrayList<>(); WorldDetailsManager.instance().getLeagues().stream() - .filter(l->l.getLeagueId()!=APACHE_LEAGUE_ID) - .sorted((l1,l2)-> ObjectUtils.compare(l1.getCountryName(),l2.getCountryName())) - .forEach(l->addFlagLabel(l, away, ifaModel, flagDisplayModel)); + .filter(l -> l.getLeagueId() != APACHE_LEAGUE_ID) + .sorted((l1, l2) -> ObjectUtils.compare(l1.getCountryName(), l2.getCountryName())) + .forEach(l -> addFlagLabel(l, away, ifaModel, flagDisplayModel)); } private void addFlagLabel(WorldDetailLeague league, boolean away, IfaModel ifaModel, FlagDisplayModel flagDisplayModel) { @@ -107,13 +107,7 @@ private void addFlagLabel(WorldDetailLeague league, boolean away, IfaModel ifaMo flagLabel.setCountryName(league.getCountryName()); flagLabel.setIcon(ImageUtilities.getCountryFlagIcon(flagLabel.getCountryId())); flagLabel.setToolTipText(flagLabel.getCountryName()); - - if ((away && ifaModel.isVisited(league.getCountryId())) - || (!away && ifaModel.isHosted(league.getCountryId()))) { - flagLabel.setEnabled(true); - } else { - flagLabel.setEnabled(false); - } + flagLabel.setEnabled((away && ifaModel.isVisited(league.getCountryId())) || (!away && ifaModel.isHosted(league.getCountryId()))); this.flagLabels.add(flagLabel); } }