diff --git a/src/main/java/forge/GUI_ImportPicture.java b/src/main/java/forge/GUI_ImportPicture.java index 42ab42d23af..bec6f5a8e0a 100644 --- a/src/main/java/forge/GUI_ImportPicture.java +++ b/src/main/java/forge/GUI_ImportPicture.java @@ -1,14 +1,11 @@ package forge; -import forge.properties.ForgeProps; -import forge.properties.NewConstants; - -import javax.swing.*; -import javax.swing.event.MouseInputAdapter; - import java.awt.Color; -import java.awt.*; -import java.awt.event.MouseAdapter; +import java.awt.Dimension; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.awt.Rectangle; import java.awt.event.MouseEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -16,6 +13,20 @@ import java.io.File; import java.util.ArrayList; import java.util.List; +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JDialog; +import javax.swing.JFileChooser; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JProgressBar; +import javax.swing.event.MouseInputAdapter; + +import forge.properties.ForgeProps; +import forge.properties.NewConstants; + /** *

* GUI_ImportPicture class. diff --git a/src/main/java/forge/Upkeep.java b/src/main/java/forge/Upkeep.java index 8b03bea81c9..bec2c6db9ca 100644 --- a/src/main/java/forge/Upkeep.java +++ b/src/main/java/forge/Upkeep.java @@ -793,6 +793,7 @@ public class Upkeep implements java.io.Serializable { final Card c = cards.get(i); final Ability noPay = new Ability(c, "B B B") { + @SuppressWarnings("unused") private static final long serialVersionUID = 4820011390853920644L; @Override @@ -815,6 +816,7 @@ public class Upkeep implements java.io.Serializable { String question = "Pay Demonic Hordes upkeep cost?"; if (GameActionUtil.showYesNoDialog(c, question)) { final Ability pay = new Ability(c, "0") { + @SuppressWarnings("unused") private static final long serialVersionUID = 4820011440853920644L; public void resolve() { @@ -842,6 +844,7 @@ public class Upkeep implements java.io.Serializable { else { //computer if ((c.getController().isComputer() && (ComputerUtil.canPayCost(noPay)))) { final Ability computerPay = new Ability(c, "0") { + @SuppressWarnings("unused") private static final long serialVersionUID = 4820011440852868644L; public void resolve() { diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_Attach.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_Attach.java index d6450d522f1..aca4723d96b 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactory_Attach.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_Attach.java @@ -389,9 +389,9 @@ public class AbilityFactory_Attach { } int totToughness = 0; - int totPower = 0; + //int totPower = 0; ArrayList keywords = new ArrayList(); - boolean grantingAbilities = false; + //boolean grantingAbilities = false; for (StaticAbility stAbility : attachSource.getStaticAbilities()){ Map params = stAbility.getMapParams(); @@ -405,9 +405,9 @@ public class AbilityFactory_Attach { continue; if ((affected.contains(stCheck) || affected.contains("AttachedBy")) ){ totToughness += CardFactoryUtil.parseSVar(attachSource, params.get("AddToughness")); - totPower += CardFactoryUtil.parseSVar(attachSource, params.get("AddPower")); + //totPower += CardFactoryUtil.parseSVar(attachSource, params.get("AddPower")); - grantingAbilities |= params.containsKey("AddAbility"); + //grantingAbilities |= params.containsKey("AddAbility"); String kws = params.get("AddKeyword"); if (kws != null){ diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java index 208726cd1be..7f083e28f3f 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java @@ -1565,7 +1565,7 @@ public class AbilityFactory_ChangeZone { private static boolean changeZoneAllCanPlayAI(AbilityFactory af, SpellAbility sa) { // Change Zone All, can be any type moving from one zone to another Cost abCost = af.getAbCost(); - Card source = af.getHostCard(); + //Card source = af.getHostCard(); HashMap params = af.getMapParams(); String destination = params.get("Destination"); String origin = params.get("Origin"); diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_Copy.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_Copy.java index e698111ea5e..3d0bcd0a839 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactory_Copy.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_Copy.java @@ -166,7 +166,7 @@ public class AbilityFactory_Copy { * @return a boolean. */ private static boolean copyPermanentCanPlayAI(final AbilityFactory af, final SpellAbility sa) { - Card source = sa.getSourceCard(); + //Card source = sa.getSourceCard(); //TODO - I'm sure someone can do this AI better HashMap params = af.getMapParams(); diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_Counters.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_Counters.java index 89ea090444a..2b2c66cbac8 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactory_Counters.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_Counters.java @@ -403,7 +403,7 @@ public class AbilityFactory_Counters { HashMap params = af.getMapParams(); Target abTgt = sa.getTarget(); final Card source = sa.getSourceCard(); - boolean chance = true; + //boolean chance = true; boolean preferred = true; CardList list; Player player = af.isCurse() ? AllZone.getHumanPlayer() : AllZone.getComputerPlayer(); @@ -470,8 +470,9 @@ public class AbilityFactory_Counters { } Ability_Sub subAb = sa.getSubAbility(); - if (subAb != null) - chance &= subAb.doTrigger(mandatory); + if (subAb != null) { + //chance &= subAb.doTrigger(mandatory); + } return true; } diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_Debuff.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_Debuff.java index 2895246a13d..79d891927e8 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactory_Debuff.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_Debuff.java @@ -590,7 +590,7 @@ public class AbilityFactory_Debuff { private static boolean debuffAllCanPlayAI(final AbilityFactory af, SpellAbility sa) { String valid = ""; Random r = MyRandom.random; - final Card source = sa.getSourceCard(); + //final Card source = sa.getSourceCard(); Card hostCard = af.getHostCard(); HashMap params = af.getMapParams(); diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_PermanentState.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_PermanentState.java index ade76503de5..47677634414 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactory_PermanentState.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_PermanentState.java @@ -182,7 +182,7 @@ public class AbilityFactory_PermanentState { return false; Target tgt = af.getAbTgt(); - Card source = sa.getSourceCard(); + //Card source = sa.getSourceCard(); Random r = MyRandom.random; boolean randomReturn = r.nextFloat() <= Math.pow(.6667, sa.getActivationsThisTurn() + 1); diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_Pump.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_Pump.java index 83f50a296de..c55060af43f 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactory_Pump.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_Pump.java @@ -869,7 +869,7 @@ public class AbilityFactory_Pump { private boolean pumpAllCanPlayAI(SpellAbility sa) { String valid = ""; Random r = MyRandom.random; - final Card source = sa.getSourceCard(); + //final Card source = sa.getSourceCard(); params = AF.getMapParams(); final int defense = getNumDefense(sa); diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_Reveal.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_Reveal.java index 75f886c8d4a..7967e75a4ef 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactory_Reveal.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_Reveal.java @@ -934,7 +934,7 @@ public class AbilityFactory_Reveal { * @return a boolean. */ private static boolean scryCanPlayAI(final AbilityFactory af, SpellAbility sa) { - Card source = sa.getSourceCard(); + //Card source = sa.getSourceCard(); double chance = .4; // 40 percent chance of milling with instant speed stuff if (AbilityFactory.isSorcerySpeed(sa)) diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_Token.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_Token.java index d908f61bf89..b2b2eadb583 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactory_Token.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_Token.java @@ -1,16 +1,28 @@ package forge.card.abilityFactory; -import forge.*; -import forge.card.cardFactory.CardFactoryUtil; -import forge.card.spellability.*; -import forge.card.trigger.Trigger; -import forge.card.trigger.TriggerHandler; - -import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.Random; +import forge.AllZone; +import forge.AllZoneUtil; +import forge.Card; +import forge.CardList; +import forge.Command; +import forge.ComputerUtil; +import forge.Constant; +import forge.Counters; +import forge.MyRandom; +import forge.Player; +import forge.card.cardFactory.CardFactoryUtil; +import forge.card.spellability.Ability_Activated; +import forge.card.spellability.Ability_Sub; +import forge.card.spellability.Cost; +import forge.card.spellability.Spell; +import forge.card.spellability.SpellAbility; +import forge.card.spellability.Target; +import forge.card.trigger.Trigger; +import forge.card.trigger.TriggerHandler; + /** *

AbilityFactory_Token class.

* diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_Turns.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_Turns.java index ccb444647eb..71e7b43f78a 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactory_Turns.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_Turns.java @@ -1,13 +1,16 @@ package forge.card.abilityFactory; -import forge.AllZone; -import forge.ComputerUtil; -import forge.Player; -import forge.card.spellability.*; - import java.util.ArrayList; import java.util.HashMap; +import forge.AllZone; +import forge.Player; +import forge.card.spellability.Ability_Activated; +import forge.card.spellability.Ability_Sub; +import forge.card.spellability.Spell; +import forge.card.spellability.SpellAbility; +import forge.card.spellability.Target; + /** *

AbilityFactory_Turns class.

* diff --git a/src/main/java/forge/card/cardFactory/CardFactory_Auras.java b/src/main/java/forge/card/cardFactory/CardFactory_Auras.java index edff23d4baa..250b146bc7b 100644 --- a/src/main/java/forge/card/cardFactory/CardFactory_Auras.java +++ b/src/main/java/forge/card/cardFactory/CardFactory_Auras.java @@ -492,6 +492,7 @@ class CardFactory_Auras { animate.getRestrictions().setZone(Constant.Zone.Hand); final Ability attach = new Ability(card, "0") { + @SuppressWarnings("unused") private static final long serialVersionUID = 222308932796127795L; @Override diff --git a/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java b/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java index c2512c13571..c3498f523cd 100644 --- a/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java +++ b/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java @@ -221,6 +221,7 @@ public class CardFactory_Creatures { //*************** START *********** START ************************** else if (cardName.equals("Oracle of Mul Daya")) { final SpellAbility ability = new Ability(card, "0") { + @SuppressWarnings("unused") private static final long serialVersionUID = 2902408812353813L; @Override @@ -546,6 +547,7 @@ public class CardFactory_Creatures { else if (cardName.equals("Jhoira of the Ghitu")) { final Stack chosen = new Stack(); final SpellAbility ability = new Ability(card, "2") { + @SuppressWarnings("unused") private static final long serialVersionUID = 4414609319033894302L; @Override @@ -653,6 +655,7 @@ public class CardFactory_Creatures { final Ability ability = new Ability(card, "") { + @SuppressWarnings("unused") private static final long serialVersionUID = -3075569295823682336L; @Override diff --git a/src/main/java/forge/card/cardFactory/CardFactory_Lands.java b/src/main/java/forge/card/cardFactory/CardFactory_Lands.java index 50b58469939..02c490f150d 100644 --- a/src/main/java/forge/card/cardFactory/CardFactory_Lands.java +++ b/src/main/java/forge/card/cardFactory/CardFactory_Lands.java @@ -584,6 +584,7 @@ class CardFactory_Lands { abMana.setUndoable(false); final Ability addMana = new Ability(card, "0", desc.toString()) { + @SuppressWarnings("unused") private static final long serialVersionUID = -7805885635696245285L; //@Override @@ -783,6 +784,7 @@ class CardFactory_Lands { abMana.setUndoable(false); final Ability addMana = new Ability(card, "1", description.toString()) { + @SuppressWarnings("unused") private static final long serialVersionUID = 7177960799748450242L; //@Override diff --git a/src/main/java/forge/card/cardFactory/CardFactory_Sorceries.java b/src/main/java/forge/card/cardFactory/CardFactory_Sorceries.java index 98f451a24c4..021b46d6f0a 100644 --- a/src/main/java/forge/card/cardFactory/CardFactory_Sorceries.java +++ b/src/main/java/forge/card/cardFactory/CardFactory_Sorceries.java @@ -173,7 +173,7 @@ public class CardFactory_Sorceries { private static final long serialVersionUID = -5809548350739536763L; public void execute() { - int i = 0; + //int i = 0; for (Card target : targets) { //if card isn't in play, do nothing if (!AllZoneUtil.isCardInPlay(target)) continue; @@ -183,7 +183,7 @@ public class CardFactory_Sorceries { target.removeExtrinsicKeyword("Haste"); - i++; + //i++; } }//execute() };//Command @@ -278,6 +278,7 @@ public class CardFactory_Sorceries { };//SpellAbility final Ability freeCast = new Ability(card, "0") { + @SuppressWarnings("unused") private static final long serialVersionUID = 4455819149429678456L; @Override diff --git a/src/test/java/forge/card/mana/Mana_PartTest.java b/src/test/java/forge/card/mana/Mana_PartTest.java index b0a696e6a0e..c3463a3b366 100644 --- a/src/test/java/forge/card/mana/Mana_PartTest.java +++ b/src/test/java/forge/card/mana/Mana_PartTest.java @@ -19,6 +19,7 @@ public class Mana_PartTest { public void testPayManaCost() { { //test constructor + @SuppressWarnings("unused") ManaCost p = new ManaCost("G"); p = new ManaCost("U"); p = new ManaCost("W");