external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed method to retrieve card art preference name and new method to return actual card art preference instance.

Browse Source
This commit is contained in:
leriomaggio
2021-08-13 10:15:08 +01:00
parent bd2971d6e9
commit beaf98793b
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-core/src/main/java/forge/StaticData.java
View File

@@ -571,10 +571,15 @@ public class StaticData {
this.customCards.setCardArtPreference(latestArt, coreExpansionOnly); this.customCards.setCardArtPreference(latestArt, coreExpansionOnly);
} }
public String getCardArtPreference(){ public String getCardArtPreferenceName(){
return this.commonCards.getCardArtPreference().toString(); return this.commonCards.getCardArtPreference().toString();
} }
public CardDb.CardArtPreference getCardArtPreference(){
return this.commonCards.getCardArtPreference();
}
public boolean isCoreExpansionOnlyFilterSet(){ return this.commonCards.getCardArtPreference().filterSets; } public boolean isCoreExpansionOnlyFilterSet(){ return this.commonCards.getCardArtPreference().filterSets; }
public boolean cardArtPreferenceIsLatest(){ public boolean cardArtPreferenceIsLatest(){

4
forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java
View File

@@ -481,7 +481,7 @@ public enum CSubmenuPreferences implements ICDoc {
boolean latestArt = artPreference.equalsIgnoreCase(latestOpt); boolean latestArt = artPreference.equalsIgnoreCase(latestOpt);
boolean coreExpFilter = FModel.getMagicDb().isCoreExpansionOnlyFilterSet(); boolean coreExpFilter = FModel.getMagicDb().isCoreExpansionOnlyFilterSet();
FModel.getMagicDb().setCardArtPreference(latestArt, coreExpFilter); FModel.getMagicDb().setCardArtPreference(latestArt, coreExpFilter);
String preferenceOpt = FModel.getMagicDb().getCardArtPreference(); String preferenceOpt = FModel.getMagicDb().getCardArtPreferenceName();
CSubmenuPreferences.this.prefs.setPref(uiPreferredArt, preferenceOpt); CSubmenuPreferences.this.prefs.setPref(uiPreferredArt, preferenceOpt);
CSubmenuPreferences.this.prefs.save(); CSubmenuPreferences.this.prefs.save();
} }
@@ -498,7 +498,7 @@ public enum CSubmenuPreferences implements ICDoc {
boolean latestArt = FModel.getMagicDb().cardArtPreferenceIsLatest(); boolean latestArt = FModel.getMagicDb().cardArtPreferenceIsLatest();
boolean coreExpFilter = e.getStateChange() == ItemEvent.SELECTED; boolean coreExpFilter = e.getStateChange() == ItemEvent.SELECTED;
FModel.getMagicDb().setCardArtPreference(latestArt, coreExpFilter); FModel.getMagicDb().setCardArtPreference(latestArt, coreExpFilter);
String preferenceOpt = FModel.getMagicDb().getCardArtPreference(); String preferenceOpt = FModel.getMagicDb().getCardArtPreferenceName();
CSubmenuPreferences.this.prefs.setPref(uiPreferredArt, preferenceOpt); CSubmenuPreferences.this.prefs.setPref(uiPreferredArt, preferenceOpt);
CSubmenuPreferences.this.prefs.save(); CSubmenuPreferences.this.prefs.save();
} }