From 994eabe58a837dbfb3acc682f1f84f92cc37238e Mon Sep 17 00:00:00 2001 From: BursegSardaukar <> Date: Sun, 1 Nov 2015 16:41:13 -0500 Subject: [PATCH] Pulled from trunk. --- Mage.Client/src/main/java/mage/client/MageFrame.java | 2 +- Mage.Client/src/main/java/mage/client/cards/BigCard.java | 1 + .../mage/plugins/card/dl/sources/MagicCardsImageSource.java | 1 + .../mage/plugins/card/dl/sources/MythicspoilerComSource.java | 5 ++++- .../mage/plugins/card/dl/sources/WizardCardsImageSource.java | 1 + .../java/org/mage/plugins/card/images/DownloadPictures.java | 4 +--- Mage.Client/src/main/resources/image.url.properties | 4 ++-- 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java index a6aef412905..83e70321aa2 100644 --- a/Mage.Client/src/main/java/mage/client/MageFrame.java +++ b/Mage.Client/src/main/java/mage/client/MageFrame.java @@ -372,7 +372,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { private void setWindowTitle() { setTitle(TITLE_NAME + " Client: " - + version == null ? "" : version.toString() + " Server: " + + (version == null ? "" : version.toString()) + " Server: " + ((session != null && session.isConnected()) ? session.getVersionInfo() : "")); } diff --git a/Mage.Client/src/main/java/mage/client/cards/BigCard.java b/Mage.Client/src/main/java/mage/client/cards/BigCard.java index 6265dc288a9..75fa5508789 100644 --- a/Mage.Client/src/main/java/mage/client/cards/BigCard.java +++ b/Mage.Client/src/main/java/mage/client/cards/BigCard.java @@ -161,6 +161,7 @@ public class BigCard extends JComponent { } public void addJXPanel(UUID cardId, JXPanel jxPanel) { + this.cardId = cardId; bigImage = null; synchronized (this) { if (this.panel != null) { remove(this.panel); } diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java index 23c02863284..68877f48eb8 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java @@ -16,6 +16,7 @@ public class MagicCardsImageSource implements CardImageSource { private static final Map setNameTokenReplacement = new HashMap() { { + put("C15", "commander-2015"); put("ORG", "oath-of-the-gatewatch"); put("EXP", "zendikar-expeditions"); put("BFZ", "battle-for-zendikar"); diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MythicspoilerComSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MythicspoilerComSource.java index ef80a0785ae..78995593cd7 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MythicspoilerComSource.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MythicspoilerComSource.java @@ -100,7 +100,10 @@ public class MythicspoilerComSource implements CardImageSource { Map setLinks = new HashMap<>(); try { String setNames = setsAliases.get(cardSet.toLowerCase()); - Set aliasesStart = cardNameAliasesStart.get(cardSet); + Set aliasesStart = new HashSet<>(); + if (cardNameAliasesStart.containsKey(cardSet)) { + aliasesStart.addAll(cardNameAliasesStart.get(cardSet)); + } if (setNames == null) { setNames = cardSet.toLowerCase(); } diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java index 3e1ed8c95b3..9a1c93babe8 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java @@ -99,6 +99,7 @@ public class WizardCardsImageSource implements CardImageSource { setsAliases.put("BTD", "Beatdown Box Set"); setsAliases.put("C13", "Commander 2013 Edition"); setsAliases.put("C14", "Commander 2014"); + setsAliases.put("C15", "Commander 2015"); setsAliases.put("CHK", "Champions of Kamigawa"); setsAliases.put("CHR", "Chronicles"); setsAliases.put("CMD", "Magic: The Gathering-Commander"); diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java b/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java index 4467e0ab2af..2423f215207 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java @@ -49,8 +49,6 @@ import mage.client.constants.Constants; import mage.client.dialog.PreferencesDialog; import mage.client.util.sets.ConstructedFormats; import mage.remote.Connection; -import static mage.remote.Connection.ProxyType.HTTP; -import static mage.remote.Connection.ProxyType.SOCKS; import net.java.truevfs.access.TFile; import net.java.truevfs.access.TFileOutputStream; import net.java.truevfs.access.TVFS; @@ -221,7 +219,7 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab // JOptionPane Object[] options = { startDownloadButton, closeButton = new JButton("Cancel") }; - dlg = new JOptionPane(p0, JOptionPane.DEFAULT_OPTION, JOptionPane.PLAIN_MESSAGE, null, options, options[1]); + dlg = new JOptionPane(p0, JOptionPane.PLAIN_MESSAGE, JOptionPane.DEFAULT_OPTION, null, options, options[1]); } public static boolean checkForNewCards(List allCards) { diff --git a/Mage.Client/src/main/resources/image.url.properties b/Mage.Client/src/main/resources/image.url.properties index fc6e7f06ec3..3617a698f38 100644 --- a/Mage.Client/src/main/resources/image.url.properties +++ b/Mage.Client/src/main/resources/image.url.properties @@ -64,6 +64,6 @@ ddd=gvl unh=uh dde=pvc # Remove setname as soon as the images can be downloaded -ignore.urls=TOK, OGW +ignore.urls=TOK, OGW, C15 # sets ordered by release time (newest goes first) -token.lookup.order=OGW,EXP,DDP,BFZ,FVD,FVE,FVL,FVR,V12,V13,V14,V15,TPR,MPRP,DD3,DDO,ORI,MM2,PTC,DTK,FRF,KTK,M15,VMA,CNS,JOU,BNG,THS,DDL,M14,MMA,DGM,GTC,RTR,M13,AVR,DDI,DKA,ISD,M12,NPH,MBS,SOM,M11,ROE,DDE,WWK,ZEN,M10,GVL,ARB,DVD,CFX,JVC,ALA,EVE,SHM,EVG,MOR,LRW,10E,CLS,CHK,GRC \ No newline at end of file +token.lookup.order=C15,OGW,EXP,DDP,BFZ,FVD,FVE,FVL,FVR,V12,V13,V14,V15,TPR,MPRP,DD3,DDO,ORI,MM2,PTC,DTK,FRF,KTK,M15,VMA,CNS,JOU,BNG,THS,DDL,M14,MMA,DGM,GTC,RTR,M13,AVR,DDI,DKA,ISD,M12,NPH,MBS,SOM,M11,ROE,DDE,WWK,ZEN,M10,GVL,ARB,DVD,CFX,JVC,ALA,EVE,SHM,EVG,MOR,LRW,10E,CLS,CHK,GRC \ No newline at end of file