From daa9d59a679f69b7b359298673f0b7d209573655 Mon Sep 17 00:00:00 2001 From: Jetz Date: Sat, 10 Aug 2024 12:17:54 -0400 Subject: [PATCH] Cleanup - addAll -> constructor parameter --- forge-game/src/main/java/forge/game/keyword/Keyword.java | 5 +---- .../src/main/java/forge/gui/framework/SResizingUtil.java | 5 ++--- .../forge/screens/home/gauntlet/ContestGauntletLister.java | 3 +-- .../forge/screens/home/gauntlet/QuickGauntletLister.java | 3 +-- .../main/java/forge/screens/home/quest/QuestFileLister.java | 3 +-- .../src/forge/screens/gauntlet/LoadGauntletScreen.java | 3 +-- .../src/forge/screens/planarconquest/LoadConquestScreen.java | 3 +-- .../src/forge/screens/quest/LoadQuestScreen.java | 3 +-- 8 files changed, 9 insertions(+), 19 deletions(-) diff --git a/forge-game/src/main/java/forge/game/keyword/Keyword.java b/forge-game/src/main/java/forge/game/keyword/Keyword.java index a31faf3d9e4..b88cf5bd336 100644 --- a/forge-game/src/main/java/forge/game/keyword/Keyword.java +++ b/forge-game/src/main/java/forge/game/keyword/Keyword.java @@ -272,10 +272,7 @@ public enum Keyword { public static List getAllKeywords() { Keyword[] values = values(); - List keywords = new ArrayList<>(); - for (int i = 1; i < values.length; i++) { //skip UNDEFINED - keywords.add(values[i]); - } + List keywords = new ArrayList<>(Arrays.asList(values).subList(1, values.length)); //skip UNDEFINED return keywords; } diff --git a/forge-gui-desktop/src/main/java/forge/gui/framework/SResizingUtil.java b/forge-gui-desktop/src/main/java/forge/gui/framework/SResizingUtil.java index efbabb1b2f7..0575fea6ac9 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/framework/SResizingUtil.java +++ b/forge-gui-desktop/src/main/java/forge/gui/framework/SResizingUtil.java @@ -147,9 +147,8 @@ public final class SResizingUtil { double roughVal = 0; int smoothVal = 0; - - Set existingComponents = new HashSet<>(); - existingComponents.addAll(Arrays.asList(pnlContent.getComponents())); + + Set existingComponents = new HashSet<>(Arrays.asList(pnlContent.getComponents())); // This is the core of the pixel-perfect layout. To avoid ±1 px errors on borders // from rounding individual panels, the intermediate values (exactly accurate, in %) diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/ContestGauntletLister.java b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/ContestGauntletLister.java index eb782d958bf..42bd1adc1be 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/ContestGauntletLister.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/ContestGauntletLister.java @@ -45,8 +45,7 @@ public class ContestGauntletLister extends JPanel { public void setGauntlets(final List gd0) { this.removeAll(); final List tempRows = new ArrayList<>(); - final List sorted = new ArrayList<>(); - sorted.addAll(gd0); + final List sorted = new ArrayList<>(gd0); Collections.sort(sorted, Comparator.comparing(GauntletData::getName)); // Title row diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/QuickGauntletLister.java b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/QuickGauntletLister.java index 2f731698044..0246f267a96 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/QuickGauntletLister.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/QuickGauntletLister.java @@ -64,8 +64,7 @@ public class QuickGauntletLister extends JPanel { public void refresh() { this.removeAll(); final List tempRows = new ArrayList<>(); - final List sorted = new ArrayList<>(); - sorted.addAll(gauntlets); + final List sorted = new ArrayList<>(gauntlets); Collections.sort(sorted, Comparator.comparing(x -> x.getName().toLowerCase())); // Title row diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/QuestFileLister.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/QuestFileLister.java index e21d5679d3a..dca6573278e 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/QuestFileLister.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/QuestFileLister.java @@ -76,8 +76,7 @@ public class QuestFileLister extends JPanel { public void setQuests(List qd0) { this.removeAll(); List tempRows = new ArrayList<>(); - List sorted = new ArrayList<>(); - sorted.addAll(qd0); + List sorted = new ArrayList<>(qd0); Collections.sort(sorted, Comparator.comparing(x -> x.getName().toLowerCase())); // Title row diff --git a/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java b/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java index 32d56d76024..bf5494835ee 100644 --- a/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java +++ b/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java @@ -273,8 +273,7 @@ public class LoadGauntletScreen extends LaunchScreen { } public void refresh() { - List sorted = new ArrayList<>(); - sorted.addAll(gauntlets); + List sorted = new ArrayList<>(gauntlets); Collections.sort(sorted, Comparator.comparing(x -> x.getName().toLowerCase())); setListData(sorted); } diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java index e7154be5e87..995d312db1a 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java @@ -301,8 +301,7 @@ public class LoadConquestScreen extends LaunchScreen { } public void setConquests(List qd0) { - List sorted = new ArrayList<>(); - sorted.addAll(qd0); + List sorted = new ArrayList<>(qd0); Collections.sort(sorted, Comparator.comparing(x -> x.getName().toLowerCase())); setListData(sorted); } diff --git a/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java b/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java index ebfd09939b5..c763a731236 100644 --- a/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java @@ -300,8 +300,7 @@ public class LoadQuestScreen extends LaunchScreen { } public void setQuests(List qd0) { - List sorted = new ArrayList<>(); - sorted.addAll(qd0); + List sorted = new ArrayList<>(qd0); Collections.sort(sorted, Comparator.comparing(x -> x.getName().toLowerCase())); setListData(sorted); }