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

sorting cards on save

Browse Source 
removed import-related warning from OldGuiNewGame
This commit is contained in:
Maxmtg
2011-09-09 15:23:16 +00:00
parent f6734f6266
commit 52ef410927
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/forge/deck/DeckManager.java
View File

@@ -2,9 +2,11 @@ package forge.deck;
import forge.PlayerType; import forge.PlayerType;
import forge.card.CardPoolView;
import forge.card.CardPrinted; import forge.card.CardPrinted;
import forge.error.ErrorViewer; import forge.error.ErrorViewer;
import forge.game.GameType; import forge.game.GameType;
import forge.gui.deckeditor.TableSorter;
import forge.properties.ForgeProps; import forge.properties.ForgeProps;
import forge.properties.NewConstants; import forge.properties.NewConstants;
@@ -494,11 +496,17 @@ public class DeckManager {
if (d.getPlayerType() != null) { out.write(format("%s=%s%n", PLAYER, d.getPlayerType())); } if (d.getPlayerType() != null) { out.write(format("%s=%s%n", PLAYER, d.getPlayerType())); }
out.write(format("%s%n", "[main]")); out.write(format("%s%n", "[main]"));
for (Entry<CardPrinted, Integer> e : d.getMain()) { writeCardPool(d.getMain(), out);
out.write(format("%d %s|%s%n", e.getValue(), e.getKey().getName(), e.getKey().getSet()));
}
out.write(format("%s%n", "[sideboard]")); out.write(format("%s%n", "[sideboard]"));
for (Entry<CardPrinted, Integer> e : d.getSideboard()) { writeCardPool(d.getSideboard(), out);
}
private static void writeCardPool(final CardPoolView pool, final BufferedWriter out) throws IOException
{
List<Entry<CardPrinted, Integer>> main2sort = pool.getOrderedList();
Collections.sort(main2sort, TableSorter.byNameThenSet);
for (Entry<CardPrinted, Integer> e : main2sort) {
out.write(format("%d %s|%s%n", e.getValue(), e.getKey().getName(), e.getKey().getSet())); out.write(format("%d %s|%s%n", e.getValue(), e.getKey().getName(), e.getKey().getSet()));
} }
} }

1
src/main/java/forge/view/swing/OldGuiNewGame.java
View File

@@ -7,7 +7,6 @@ import forge.card.CardPool;
import forge.deck.Deck; import forge.deck.Deck;
import forge.deck.DeckGeneration; import forge.deck.DeckGeneration;
import forge.deck.DeckManager; import forge.deck.DeckManager;
import forge.deck.generate.*;
import forge.error.BugzReporter; import forge.error.BugzReporter;
import forge.error.ErrorViewer; import forge.error.ErrorViewer;
import forge.game.GameType; import forge.game.GameType;