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

Some changes to prevent memory leaks from gamePane (not fiished yet).

Browse source
This commit is contained in:
LevelX2 2014-01-30 17:35:12 +01:00
parent f32b28abcc
commit da2dc4cd5a
5 changed files with 51 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Mage.Client/src/main/java/mage/client/game/GamePanel.java
View file

@ -73,16 +73,16 @@ public final class GamePanel extends javax.swing.JPanel {
private static final Logger logger = Logger.getLogger(GamePanel.class);
private static final String YOUR_HAND = "Your hand";
private static final int X_PHASE_WIDTH = 55;
private Map<UUID, PlayAreaPanel> players = new HashMap<UUID, PlayAreaPanel>();
private Map<UUID, ExileZoneDialog> exiles = new HashMap<UUID, ExileZoneDialog>();
private Map<String, ShowCardsDialog> revealed = new HashMap<String, ShowCardsDialog>();
private Map<String, ShowCardsDialog> lookedAt = new HashMap<String, ShowCardsDialog>();
private static final int X_PHASE_WIDTH = 55;
private final Map<UUID, PlayAreaPanel> players = new HashMap<UUID, PlayAreaPanel>();
private final Map<UUID, ExileZoneDialog> exiles = new HashMap<UUID, ExileZoneDialog>();
private final Map<String, ShowCardsDialog> revealed = new HashMap<String, ShowCardsDialog>();
private final Map<String, ShowCardsDialog> lookedAt = new HashMap<String, ShowCardsDialog>();
private UUID gameId;
private UUID playerId;
private Session session;
private ReplayTask replayTask;
private PickNumberDialog pickNumber;
private final PickNumberDialog pickNumber;
private JLayeredPane jLayeredPane;
private String chosenHandKey = "You";
private boolean smallMode = false;
@ -157,12 +157,17 @@ public final class GamePanel extends javax.swing.JPanel {
}
public void cleanUp() {
MageFrame.removeGame(gameId);
saveDividerLocations();
this.gameChatPanel.disconnect();
this.players.clear();
logger.debug("players clear.");
this.pnlBattlefield.removeAll();
pickNumber.hideDialog();
this.getUI().uninstallUI(this);
if (pickNumber != null) {
pickNumber.removeDialog();
}
for (ExileZoneDialog exile: exiles.values()) {
exile.hideDialog();
}
@ -174,7 +179,7 @@ public final class GamePanel extends javax.swing.JPanel {
popupContainer.setVisible(false);
} catch (InterruptedException ex) {
logger.fatal("popupContainer error:", ex);
}
}
}
private void saveDividerLocations() {
@ -315,6 +320,9 @@ public final class GamePanel extends javax.swing.JPanel {
}
}
/**
* Closes the game and it's resources
*/
public void hideGame() {
cleanUp();
Component c = this.getParent();