Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

always use log4j

Browse source 
removed all references to mage.util.Logging, java.util.logging

transient static doesn't mean anything, since static fields are never
included in serialization
This commit is contained in:
Neil Gentleman 2015-11-22 22:34:02 -08:00
parent 28a087812a
commit bfb428b13a
45 changed files with 71 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mage.Client/src/main/java/mage/client/unusedFiles/CombatDialog.java
View file

@ -36,7 +36,6 @@
package mage.client.unusedFiles;
import mage.client.cards.BigCard;
import mage.client.unusedFiles.CombatGroup;
import mage.view.CombatGroupView;
import javax.swing.*;
@ -44,9 +43,8 @@ import java.awt.*;
import java.beans.PropertyVetoException;
import java.util.List;
import java.util.UUID;
import java.util.logging.Level;
import java.util.logging.Logger;
import mage.client.dialog.MageDialog;
import org.apache.log4j.Logger;
/**
*
@ -54,6 +52,8 @@ import mage.client.dialog.MageDialog;
*/
public class CombatDialog extends MageDialog {
private static final Logger logger = Logger.getLogger(CombatDialog.class);
private UUID gameId;
private BigCard bigCard;
private int lastX = 500;
@ -100,7 +100,7 @@ public class CombatDialog extends MageDialog {
try {
this.setSelected(true);
} catch (PropertyVetoException ex) {
Logger.getLogger(CombatDialog.class.getName()).log(Level.SEVERE, null, ex);
logger.error(null, ex);
}
pack();
this.revalidate();