From 9b10053e11d28324cd71af0eaf483898fed9cdf4 Mon Sep 17 00:00:00 2001 From: North Date: Fri, 7 Sep 2012 15:32:26 +0300 Subject: [PATCH] Removed MtgatheringRuImageSource --- .../dl/sources/MtgatheringRuImageSource.java | 83 ------------------- .../plugins/card/images/DownloadPictures.java | 12 +-- 2 files changed, 1 insertion(+), 94 deletions(-) delete mode 100644 Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MtgatheringRuImageSource.java diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MtgatheringRuImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MtgatheringRuImageSource.java deleted file mode 100644 index 07d9acf4766..00000000000 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MtgatheringRuImageSource.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package org.mage.plugins.card.dl.sources; - -import org.mage.plugins.card.utils.CardImageUtils; - -import java.util.HashMap; -import java.util.Map; - -/** - * - * @author North - */ -public class MtgatheringRuImageSource implements CardImageSource { - - private static CardImageSource hqInstance; - private static CardImageSource mqInstance; - private static CardImageSource lqInstance; - private static final Map setsAliases; - - static { - setsAliases = new HashMap(); - setsAliases.put("M11", "magic2011"); - } - private String quality; - - public static CardImageSource getHqInstance() { - if (hqInstance == null) { - hqInstance = new MtgatheringRuImageSource("hq"); - } - return hqInstance; - } - - public static CardImageSource getMqInstance() { - if (mqInstance == null) { - mqInstance = new MtgatheringRuImageSource("md"); - } - return mqInstance; - } - - public static CardImageSource getLqInstance() { - if (lqInstance == null) { - lqInstance = new MtgatheringRuImageSource("lq"); - } - return lqInstance; - } - - public MtgatheringRuImageSource(String quality) { - this.quality = quality; - } - - @Override - public String generateURL(Integer collectorId, String cardName, String cardSet, boolean twoFacedCard, boolean secondSide, boolean isFlipCard) throws Exception { - if (collectorId == null || cardSet == null) { - throw new Exception("Wrong parameters for image: collector id: " + collectorId + ",card set: " + cardSet); - } - if (setsAliases.get(cardSet) != null) { - String set = CardImageUtils.updateSet(cardSet, true); - String url = "http://mtgathering.ru/scans/en/"; - url += set.toLowerCase() + "/" + quality + "/" + collectorId + ".jpg"; - return url; - } - return null; - } - - @Override - public String generateTokenUrl(String name, String set) { - return null; - } - - @Override - public Float getAverageSize() { - if(quality.equalsIgnoreCase("hq")) - return 80.0f; - if(quality.equalsIgnoreCase("md")) - return 30.0f; - if(quality.equalsIgnoreCase("lq")) - return 9.0f; - return 0f; - } -} 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 e458c6c0cad..e5e05b311e7 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 @@ -7,7 +7,6 @@ import org.apache.log4j.Logger; import org.mage.plugins.card.constants.Constants; import org.mage.plugins.card.dl.sources.CardImageSource; import org.mage.plugins.card.dl.sources.MagicCardsImageSource; -import org.mage.plugins.card.dl.sources.MtgatheringRuImageSource; import org.mage.plugins.card.dl.sources.WizardCardsImageSource; import org.mage.plugins.card.properties.SettingsManager; import org.mage.plugins.card.utils.CardImageUtils; @@ -147,15 +146,6 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab case 1: cardImageSource = WizardCardsImageSource.getInstance(); break; - case 2: - cardImageSource = MtgatheringRuImageSource.getHqInstance(); - break; - case 3: - cardImageSource = MtgatheringRuImageSource.getMqInstance(); - break; - case 4: - cardImageSource = MtgatheringRuImageSource.getLqInstance(); - break; } int count = DownloadPictures.this.cards.size(); float mb = (count * cardImageSource.getAverageSize()) / 1024; @@ -574,4 +564,4 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab private static final Logger log = Logger.getLogger(DownloadPictures.class); private static final long serialVersionUID = 1L; -} \ No newline at end of file +}