github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 03:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some minor changes.

Browse source
This commit is contained in:
LevelX2 2018-05-06 09:44:14 +02:00
parent 2b69f1a311
commit feb17320c5
2 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,6 @@ package org.mage.plugins.card.images;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.collect.ComputationException; import com.google.common.collect.ComputationException;
import com.google.common.collect.MapMaker; import com.google.common.collect.MapMaker;
import java.awt.*; import java.awt.*;
import java.awt.geom.RoundRectangle2D; import java.awt.geom.RoundRectangle2D;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
@ -13,6 +12,7 @@ import java.util.Map;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import mage.client.constants.Constants;
import mage.client.dialog.PreferencesDialog; import mage.client.dialog.PreferencesDialog;
import mage.client.util.TransformedImageCache; import mage.client.util.TransformedImageCache;
import mage.view.CardView; import mage.view.CardView;
@ -22,7 +22,6 @@ import net.java.truevfs.access.TFileOutputStream;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.mage.plugins.card.dl.sources.DirectLinksForDownload; import org.mage.plugins.card.dl.sources.DirectLinksForDownload;
import org.mage.plugins.card.utils.CardImageUtils; import org.mage.plugins.card.utils.CardImageUtils;
import mage.client.constants.Constants;
/** /**
* This class stores ALL card images in a cache with soft values. this means * This class stores ALL card images in a cache with soft values. this means
@ -54,6 +53,7 @@ public final class ImageCache {
private static final Pattern KEY_PATTERN = Pattern.compile("(.*)#(.*)#(.*)#(.*)#(.*)#(.*)"); private static final Pattern KEY_PATTERN = Pattern.compile("(.*)#(.*)#(.*)#(.*)#(.*)#(.*)");
static { static {
// softValues() = Specifies that each value (not key) stored in the map should be wrapped in a SoftReference (by default, strong references are used). Softly-referenced objects will be garbage-collected in a globally least-recently-used manner, in response to memory demand.
IMAGE_CACHE = new MapMaker().softValues().makeComputingMap(new Function<String, BufferedImage>() { IMAGE_CACHE = new MapMaker().softValues().makeComputingMap(new Function<String, BufferedImage>() {
@Override @Override
public BufferedImage apply(String key) { public BufferedImage apply(String key) {
@ -130,7 +130,7 @@ public final class ImageCache {
thumbnailImage = makeThumbnailByFile(key, file, thumbnailPath); thumbnailImage = makeThumbnailByFile(key, file, thumbnailPath);
} }
if (cardback){ if (cardback) {
// unknown tokens on opponent desk // unknown tokens on opponent desk
thumbnailImage = getRoundCorner(thumbnailImage); thumbnailImage = getRoundCorner(thumbnailImage);
} }
@ -140,12 +140,12 @@ public final class ImageCache {
return makeThumbnailByFile(key, file, thumbnailPath); return makeThumbnailByFile(key, file, thumbnailPath);
} }
} else { } else {
if (cardback){ if (cardback) {
// need cardback image // need cardback image
BufferedImage image = loadImage(file); BufferedImage image = loadImage(file);
image = getRoundCorner(image); image = getRoundCorner(image);
return image; return image;
}else { } else {
// need normal card image // need normal card image
BufferedImage image = loadImage(file); BufferedImage image = loadImage(file);
image = getWizardsCard(image); image = getWizardsCard(image);
@ -322,7 +322,7 @@ public final class ImageCache {
return thumbnailPath; return thumbnailPath;
} }
public static BufferedImage getRoundCorner(BufferedImage image){ public static BufferedImage getRoundCorner(BufferedImage image) {
if (image != null) { if (image != null) {
BufferedImage cornerImage = new BufferedImage(image.getWidth(), image.getHeight(), BufferedImage.TYPE_INT_ARGB); BufferedImage cornerImage = new BufferedImage(image.getWidth(), image.getHeight(), BufferedImage.TYPE_INT_ARGB);
@ -389,10 +389,9 @@ public final class ImageCache {
return getImage(getKey(card, card.getName(), "")); return getImage(getKey(card, card.getName(), ""));
} }
public static BufferedImage getImageFaceOriginal(CardView card) { // public static BufferedImage getImageFaceOriginal(CardView card) {
return getFaceImage(getFaceKey(card, card.getName(), card.getExpansionSetCode())); // return getFaceImage(getFaceKey(card, card.getName(), card.getExpansionSetCode()));
} // }
public static BufferedImage getImageOriginalAlternateName(CardView card) { public static BufferedImage getImageOriginalAlternateName(CardView card) {
return getImage(getKey(card, card.getAlternateName(), "")); return getImage(getKey(card, card.getAlternateName(), ""));
} }

3
Mage.Sets/src/mage/cards/c/CaligoSkinWitch.java
View file

@ -28,7 +28,6 @@
package mage.cards.c; package mage.cards.c;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.condition.common.KickedCondition; import mage.abilities.condition.common.KickedCondition;
@ -66,7 +65,7 @@ public class CaligoSkinWitch extends CardImpl {
TargetController.OPPONENT TargetController.OPPONENT
)), )),
KickedCondition.instance, KickedCondition.instance,
"When {this} enters the battlefield, if it was kicked, each opponent discards two cards" "When {this} enters the battlefield, if it was kicked, each opponent discards two cards."
)); ));
} }