Inner classes should be static. It reduces memory usage and gives perfomance boost + DeckImporter rollback

This commit is contained in:
vraskulin 2017-02-28 12:40:12 +03:00
parent 04973ea5aa
commit 0a3c95dde5
135 changed files with 582 additions and 642 deletions

View file

@ -27,7 +27,6 @@
*/
package mage.abilities.common;
import java.util.UUID;
import mage.abilities.ActivatedAbilityImpl;
import mage.abilities.condition.Condition;
import mage.abilities.costs.Cost;
@ -37,13 +36,15 @@ import mage.constants.Zone;
import mage.game.Game;
import mage.util.CardUtil;
import java.util.UUID;
/**
*
* @author BetaSteward_at_googlemail.com
*/
public class LimitedTimesPerTurnActivatedAbility extends ActivatedAbilityImpl {
class ActivationInfo {
static class ActivationInfo {
public int turnNum;
public int activationCounter;

View file

@ -28,7 +28,6 @@
package mage.abilities.mana;
import java.util.UUID;
import mage.Mana;
import mage.abilities.costs.Cost;
import mage.abilities.effects.common.AddManaOfAnyColorEffect;
@ -37,13 +36,15 @@ import mage.constants.Zone;
import mage.game.Game;
import mage.util.CardUtil;
import java.util.UUID;
/**
*
* @author LevelX2
*/
public class ActivateOncePerTurnManaAbility extends ActivatedManaAbilityImpl {
class ActivationInfo {
static class ActivationInfo {
public int turnNum;
public int activationCounter;

View file

@ -28,11 +28,12 @@
package mage.cards.decks.importer;
import java.io.File;
import java.util.Scanner;
import mage.cards.decks.DeckCardLists;
import org.apache.log4j.Logger;
import java.io.File;
import java.util.Scanner;
/**
*
* @author BetaSteward_at_googlemail.com
@ -41,7 +42,7 @@ public abstract class DeckImporter {
private static final Logger logger = Logger.getLogger(DeckImporter.class);
protected String errors;
protected StringBuilder sbMessage = new StringBuilder(); //TODO we should stop using this not garbage collectable StringBuilder. It just bloats
protected int lineCount;
public DeckCardLists importDeck(String file) {
@ -52,7 +53,7 @@ public abstract class DeckImporter {
return deckList;
}
lineCount = 0;
StringBuilder sbMessage = new StringBuilder();
sbMessage.setLength(0);
try {
try (Scanner scanner = new Scanner(f)) {
@ -70,12 +71,11 @@ public abstract class DeckImporter {
} catch (Exception ex) {
logger.fatal(null, ex);
}
errors = sbMessage.toString();
return deckList;
}
public String getErrors(){
return errors;
return sbMessage.toString();
}
protected abstract void readLine(String line, DeckCardLists deckList);

View file

@ -290,7 +290,7 @@ public class SwissPairingMinimalWeightMatching {
}
}
class PlayerInfo {
static class PlayerInfo {
public int id;
public TournamentPlayer tournamentPlayer;