From 15d10f579744ed2dba752ef0624ad6d44ff52251 Mon Sep 17 00:00:00 2001 From: North Date: Thu, 21 Aug 2014 16:05:55 +0300 Subject: [PATCH] upgraded truezip to truevfs --- Mage.Client/pom.xml | 23 +++++++++++-------- .../src/main/java/mage/client/MageFrame.java | 10 ++++---- .../java/org/mage/card/arcane/CardPanel.java | 2 +- .../plugins/card/images/DownloadPictures.java | 10 ++++---- .../mage/plugins/card/images/ImageCache.java | 6 ++--- .../plugins/card/utils/CardImageUtils.java | 2 +- 6 files changed, 29 insertions(+), 24 deletions(-) diff --git a/Mage.Client/pom.xml b/Mage.Client/pom.xml index 10be76f2e85..f4bcba30855 100644 --- a/Mage.Client/pom.xml +++ b/Mage.Client/pom.xml @@ -97,15 +97,20 @@ 1.5.2 - de.schlichtherle.truezip - truezip-file - 7.7.5 - - - de.schlichtherle.truezip - truezip-driver-zip - 7.7.5 - + truevfs-profile-base + net.java.truevfs + jar + 0.10.6 + + + truevfs-access-swing + net.java.truevfs + + + truecommons-key-swing + net.java.truecommons + + com.googlecode.soundlibs diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java index 8e0de5ec233..7d98481920d 100644 --- a/Mage.Client/src/main/java/mage/client/MageFrame.java +++ b/Mage.Client/src/main/java/mage/client/MageFrame.java @@ -27,9 +27,6 @@ */ package mage.client; -import de.schlichtherle.truezip.file.TArchiveDetector; -import de.schlichtherle.truezip.file.TConfig; -import de.schlichtherle.truezip.fs.FsOutputOption; import mage.cards.decks.Deck; import mage.cards.repository.CardCriteria; import mage.cards.repository.CardInfo; @@ -95,6 +92,9 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.prefs.Preferences; +import net.java.truevfs.access.TArchiveDetector; +import net.java.truevfs.access.TConfig; +import net.java.truevfs.kernel.spec.FsAccessOption; /** * @author BetaSteward_at_googlemail.com @@ -183,9 +183,9 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { } }); - TConfig config = TConfig.get(); + TConfig config = TConfig.current(); config.setArchiveDetector(new TArchiveDetector("zip")); - config.getOutputPreferences().set(FsOutputOption.STORE); + config.setAccessPreference(FsAccessOption.STORE, true); try { UIManager.put("desktop", new Color(0, 0, 0, 0)); diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java index 38898428ae6..797ec240c28 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java @@ -1,6 +1,5 @@ package org.mage.card.arcane; -import de.schlichtherle.truezip.file.TFile; import mage.cards.MagePermanent; import mage.cards.TextPopup; import mage.cards.action.ActionCallback; @@ -32,6 +31,7 @@ import java.io.File; import java.util.ArrayList; import java.util.List; import java.util.UUID; +import net.java.truevfs.access.TFile; /** * Main class for drawing Mage card object. 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 75289041cb7..d1cd4f839ee 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 @@ -1,9 +1,5 @@ package org.mage.plugins.card.images; -import de.schlichtherle.truezip.file.TFile; -import de.schlichtherle.truezip.file.TFileOutputStream; -import de.schlichtherle.truezip.file.TVFS; -import de.schlichtherle.truezip.fs.FsSyncException; import mage.cards.repository.CardInfo; import mage.client.dialog.PreferencesDialog; import mage.client.util.sets.ConstructedFormats; @@ -12,6 +8,7 @@ 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.MtgImageSource; import org.mage.plugins.card.dl.sources.WizardCardsImageSource; import org.mage.plugins.card.properties.SettingsManager; import org.mage.plugins.card.utils.CardImageUtils; @@ -37,7 +34,10 @@ import java.net.URLConnection; import java.util.*; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import org.mage.plugins.card.dl.sources.MtgImageSource; +import net.java.truevfs.access.TFile; +import net.java.truevfs.access.TFileOutputStream; +import net.java.truevfs.access.TVFS; +import net.java.truevfs.kernel.spec.FsSyncException; public class DownloadPictures extends DefaultBoundedRangeModel implements Runnable { diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java b/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java index 8dbc5775dfe..988e2212c67 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java @@ -4,9 +4,6 @@ import com.google.common.base.Function; import com.google.common.collect.ComputationException; import com.google.common.collect.MapMaker; import com.mortennobel.imagescaling.ResampleOp; -import de.schlichtherle.truezip.file.TFile; -import de.schlichtherle.truezip.file.TFileInputStream; -import de.schlichtherle.truezip.file.TFileOutputStream; import java.awt.Graphics2D; import java.awt.Rectangle; import java.awt.image.BufferedImage; @@ -18,6 +15,9 @@ import java.util.regex.Pattern; import javax.imageio.ImageIO; import mage.client.dialog.PreferencesDialog; import mage.view.CardView; +import net.java.truevfs.access.TFile; +import net.java.truevfs.access.TFileInputStream; +import net.java.truevfs.access.TFileOutputStream; import org.apache.log4j.Logger; import org.mage.plugins.card.constants.Constants; import org.mage.plugins.card.dl.sources.DirectLinksForDownload; diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java b/Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java index e76fc6c4de3..3114d3192f7 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java @@ -1,9 +1,9 @@ package org.mage.plugins.card.utils; -import de.schlichtherle.truezip.file.TFile; import java.util.HashMap; import mage.client.constants.Constants; import mage.client.dialog.PreferencesDialog; +import net.java.truevfs.access.TFile; import org.mage.plugins.card.images.CardDownloadData; import org.mage.plugins.card.properties.SettingsManager;