github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-12 19:25:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

upgraded truezip to truevfs

Browse source
This commit is contained in:
North 2014-08-21 16:05:55 +03:00
parent af8c5880a1
commit 15d10f5797
6 changed files with 29 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Mage.Client/pom.xml
View file

@ -97,15 +97,20 @@
<version>1.5.2</version>
</dependency>
<dependency>
<groupId>de.schlichtherle.truezip</groupId>
<artifactId>truezip-file</artifactId>
<version>7.7.5</version>
</dependency>
<dependency>
<groupId>de.schlichtherle.truezip</groupId>
<artifactId>truezip-driver-zip</artifactId>
<version>7.7.5</version>
<!--<scope>runtime</scope>-->
<artifactId>truevfs-profile-base</artifactId>
<groupId>net.java.truevfs</groupId>
<type>jar</type>
<version>0.10.6</version>
<exclusions>
<exclusion>
<artifactId>truevfs-access-swing</artifactId>
<groupId>net.java.truevfs</groupId>
</exclusion>
<exclusion>
<artifactId>truecommons-key-swing</artifactId>
<groupId>net.java.truecommons</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.googlecode.soundlibs</groupId>

10
Mage.Client/src/main/java/mage/client/MageFrame.java
View file

@ -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));

2
Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java
View file

@ -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.

10
Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java
View file

@ -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 {

6
Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java
View file

@ -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;

2
Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java
View file

@ -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;