External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-23 03:51:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Fixed a bug of colorless mana (e.g. caused Heartbeat of Spring not working with Urza's lands).

Browse source
This commit is contained in:
LevelX2 2016-02-16 17:15:47 +01:00
parent bf934137e8
commit f54c675c4b
15 changed files with 203 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
View file

@ -81,7 +81,7 @@ import org.apache.log4j.Logger;
*/
public class DeckEditorPanel extends javax.swing.JPanel {
private static final Logger LOGGER = Logger.getLogger(DeckEditorPanel.class);
private static final Logger logger = Logger.getLogger(DeckEditorPanel.class);
private final JFileChooser fcSelectDeck;
private final JFileChooser fcImportDeck;
private Deck deck = new Deck();
@ -690,7 +690,7 @@ public class DeckEditorPanel extends javax.swing.JPanel {
} catch (GameException ex) {
JOptionPane.showMessageDialog(MageFrame.getDesktop(), ex.getMessage(), "Error loading deck", JOptionPane.ERROR_MESSAGE);
} catch (Exception ex) {
LOGGER.fatal(ex);
logger.fatal(ex);
} finally {
setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
}
@ -722,7 +722,7 @@ public class DeckEditorPanel extends javax.swing.JPanel {
setCursor(new Cursor(Cursor.WAIT_CURSOR));
Sets.saveDeck(fileName, deck.getDeckCardLists());
} catch (Exception ex) {
LOGGER.fatal(ex);
logger.fatal(ex);
} finally {
setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
}
@ -771,7 +771,7 @@ public class DeckEditorPanel extends javax.swing.JPanel {
JOptionPane.showMessageDialog(MageFrame.getDesktop(), "Unknown deck format", "Error importing deck", JOptionPane.ERROR_MESSAGE);
}
} catch (Exception ex) {
LOGGER.fatal(ex);
logger.fatal(ex);
} finally {
setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
}
@ -877,7 +877,7 @@ class ImportFilter extends FileFilter {
class UpdateDeckTask extends SwingWorker<Void, Void> {
private static final Logger LOGGER = Logger.getLogger(UpdateDeckTask.class);
private static final Logger logger = Logger.getLogger(UpdateDeckTask.class);
private final Session session;
private final UUID tableId;
private final Deck deck;
@ -902,7 +902,7 @@ class UpdateDeckTask extends SwingWorker<Void, Void> {
try {
get();
} catch (InterruptedException | ExecutionException ex) {
LOGGER.fatal("Update Matches Task error", ex);
logger.fatal("Update Matches Task error", ex);
} catch (CancellationException ex) {
}
}

4
Mage.Client/src/main/java/mage/client/util/stats/UpdateMemUsageTask.java
View file

@ -18,7 +18,7 @@ public class UpdateMemUsageTask extends SwingWorker<Void, Float> {
private final JLabel jLabelToDisplayInfo;
private static final Logger LOGGER = Logger.getLogger(UpdateMemUsageTask.class);
private static final Logger logger = Logger.getLogger(UpdateMemUsageTask.class);
public UpdateMemUsageTask(JLabel jLabelToDisplayInfo) {
this.jLabelToDisplayInfo = jLabelToDisplayInfo;
@ -51,7 +51,7 @@ public class UpdateMemUsageTask extends SwingWorker<Void, Float> {
try {
get();
} catch (InterruptedException | ExecutionException ex) {
LOGGER.fatal("Update Memory Usage error", ex);
logger.fatal("Update Memory Usage error", ex);
} catch (CancellationException ex) {
}
}