- CheckStyle.

This commit is contained in:
Chris
2012-06-17 14:58:29 +00:00
parent ebe4722c55
commit 0d9000b7f1
11 changed files with 92 additions and 87 deletions

View File

@@ -678,17 +678,18 @@ public class CardFactorySorceries {
else if (cardName.equals("Donate")) { else if (cardName.equals("Donate")) {
final Target t2 = new Target(card, "Select target Player", "Player".split(",")); final Target t2 = new Target(card, "Select target Player", "Player".split(","));
class DrawbackDonate extends AbilitySub { class DrawbackDonate extends AbilitySub {
public DrawbackDonate(final Card ca,final Target t) { public DrawbackDonate(final Card ca, final Target t) {
super(ca,t); super(ca, t);
} }
@Override @Override
public AbilitySub getCopy() { public AbilitySub getCopy() {
AbilitySub res = new DrawbackDonate(getSourceCard(),getTarget() == null ? null : new Target(getTarget())); AbilitySub res = new DrawbackDonate(getSourceCard(),
CardFactoryUtil.copySpellAbility(this,res); getTarget() == null ? null : new Target(getTarget()));
CardFactoryUtil.copySpellAbility(this, res);
return res; return res;
} }
private static final long serialVersionUID = 4618047889933691050L; private static final long serialVersionUID = 4618047889933691050L;
@Override @Override

View File

@@ -845,11 +845,12 @@ public class CardFactoryUtil {
final Cost cost = new Cost(sourceCard, manaCost, true); final Cost cost = new Cost(sourceCard, manaCost, true);
class AbilityUnearth extends AbilityActivated { class AbilityUnearth extends AbilityActivated {
public AbilityUnearth(final Card ca, final Cost co, final Target t) { public AbilityUnearth(final Card ca, final Cost co, final Target t) {
super(ca,co,t); super(ca, co, t);
} }
public AbilityActivated getCopy() { public AbilityActivated getCopy() {
AbilityActivated res = new AbilityUnearth(getSourceCard(),getPayCosts(),getTarget() == null ? null : new Target(getTarget())); AbilityActivated res = new AbilityUnearth(getSourceCard(),
getPayCosts(), getTarget() == null ? null : new Target(getTarget()));
CardFactoryUtil.copySpellAbility(this, res); CardFactoryUtil.copySpellAbility(this, res);
final SpellAbilityRestriction restrict = new SpellAbilityRestriction(); final SpellAbilityRestriction restrict = new SpellAbilityRestriction();
restrict.setZone(ZoneType.Graveyard); restrict.setZone(ZoneType.Graveyard);
@@ -857,7 +858,7 @@ public class CardFactoryUtil {
res.setRestrictions(restrict); res.setRestrictions(restrict);
return res; return res;
} }
private static final long serialVersionUID = -5633945565395478009L; private static final long serialVersionUID = -5633945565395478009L;
@Override @Override
@@ -879,7 +880,7 @@ public class CardFactoryUtil {
} }
} }
final AbilityActivated unearth = new AbilityUnearth(sourceCard, cost, null); final AbilityActivated unearth = new AbilityUnearth(sourceCard, cost, null);
final SpellAbilityRestriction restrict = new SpellAbilityRestriction(); final SpellAbilityRestriction restrict = new SpellAbilityRestriction();
restrict.setZone(ZoneType.Graveyard); restrict.setZone(ZoneType.Graveyard);
restrict.setSorcerySpeed(true); restrict.setSorcerySpeed(true);
@@ -917,8 +918,9 @@ public class CardFactoryUtil {
@Override @Override
public boolean canPlay() { public boolean canPlay() {
//Lands do not have SpellPermanents. //Lands do not have SpellPermanents.
if(sourceCard.isLand()) { if (sourceCard.isLand()) {
return (AllZone.getZoneOf(sourceCard).is(ZoneType.Hand) || sourceCard.hasKeyword("May be played") ) && PhaseHandler.canCastSorcery(sourceCard.getController()); return (AllZone.getZoneOf(sourceCard).is(ZoneType.Hand) || sourceCard.hasKeyword("May be played"))
&& PhaseHandler.canCastSorcery(sourceCard.getController());
} }
else { else {
return sourceCard.getSpellPermanent().canPlay(); return sourceCard.getSpellPermanent().canPlay();
@@ -1064,16 +1066,17 @@ public class CardFactoryUtil {
final Cost abCost = new Cost(sourceCard, transmuteCost, true); final Cost abCost = new Cost(sourceCard, transmuteCost, true);
class AbilityTransmute extends AbilityActivated { class AbilityTransmute extends AbilityActivated {
public AbilityTransmute(final Card ca, final Cost co, final Target t) { public AbilityTransmute(final Card ca, final Cost co, final Target t) {
super(ca,co,t); super(ca, co, t);
} }
public AbilityActivated getCopy() { public AbilityActivated getCopy() {
AbilityActivated res = new AbilityTransmute(getSourceCard(),getPayCosts(),getTarget() == null ? null : new Target(getTarget())); AbilityActivated res = new AbilityTransmute(getSourceCard(),
getPayCosts(), getTarget() == null ? null : new Target(getTarget()));
CardFactoryUtil.copySpellAbility(this, res); CardFactoryUtil.copySpellAbility(this, res);
res.getRestrictions().setZone(ZoneType.Hand); res.getRestrictions().setZone(ZoneType.Hand);
return res; return res;
} }
private static final long serialVersionUID = -4960704261761785512L; private static final long serialVersionUID = -4960704261761785512L;
@Override @Override
@@ -1115,7 +1118,7 @@ public class CardFactoryUtil {
} }
} }
final SpellAbility transmute = new AbilityTransmute(sourceCard, abCost, null); final SpellAbility transmute = new AbilityTransmute(sourceCard, abCost, null);
final StringBuilder sbDesc = new StringBuilder(); final StringBuilder sbDesc = new StringBuilder();
sbDesc.append("Transmute (").append(abCost.toString()); sbDesc.append("Transmute (").append(abCost.toString());
sbDesc.append("Search your library for a card with the same converted mana cost as this card, reveal it, "); sbDesc.append("Search your library for a card with the same converted mana cost as this card, reveal it, ");
@@ -1209,15 +1212,16 @@ public class CardFactoryUtil {
"Creature.YouCtrl".split(",")); "Creature.YouCtrl".split(","));
class AbilityEquip extends AbilityActivated { class AbilityEquip extends AbilityActivated {
public AbilityEquip(final Card ca, final Cost co, final Target t) { public AbilityEquip(final Card ca, final Cost co, final Target t) {
super(ca,co,t); super(ca, co, t);
} }
public AbilityActivated getCopy() { public AbilityActivated getCopy() {
AbilityActivated res = new AbilityEquip(getSourceCard(),getPayCosts(),getTarget() == null ? null : new Target(getTarget())); AbilityActivated res = new AbilityEquip(getSourceCard(),
getPayCosts(), getTarget() == null ? null : new Target(getTarget()));
CardFactoryUtil.copySpellAbility(this, res); CardFactoryUtil.copySpellAbility(this, res);
return res; return res;
} }
private static final long serialVersionUID = -4960704261761785512L; private static final long serialVersionUID = -4960704261761785512L;
@Override @Override
@@ -1300,7 +1304,7 @@ public class CardFactoryUtil {
} // getCreature() } // getCreature()
} }
final SpellAbility equip = new AbilityEquip(sourceCard, abCost, target); // equip ability final SpellAbility equip = new AbilityEquip(sourceCard, abCost, target); // equip ability
String costDesc = abCost.toString(); String costDesc = abCost.toString();
// get rid of the ": " at the end // get rid of the ": " at the end
costDesc = costDesc.substring(0, costDesc.length() - 2); costDesc = costDesc.substring(0, costDesc.length() - 2);
@@ -3925,37 +3929,37 @@ public class CardFactoryUtil {
to.setStaticAbilityStrings(from.getStaticAbilityStrings()); to.setStaticAbilityStrings(from.getStaticAbilityStrings());
} }
public static void copySpellAbility(SpellAbility from,SpellAbility to) { public static void copySpellAbility(SpellAbility from, SpellAbility to) {
to.setDescription(from.getDescription()); to.setDescription(from.getDescription());
to.setStackDescription(from.getDescription()); to.setStackDescription(from.getDescription());
if(from.getAbilityFactory() != null) { if (from.getAbilityFactory() != null) {
to.setAbilityFactory(new AbilityFactory(from.getAbilityFactory())); to.setAbilityFactory(new AbilityFactory(from.getAbilityFactory()));
} }
if(from.getSubAbility() != null) { if (from.getSubAbility() != null) {
to.setSubAbility(from.getSubAbility().getCopy()); to.setSubAbility(from.getSubAbility().getCopy());
} }
if(from.getRestrictions() != null) { if (from.getRestrictions() != null) {
to.setRestrictions(from.getRestrictions()); to.setRestrictions(from.getRestrictions());
} }
if(from.getConditions() != null) { if (from.getConditions() != null) {
to.setConditions(from.getConditions()); to.setConditions(from.getConditions());
} }
for(String sVar : from.getSVars()) { for (String sVar : from.getSVars()) {
to.setSVar(sVar, from.getSVar(sVar)); to.setSVar(sVar, from.getSVar(sVar));
} }
} }
public static void correctAbilityChainSourceCard(final SpellAbility sa, final Card card) public static void correctAbilityChainSourceCard(final SpellAbility sa, final Card card) {
{
sa.setSourceCard(card); sa.setSourceCard(card);
if(sa.getAbilityFactory() != null) if (sa.getAbilityFactory() != null) {
{
sa.getAbilityFactory().setHostCard(card); sa.getAbilityFactory().setHostCard(card);
} }
if(sa.getSubAbility() != null) if (sa.getSubAbility() != null) {
{
correctAbilityChainSourceCard(sa.getSubAbility(), card); correctAbilityChainSourceCard(sa.getSubAbility(), card);
} }
} }

View File

@@ -48,9 +48,9 @@ public class Cost {
public final ArrayList<CostPart> getCostParts() { public final ArrayList<CostPart> getCostParts() {
return this.costParts; return this.costParts;
} }
private SpellAbility assocSA = null; private SpellAbility assocSA = null;
public void setSpellAbility(final SpellAbility sa) { public void setSpellAbility(final SpellAbility sa) {
assocSA = sa; assocSA = sa;
} }

View File

@@ -73,14 +73,14 @@ public abstract class AbilityActivated extends SpellAbility implements java.io.S
if ((tgt != null) && tgt.doesTarget()) { if ((tgt != null) && tgt.doesTarget()) {
this.setTarget(tgt); this.setTarget(tgt);
} }
this.getPayCosts().setSpellAbility(this); this.getPayCosts().setSpellAbility(this);
} }
public abstract AbilityActivated getCopy();/* { public abstract AbilityActivated getCopy(); /* {
return null; return null;
} }
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
public boolean canPlay() { public boolean canPlay() {

View File

@@ -74,10 +74,10 @@ public class AbilityMana extends AbilityActivated implements java.io.Serializabl
public AbilityMana(final Card sourceCard, final String parse, final String produced) { public AbilityMana(final Card sourceCard, final String parse, final String produced) {
this(sourceCard, parse, produced, 1); this(sourceCard, parse, produced, 1);
} }
@Override @Override
public AbilityActivated getCopy() { public AbilityActivated getCopy() {
AbilityActivated res = new AbilityMana(getSourceCard(),getPayCosts(),getManaProduced()); AbilityActivated res = new AbilityMana(getSourceCard(), getPayCosts(), getManaProduced());
CardFactoryUtil.copySpellAbility(this, res); CardFactoryUtil.copySpellAbility(this, res);
return res; return res;
} }

View File

@@ -63,7 +63,7 @@ public abstract class AbilitySub extends SpellAbility implements java.io.Seriali
* @return a boolean. * @return a boolean.
*/ */
public abstract boolean chkAIDrawback(); public abstract boolean chkAIDrawback();
public abstract AbilitySub getCopy(); public abstract AbilitySub getCopy();
/** {@inheritDoc} */ /** {@inheritDoc} */

View File

@@ -127,17 +127,17 @@ public abstract class SpellAbility {
}; };
private CardList tappedForConvoke = new CardList(); private CardList tappedForConvoke = new CardList();
private HashMap<String,String> sVars = new HashMap<String,String>(); private HashMap<String, String> sVars = new HashMap<String, String>();
public final String getSVar(final String name) { public final String getSVar(final String name) {
return sVars.get(name) != null ? sVars.get(name) : ""; return sVars.get(name) != null ? sVars.get(name) : "";
} }
public final void setSVar(final String name, final String value) { public final void setSVar(final String name, final String value) {
sVars.put(name,value); sVars.put(name, value);
} }
public Set<String> getSVars() { public Set<String> getSVars() {
return sVars.keySet(); return sVars.keySet();
} }

View File

@@ -397,9 +397,9 @@ public class StaticAbility {
if (mode.equals("ETBTapped")) { if (mode.equals("ETBTapped")) {
return StaticAbilityETBTapped.applyETBTappedAbility(this, card); return StaticAbilityETBTapped.applyETBTappedAbility(this, card);
} }
if (mode.equals("GainAbilitiesOf")) { if (mode.equals("GainAbilitiesOf")) {
} }
return false; return false;

View File

@@ -79,7 +79,7 @@ public class StaticAbilityContinuous {
String[] removeTypes = null; String[] removeTypes = null;
String addColors = null; String addColors = null;
String[] addTriggers = null; String[] addTriggers = null;
ArrayList<SpellAbility> addFullAbs = null; ArrayList<SpellAbility> addFullAbs = null;
boolean removeAllAbilities = false; boolean removeAllAbilities = false;
boolean removeSuperTypes = false; boolean removeSuperTypes = false;
boolean removeCardTypes = false; boolean removeCardTypes = false;
@@ -217,30 +217,30 @@ public class StaticAbilityContinuous {
} }
addTriggers = sVars; addTriggers = sVars;
} }
if (params.containsKey("GainsAbilitiesOf")) { if (params.containsKey("GainsAbilitiesOf")) {
final String[] valids = params.get("GainsAbilitiesOf").split(","); final String[] valids = params.get("GainsAbilitiesOf").split(",");
ArrayList<ZoneType> validZones = new ArrayList<ZoneType>(); ArrayList<ZoneType> validZones = new ArrayList<ZoneType>();
validZones.add(ZoneType.Battlefield); validZones.add(ZoneType.Battlefield);
if(params.containsKey("GainsAbilitiesOfZones")) { if (params.containsKey("GainsAbilitiesOfZones")) {
validZones.clear(); validZones.clear();
for(String s : params.get("GainsAbilitiesOfZones").split(",")) { for (String s : params.get("GainsAbilitiesOfZones").split(",")) {
validZones.add(ZoneType.smartValueOf(s)); validZones.add(ZoneType.smartValueOf(s));
} }
} }
CardList cardsIGainedAbilitiesFrom = AllZoneUtil.getCardsIn(validZones); CardList cardsIGainedAbilitiesFrom = AllZoneUtil.getCardsIn(validZones);
cardsIGainedAbilitiesFrom = cardsIGainedAbilitiesFrom.getValidCards(valids, hostCard.getController(), hostCard); cardsIGainedAbilitiesFrom = cardsIGainedAbilitiesFrom.getValidCards(valids, hostCard.getController(), hostCard);
if(cardsIGainedAbilitiesFrom.size() > 0) if (cardsIGainedAbilitiesFrom.size() > 0) {
{
addFullAbs = new ArrayList<SpellAbility>(); addFullAbs = new ArrayList<SpellAbility>();
for(Card c : cardsIGainedAbilitiesFrom) { for (Card c : cardsIGainedAbilitiesFrom) {
for(SpellAbility sa : c.getSpellAbilities()) { for (SpellAbility sa : c.getSpellAbilities()) {
if(sa instanceof AbilityActivated) { if (sa instanceof AbilityActivated) {
SpellAbility newSA = ((AbilityActivated)sa).getCopy(); SpellAbility newSA = ((AbilityActivated) sa).getCopy();
if(newSA == null) { if (newSA == null) {
System.out.println("Uh-oh..."); System.out.println("Uh-oh...");
} }
newSA.setType("Temporary"); newSA.setType("Temporary");
@@ -330,9 +330,9 @@ public class StaticAbilityContinuous {
affectedCard.setSVar(name, actualSVar); affectedCard.setSVar(name, actualSVar);
} }
} }
if(addFullAbs != null) { if (addFullAbs != null) {
for(final SpellAbility ab : addFullAbs) { for (final SpellAbility ab : addFullAbs) {
affectedCard.addSpellAbility(ab); affectedCard.addSpellAbility(ab);
} }
} }

View File

@@ -768,23 +768,23 @@ public final class GuiDisplayUtil {
} }
} }
} }
public static void devModeBreakpoint() { public static void devModeBreakpoint() {
List<Player> Players = AllZone.getPlayersInGame(); List<Player> Players = AllZone.getPlayersInGame();
Combat CombatHandler = AllZone.getCombat(); Combat CombatHandler = AllZone.getCombat();
TriggerHandler Triggers = AllZone.getTriggerHandler(); TriggerHandler Triggers = AllZone.getTriggerHandler();
InputControl InputHandler = AllZone.getInputControl(); InputControl InputHandler = AllZone.getInputControl();
ReplacementHandler Replacements = AllZone.getReplacementHandler(); ReplacementHandler Replacements = AllZone.getReplacementHandler();
StaticEffects StaticHandler = AllZone.getStaticEffects(); StaticEffects StaticHandler = AllZone.getStaticEffects();
List<PlayerZone> Zones = new ArrayList<PlayerZone>(); List<PlayerZone> Zones = new ArrayList<PlayerZone>();
for(Player p : Players) for (Player p : Players) {
{
Zones.add(p.getZone(ZoneType.Ante)); Zones.add(p.getZone(ZoneType.Ante));
Zones.add(p.getZone(ZoneType.Battlefield)); Zones.add(p.getZone(ZoneType.Battlefield));
Zones.add(p.getZone(ZoneType.Command)); Zones.add(p.getZone(ZoneType.Command));
@@ -795,7 +795,7 @@ public final class GuiDisplayUtil {
Zones.add(p.getZone(ZoneType.Sideboard)); Zones.add(p.getZone(ZoneType.Sideboard));
Zones.add(p.getZone(ZoneType.Stack)); Zones.add(p.getZone(ZoneType.Stack));
} }
//Set a breakpoint on the following statement //Set a breakpoint on the following statement
System.out.println("Manual Breakpoint"); System.out.println("Manual Breakpoint");
} }

View File

@@ -110,13 +110,13 @@ public enum VSubmenuQuestData implements IVSubmenu {
group2.add(radClassic); group2.add(radClassic);
radClassic.setSelected(true); radClassic.setSelected(true);
*/ */
// TODO: Convert this to non-hardcoded info // TODO: Convert this to non-hardcoded info
cbxFormat.removeAllItems(); cbxFormat.removeAllItems();
cbxFormat.addItem("Standard"); cbxFormat.addItem("Standard");
cbxFormat.addItem("Extended"); cbxFormat.addItem("Extended");
cbxFormat.addItem("Modern"); cbxFormat.addItem("Modern");
final ActionListener preconListener = new ActionListener() { final ActionListener preconListener = new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent actionEvent) { public void actionPerformed(ActionEvent actionEvent) {
@@ -164,12 +164,12 @@ public enum VSubmenuQuestData implements IVSubmenu {
radPreconStart.addActionListener(preconListener); radPreconStart.addActionListener(preconListener);
radCompleteStart.setSelected(true); radCompleteStart.setSelected(true);
cbxPrecon.setEnabled(false); cbxPrecon.setEnabled(false);
radMedium.setEnabled(true); radMedium.setEnabled(true);
// Fantasy box is Enabled by Default // Fantasy box is Enabled by Default
boxFantasy.setSelected(true); boxFantasy.setSelected(true);
boxFantasy.setEnabled(true); boxFantasy.setEnabled(true);
final JPanel pnlOptions = new JPanel(); final JPanel pnlOptions = new JPanel();
pnlOptions.setOpaque(false); pnlOptions.setOpaque(false);
pnlOptions.setLayout(new MigLayout("insets 0, gap 0")); pnlOptions.setLayout(new MigLayout("insets 0, gap 0"));
@@ -292,7 +292,7 @@ public enum VSubmenuQuestData implements IVSubmenu {
public String getPrecon() { public String getPrecon() {
return (String) cbxPrecon.getSelectedItem(); return (String) cbxPrecon.getSelectedItem();
} }
/** @return {@link java.lang.String} */ /** @return {@link java.lang.String} */
public String getFormat() { public String getFormat() {
return (String) cbxFormat.getSelectedItem(); return (String) cbxFormat.getSelectedItem();