Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Merge branch 'master' into migrate-google-collections-to-guava

Browse source
This commit is contained in:
John Hitchings 2019-02-22 22:43:23 -08:00
commit f76efb2b65
483 changed files with 2270 additions and 1997 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage.Client/src/main/java/mage/client/util/GUISizeHelper.java
View file

@ -23,9 +23,9 @@ import org.mage.card.arcane.CardRenderer;
public final class GUISizeHelper {
// relate the native image card size to a value of the size scale
final static int CARD_IMAGE_WIDTH = 312;
final static int CARD_IMAGE_HEIGHT = 445;
final static int CARD_IMAG_VALUE = 42;
static final int CARD_IMAGE_WIDTH = 312;
static final int CARD_IMAGE_HEIGHT = 445;
static final int CARD_IMAG_VALUE = 42;
public static String basicSymbolSize = "small";

2
Mage.Client/src/main/java/mage/client/util/TransformedImageCache.java
View file

@ -22,7 +22,7 @@ import com.mortennobel.imagescaling.ResampleOp;
*/
public final class TransformedImageCache {
private final static class Key {
private static final class Key {
final int width;
final int height;

6
Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java
View file

@ -16,7 +16,7 @@ import java.util.*;
*/
public final class ConstructedFormats {
public static final String ALL = "- All Sets";
public static final String ALL_SETS = "- All Sets";
public static final String STANDARD = "- Standard";
public static final String EXTENDED = "- Extended";
public static final String FRONTIER = "- Frontier";
@ -65,7 +65,7 @@ public final class ConstructedFormats {
}
public static List<String> getSetsByFormat(final String format) {
if (!format.equals(ALL)) {
if (!format.equals(ALL_SETS)) {
return underlyingSetCodesPerFormat.get(format);
}
return all;
@ -244,7 +244,7 @@ public final class ConstructedFormats {
formats.add(0, EXTENDED);
formats.add(0, STANDARD);
}
formats.add(0, ALL);
formats.add(0, ALL_SETS);
}
private static String getBlockDisplayName(String blockName) {