More efficient use of background image. Now Mage takes much less memory. Also updated plugins in Mage.Tests.

This commit is contained in:
magenoxx 2011-04-01 17:35:38 +04:00
parent b1fdc03c4e
commit fb8cd79b59
5 changed files with 45 additions and 34 deletions

View file

@ -1,6 +1,6 @@
package org.mage.plugins.theme;
import java.awt.Color;
import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.FileNotFoundException;
import java.io.InputStream;
@ -23,6 +23,7 @@ import org.apache.log4j.Logger;
public class ThemePluginImpl implements ThemePlugin {
private final static Logger log = Logger.getLogger(ThemePluginImpl.class);
private static BufferedImage background;
@Init
public void init() {
@ -73,33 +74,43 @@ public class ThemePluginImpl implements ThemePlugin {
}
}
public JComponent updateTable(Map<String, JComponent> ui) {
String filename = "/background.png";
try {
InputStream is = this.getClass().getResourceAsStream(filename);
ImagePanel bgPanel = createImagePanelInstance();
if (is == null)
throw new FileNotFoundException("Couldn't find " + filename + " in resources.");
BufferedImage background = ImageIO.read(is);
if (background == null)
throw new FileNotFoundException("Couldn't find " + filename + " in resources.");
ImagePanel bgPanel = new ImagePanel(background, ImagePanel.SCALED);
unsetOpaque(ui.get("jScrollPane1"));
unsetOpaque(ui.get("jPanel1"));
unsetOpaque(ui.get("tablesPanel"));
JComponent viewport = ui.get("jScrollPane1ViewPort");
if (viewport != null) {
viewport.setBackground(new Color(255,255,255,50));
}
return bgPanel;
} catch (Exception e) {
log.error(e.getMessage(), e);
return null;
unsetOpaque(ui.get("jScrollPane1"));
unsetOpaque(ui.get("jPanel1"));
unsetOpaque(ui.get("tablesPanel"));
JComponent viewport = ui.get("jScrollPane1ViewPort");
if (viewport != null) {
viewport.setBackground(new Color(255,255,255,50));
}
return bgPanel;
}
private ImagePanel createImagePanelInstance() {
if (background == null) {
synchronized (ThemePluginImpl.class) {
if (background == null) {
String filename = "/background.png";
try {
InputStream is = this.getClass().getResourceAsStream(filename);
if (is == null)
throw new FileNotFoundException("Couldn't find " + filename + " in resources.");
background = ImageIO.read(is);
if (background == null)
throw new FileNotFoundException("Couldn't find " + filename + " in resources.");
} catch (Exception e) {
log.error(e.getMessage(), e);
return null;
}
}
}
}
return new ImagePanel(background, ImagePanel.SCALED);
}
private void unsetOpaque(JComponent c) {

View file

@ -1,11 +1,14 @@
package org.mage.test.serverside;
import mage.Constants;
import mage.Constants.ColoredManaSymbol;
import mage.cards.Card;
import mage.cards.decks.Deck;
import mage.game.Game;
import mage.game.GameException;
import mage.game.GameOptions;
import mage.game.TwoPlayerDuel;
import mage.player.ai.ComputerPlayer;
import mage.players.Player;
import mage.sets.Sets;
import org.junit.Test;
@ -16,16 +19,13 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Random;
import mage.Constants.ColoredManaSymbol;
import mage.cards.Card;
import mage.player.ai.ComputerPlayer;
/**
* @author ayratn
*/
public class PlayGameTest extends MageTestBase {
private static List<String> colorChoices = Arrays.asList("bu","bg","br","bw","ug","ur","uw","gr","gw","rw","bur","buw","bug","brg","brw","bgw","wur","wug","wrg","rgu");
private static List<String> colorChoices = Arrays.asList("bu", "bg", "br", "bw", "ug", "ur", "uw", "gr", "gw", "rw", "bur", "buw", "bug", "brg", "brw", "bgw", "wur", "wug", "wrg", "rgu");
@Test
public void playOneGame() throws GameException, FileNotFoundException, IllegalArgumentException {
@ -76,12 +76,12 @@ public class PlayGameTest extends MageTestBase {
private Deck generateRandomDeck() {
String selectedColors = colorChoices.get(new Random().nextInt(colorChoices.size())).toUpperCase();
List<ColoredManaSymbol> allowedColors = new ArrayList<ColoredManaSymbol>();
List<ColoredManaSymbol> allowedColors = new ArrayList<ColoredManaSymbol>();
logger.info("Building deck with colors: " + selectedColors);
for (int i = 0; i < selectedColors.length(); i++) {
char c = selectedColors.charAt(i);
allowedColors.add(ColoredManaSymbol.lookup(c));
}
for (int i = 0; i < selectedColors.length(); i++) {
char c = selectedColors.charAt(i);
allowedColors.add(ColoredManaSymbol.lookup(c));
}
List<Card> cardPool = Sets.generateRandomCardPool(45, allowedColors);
return ComputerPlayer.buildDeck(cardPool, allowedColors);
}