From beaf98793b834fde5a2ba38412beca3a7f1055ce Mon Sep 17 00:00:00 2001 From: leriomaggio Date: Fri, 13 Aug 2021 10:15:08 +0100 Subject: [PATCH] Renamed method to retrieve card art preference name and new method to return actual card art preference instance. --- forge-core/src/main/java/forge/StaticData.java | 7 ++++++- .../forge/screens/home/settings/CSubmenuPreferences.java | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/forge-core/src/main/java/forge/StaticData.java b/forge-core/src/main/java/forge/StaticData.java index 318424fa335..2131906c00d 100644 --- a/forge-core/src/main/java/forge/StaticData.java +++ b/forge-core/src/main/java/forge/StaticData.java @@ -571,10 +571,15 @@ public class StaticData { this.customCards.setCardArtPreference(latestArt, coreExpansionOnly); } - public String getCardArtPreference(){ + public String getCardArtPreferenceName(){ return this.commonCards.getCardArtPreference().toString(); } + public CardDb.CardArtPreference getCardArtPreference(){ + return this.commonCards.getCardArtPreference(); + } + + public boolean isCoreExpansionOnlyFilterSet(){ return this.commonCards.getCardArtPreference().filterSets; } public boolean cardArtPreferenceIsLatest(){ diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java index 9af72d8b1b3..cc1fb85c585 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java @@ -481,7 +481,7 @@ public enum CSubmenuPreferences implements ICDoc { boolean latestArt = artPreference.equalsIgnoreCase(latestOpt); boolean coreExpFilter = FModel.getMagicDb().isCoreExpansionOnlyFilterSet(); FModel.getMagicDb().setCardArtPreference(latestArt, coreExpFilter); - String preferenceOpt = FModel.getMagicDb().getCardArtPreference(); + String preferenceOpt = FModel.getMagicDb().getCardArtPreferenceName(); CSubmenuPreferences.this.prefs.setPref(uiPreferredArt, preferenceOpt); CSubmenuPreferences.this.prefs.save(); } @@ -498,7 +498,7 @@ public enum CSubmenuPreferences implements ICDoc { boolean latestArt = FModel.getMagicDb().cardArtPreferenceIsLatest(); boolean coreExpFilter = e.getStateChange() == ItemEvent.SELECTED; FModel.getMagicDb().setCardArtPreference(latestArt, coreExpFilter); - String preferenceOpt = FModel.getMagicDb().getCardArtPreference(); + String preferenceOpt = FModel.getMagicDb().getCardArtPreferenceName(); CSubmenuPreferences.this.prefs.setPref(uiPreferredArt, preferenceOpt); CSubmenuPreferences.this.prefs.save(); }