mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-19 12:18:00 +00:00
- Do not use the old AE ligature conversion in column names of the item manager.
This commit is contained in:
@@ -19,9 +19,9 @@ package forge.itemmanager;
|
||||
|
||||
import com.google.common.base.Function;
|
||||
import forge.card.*;
|
||||
import forge.card.mana.ManaCost;
|
||||
import forge.deck.DeckProxy;
|
||||
import forge.deck.io.DeckPreferences;
|
||||
import forge.card.mana.ManaCost;
|
||||
import forge.game.GameFormat;
|
||||
import forge.item.IPaperCard;
|
||||
import forge.item.InventoryItem;
|
||||
@@ -33,7 +33,6 @@ import forge.model.FModel;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
public enum ColumnDef {
|
||||
STRING("", "", 0, false, SortState.ASC,
|
||||
@@ -59,8 +58,7 @@ public enum ColumnDef {
|
||||
new Function<Entry<? extends InventoryItem, Integer>, Object>() {
|
||||
@Override
|
||||
public Object apply(final Entry<? extends InventoryItem, Integer> from) {
|
||||
final String name = from.getKey().getName();
|
||||
return name.contains("AE") ? AE_FINDER.matcher(name).replaceAll("\u00C6") : name;
|
||||
return from.getKey().getName();
|
||||
}
|
||||
}),
|
||||
TYPE("Type", "Type", 100, false, SortState.ASC,
|
||||
@@ -404,8 +402,6 @@ public enum ColumnDef {
|
||||
return this.longName;
|
||||
}
|
||||
|
||||
private static final Pattern AE_FINDER = Pattern.compile("AE", Pattern.LITERAL);
|
||||
|
||||
private static String toType(final InventoryItem i) {
|
||||
return i instanceof IPaperCard ? ((IPaperCard)i).getRules().getType().toString() : i.getItemType();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user