Decks importer:

+ added support for new decklist text format from deckstats.net (see #4228);
  + added new checks to text format (too many empty lines, too big card number: more then 100);
  + fixed double window popup on cancel/close import from clipboard window;
This commit is contained in:
Oleg Agafonov 2017-12-07 22:46:31 +04:00
parent 5b7ab0de7a
commit 1efc062f66
2 changed files with 45 additions and 12 deletions

View file

@ -691,8 +691,10 @@ public class DeckEditorPanel extends javax.swing.JPanel {
break;
case 1:
btnImportFromClipboardActionPerformed(evt);
break;
case 2:
btnImportFromClipboardActionWAppendPerformed(evt);
break;
}
});
@ -814,9 +816,13 @@ public class DeckEditorPanel extends javax.swing.JPanel {
dialog.addWindowListener(new WindowAdapter() {
@Override
public void windowClosed(WindowEvent e) {
Deck newDeck = null;
try {
deck = Deck.load(DeckImporterUtil.importDeck(dialog.getTmpPath()), true, true);
refreshDeck();
newDeck = Deck.load(DeckImporterUtil.importDeck(dialog.getTmpPath()), true, true);
if (newDeck != null) {
deck = newDeck;
refreshDeck();
}
} catch (GameException e1) {
JOptionPane.showMessageDialog(MageFrame.getDesktop(), e1.getMessage(), "Error loading deck", JOptionPane.ERROR_MESSAGE);
}