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

Merge branch 'newBranch' into 'master'

Browse Source 
Fix path seperator, Fix newdeck editor

See merge request core-developers/forge!2301
This commit is contained in:
Michael Kamensky
2019-11-25 05:27:44 +00:00
parent 4e83e73dca 2bb84cf79f
commit 9fe50f6c66
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui/src/main/java/forge/download/GuiDownloadPicturesLQ.java
View File

@@ -65,7 +65,7 @@ public class GuiDownloadPicturesLQ extends GuiDownloadService {
final String destPath = ForgeConstants.CACHE_CARD_PICS_DIR + imageKey + ".jpg"; final String destPath = ForgeConstants.CACHE_CARD_PICS_DIR + imageKey + ".jpg";
final String setcode2 = StaticData.instance().getEditions().getCode2ByCode(c.getEdition()); final String setcode2 = StaticData.instance().getEditions().getCode2ByCode(c.getEdition());
String modifier = !imageKey.contains(".full") ? ".fullborder" : ""; String modifier = !imageKey.contains(".full") ? ".fullborder" : "";
final String fullborderPath = ForgeConstants.CACHE_CARD_PICS_DIR + setcode2 + "\\" + TextUtil.fastReplace(imageKey,".full",".fullborder") + modifier + ".jpg"; final String fullborderPath = ForgeConstants.CACHE_CARD_PICS_DIR + setcode2 + ForgeConstants.PATH_SEPARATOR + TextUtil.fastReplace(imageKey,".full",".fullborder") + modifier + ".jpg";
final File existingFB = new File (fullborderPath); final File existingFB = new File (fullborderPath);
final File existingFB2 = new File (TextUtil.fastReplace(fullborderPath, "1.fullborder", ".fullborder")); final File existingFB2 = new File (TextUtil.fastReplace(fullborderPath, "1.fullborder", ".fullborder"));

5
forge-gui/src/main/java/forge/itemmanager/ItemManagerModel.java
View File

@@ -124,8 +124,9 @@ public final class ItemManagerModel<T extends InventoryItem> {
public void refreshSort() { public void refreshSort() {
if (getOrderedList().isEmpty()) { return; } if (getOrderedList().isEmpty()) { return; }
//fix newdeck editor not loading on Android if a user deleted unwanted sets on edition folder
Collections.sort(getOrderedList(), new MyComparator()); try { Collections.sort(getOrderedList(), new MyComparator()); }
catch (IllegalArgumentException ex) {}
} }
//Manages sorting orders for multiple depths of sorting //Manages sorting orders for multiple depths of sorting