external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Do not use the old AE ligature conversion in column names of the item manager.

Browse Source
This commit is contained in:
Agetian
2017-09-20 05:36:30 +00:00
parent e06ea82f62
commit 73786bfd94
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-gui/src/main/java/forge/itemmanager/ColumnDef.java
View File

@@ -19,9 +19,9 @@ package forge.itemmanager;
import com.google.common.base.Function; import com.google.common.base.Function;
import forge.card.*; import forge.card.*;
import forge.card.mana.ManaCost;
import forge.deck.DeckProxy; import forge.deck.DeckProxy;
import forge.deck.io.DeckPreferences; import forge.deck.io.DeckPreferences;
import forge.card.mana.ManaCost;
import forge.game.GameFormat; import forge.game.GameFormat;
import forge.item.IPaperCard; import forge.item.IPaperCard;
import forge.item.InventoryItem; import forge.item.InventoryItem;
@@ -33,7 +33,6 @@ import forge.model.FModel;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.regex.Pattern;
public enum ColumnDef { public enum ColumnDef {
STRING("", "", 0, false, SortState.ASC, STRING("", "", 0, false, SortState.ASC,
@@ -59,8 +58,7 @@ public enum ColumnDef {
new Function<Entry<? extends InventoryItem, Integer>, Object>() { new Function<Entry<? extends InventoryItem, Integer>, Object>() {
@Override @Override
public Object apply(final Entry<? extends InventoryItem, Integer> from) { public Object apply(final Entry<? extends InventoryItem, Integer> from) {
final String name = from.getKey().getName(); return from.getKey().getName();
return name.contains("AE") ? AE_FINDER.matcher(name).replaceAll("\u00C6") : name;
} }
}), }),
TYPE("Type", "Type", 100, false, SortState.ASC, TYPE("Type", "Type", 100, false, SortState.ASC,
@@ -404,8 +402,6 @@ public enum ColumnDef {
return this.longName; return this.longName;
} }
private static final Pattern AE_FINDER = Pattern.compile("AE", Pattern.LITERAL);
private static String toType(final InventoryItem i) { private static String toType(final InventoryItem i) {
return i instanceof IPaperCard ? ((IPaperCard)i).getRules().getType().toString() : i.getItemType(); return i instanceof IPaperCard ? ((IPaperCard)i).getRules().getType().toString() : i.getItemType();
} }