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

CardPreferences to work with latest setPreferredArt API in CardDb w/ backward compatibility

Browse Source
This commit is contained in:
leriomaggio
2021-09-10 14:10:21 +01:00
parent 27ab4c35a3
commit edfbbfb789
2 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-mobile/src/forge/deck/FDeckEditor.java
View File

@@ -1281,7 +1281,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
if (result != card) { if (result != card) {
cardManager.replaceAll(card, result); cardManager.replaceAll(card, result);
} }
prefs.setPreferredArt(result.getEdition() + CardDb.NameSetSeparator + result.getArtIndex()); prefs.setPreferredArt(result.getEdition(), result.getArtIndex());
CardPreferences.save(); CardPreferences.save();
} }
} }

29
forge-gui/src/main/java/forge/gui/card/CardPreferences.java
View File

@@ -8,6 +8,8 @@ import java.util.Map;
import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.DocumentBuilderFactory;
import forge.card.CardDb;
import forge.util.TextUtil;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.Element; import org.w3c.dom.Element;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
@@ -113,8 +115,31 @@ public class CardPreferences {
} }
if (preferredArt0.equals(preferredArt)) { return; } if (preferredArt0.equals(preferredArt)) { return; }
if (FModel.getMagicDb().getCommonCards().setPreferredArt(cardName, preferredArt0)) { try {
preferredArt = preferredArt0; String infoCardName;
String infoSetCode;
int infoArtIndex;
String[] prefArtInfos =TextUtil.split(preferredArt0, CardDb.NameSetSeparator);
if (prefArtInfos.length == 2){
// legacy format
infoCardName = this.cardName;
infoSetCode = prefArtInfos[0];
infoArtIndex = Integer.parseInt(prefArtInfos[1]);
} else {
infoCardName = prefArtInfos[0];
infoSetCode = prefArtInfos[1];
infoArtIndex = Integer.parseInt(prefArtInfos[2]);
}
if (!this.cardName.equals(infoCardName)) // extra sanity check
return;
if (FModel.getMagicDb().getCommonCards().setPreferredArt(cardName, infoSetCode, infoArtIndex))
preferredArt = preferredArt0;
} catch (NumberFormatException ex){
System.err.println("ERROR with Existing Preferred Card Entry: " + preferredArt0);
} }
} }
public void setPreferredArt(String setCode, int artIndex) {
this.setPreferredArt(setCode + CardDb.NameSetSeparator + artIndex);
}
} }