- Eliminate compiler warnings from the files below. This involved commenting out some variables, among other things.

src/test/java/forge/card/mana/Mana_PartTest.java
src/main/java/forge/card/cardFactory/CardFactory_Sorceries.java
src/main/java/forge/card/cardFactory/CardFactory_Lands.java
src/main/java/forge/card/cardFactory/CardFactory_Auras.java
src/main/java/forge/card/cardFactory/CardFactory_Creatures.java
src/main/java/forge/card/abilityFactory/AbilityFactory_Counters.java
src/main/java/forge/card/abilityFactory/AbilityFactory_Attach.java
src/main/java/forge/card/abilityFactory/AbilityFactory_Token.java
src/main/java/forge/card/abilityFactory/AbilityFactory_Pump.java
src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java
src/main/java/forge/card/abilityFactory/AbilityFactory_PermanentState.java
src/main/java/forge/card/abilityFactory/AbilityFactory_Debuff.java
src/main/java/forge/card/abilityFactory/AbilityFactory_Copy.java
src/main/java/forge/card/abilityFactory/AbilityFactory_Turns.java
src/main/java/forge/card/abilityFactory/AbilityFactory_Reveal.java
src/main/java/forge/Upkeep.java
src/main/java/forge/GUI_ImportPicture.java
This commit is contained in:
Braids
2011-08-14 00:42:05 +00:00
parent e811c166b6
commit 52c33b6468
17 changed files with 74 additions and 36 deletions

View File

@@ -1,14 +1,11 @@
package forge; 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.Color;
import java.awt.*; import java.awt.Dimension;
import java.awt.event.MouseAdapter; import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
import java.awt.Rectangle;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener; import java.beans.PropertyChangeListener;
@@ -16,6 +13,20 @@ import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; 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;
/** /**
* <p> * <p>
* GUI_ImportPicture class. * GUI_ImportPicture class.

View File

@@ -793,6 +793,7 @@ public class Upkeep implements java.io.Serializable {
final Card c = cards.get(i); final Card c = cards.get(i);
final Ability noPay = new Ability(c, "B B B") { final Ability noPay = new Ability(c, "B B B") {
@SuppressWarnings("unused")
private static final long serialVersionUID = 4820011390853920644L; private static final long serialVersionUID = 4820011390853920644L;
@Override @Override
@@ -815,6 +816,7 @@ public class Upkeep implements java.io.Serializable {
String question = "Pay Demonic Hordes upkeep cost?"; String question = "Pay Demonic Hordes upkeep cost?";
if (GameActionUtil.showYesNoDialog(c, question)) { if (GameActionUtil.showYesNoDialog(c, question)) {
final Ability pay = new Ability(c, "0") { final Ability pay = new Ability(c, "0") {
@SuppressWarnings("unused")
private static final long serialVersionUID = 4820011440853920644L; private static final long serialVersionUID = 4820011440853920644L;
public void resolve() { public void resolve() {
@@ -842,6 +844,7 @@ public class Upkeep implements java.io.Serializable {
else { //computer else { //computer
if ((c.getController().isComputer() && (ComputerUtil.canPayCost(noPay)))) { if ((c.getController().isComputer() && (ComputerUtil.canPayCost(noPay)))) {
final Ability computerPay = new Ability(c, "0") { final Ability computerPay = new Ability(c, "0") {
@SuppressWarnings("unused")
private static final long serialVersionUID = 4820011440852868644L; private static final long serialVersionUID = 4820011440852868644L;
public void resolve() { public void resolve() {

View File

@@ -389,9 +389,9 @@ public class AbilityFactory_Attach {
} }
int totToughness = 0; int totToughness = 0;
int totPower = 0; //int totPower = 0;
ArrayList<String> keywords = new ArrayList<String>(); ArrayList<String> keywords = new ArrayList<String>();
boolean grantingAbilities = false; //boolean grantingAbilities = false;
for (StaticAbility stAbility : attachSource.getStaticAbilities()){ for (StaticAbility stAbility : attachSource.getStaticAbilities()){
Map<String,String> params = stAbility.getMapParams(); Map<String,String> params = stAbility.getMapParams();
@@ -405,9 +405,9 @@ public class AbilityFactory_Attach {
continue; continue;
if ((affected.contains(stCheck) || affected.contains("AttachedBy")) ){ if ((affected.contains(stCheck) || affected.contains("AttachedBy")) ){
totToughness += CardFactoryUtil.parseSVar(attachSource, params.get("AddToughness")); 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"); String kws = params.get("AddKeyword");
if (kws != null){ if (kws != null){

View File

@@ -1565,7 +1565,7 @@ public class AbilityFactory_ChangeZone {
private static boolean changeZoneAllCanPlayAI(AbilityFactory af, SpellAbility sa) { private static boolean changeZoneAllCanPlayAI(AbilityFactory af, SpellAbility sa) {
// Change Zone All, can be any type moving from one zone to another // Change Zone All, can be any type moving from one zone to another
Cost abCost = af.getAbCost(); Cost abCost = af.getAbCost();
Card source = af.getHostCard(); //Card source = af.getHostCard();
HashMap<String, String> params = af.getMapParams(); HashMap<String, String> params = af.getMapParams();
String destination = params.get("Destination"); String destination = params.get("Destination");
String origin = params.get("Origin"); String origin = params.get("Origin");

View File

@@ -166,7 +166,7 @@ public class AbilityFactory_Copy {
* @return a boolean. * @return a boolean.
*/ */
private static boolean copyPermanentCanPlayAI(final AbilityFactory af, final SpellAbility sa) { 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 //TODO - I'm sure someone can do this AI better
HashMap<String, String> params = af.getMapParams(); HashMap<String, String> params = af.getMapParams();

View File

@@ -403,7 +403,7 @@ public class AbilityFactory_Counters {
HashMap<String, String> params = af.getMapParams(); HashMap<String, String> params = af.getMapParams();
Target abTgt = sa.getTarget(); Target abTgt = sa.getTarget();
final Card source = sa.getSourceCard(); final Card source = sa.getSourceCard();
boolean chance = true; //boolean chance = true;
boolean preferred = true; boolean preferred = true;
CardList list; CardList list;
Player player = af.isCurse() ? AllZone.getHumanPlayer() : AllZone.getComputerPlayer(); Player player = af.isCurse() ? AllZone.getHumanPlayer() : AllZone.getComputerPlayer();
@@ -470,8 +470,9 @@ public class AbilityFactory_Counters {
} }
Ability_Sub subAb = sa.getSubAbility(); Ability_Sub subAb = sa.getSubAbility();
if (subAb != null) if (subAb != null) {
chance &= subAb.doTrigger(mandatory); //chance &= subAb.doTrigger(mandatory);
}
return true; return true;
} }

View File

@@ -590,7 +590,7 @@ public class AbilityFactory_Debuff {
private static boolean debuffAllCanPlayAI(final AbilityFactory af, SpellAbility sa) { private static boolean debuffAllCanPlayAI(final AbilityFactory af, SpellAbility sa) {
String valid = ""; String valid = "";
Random r = MyRandom.random; Random r = MyRandom.random;
final Card source = sa.getSourceCard(); //final Card source = sa.getSourceCard();
Card hostCard = af.getHostCard(); Card hostCard = af.getHostCard();
HashMap<String, String> params = af.getMapParams(); HashMap<String, String> params = af.getMapParams();

View File

@@ -182,7 +182,7 @@ public class AbilityFactory_PermanentState {
return false; return false;
Target tgt = af.getAbTgt(); Target tgt = af.getAbTgt();
Card source = sa.getSourceCard(); //Card source = sa.getSourceCard();
Random r = MyRandom.random; Random r = MyRandom.random;
boolean randomReturn = r.nextFloat() <= Math.pow(.6667, sa.getActivationsThisTurn() + 1); boolean randomReturn = r.nextFloat() <= Math.pow(.6667, sa.getActivationsThisTurn() + 1);

View File

@@ -869,7 +869,7 @@ public class AbilityFactory_Pump {
private boolean pumpAllCanPlayAI(SpellAbility sa) { private boolean pumpAllCanPlayAI(SpellAbility sa) {
String valid = ""; String valid = "";
Random r = MyRandom.random; Random r = MyRandom.random;
final Card source = sa.getSourceCard(); //final Card source = sa.getSourceCard();
params = AF.getMapParams(); params = AF.getMapParams();
final int defense = getNumDefense(sa); final int defense = getNumDefense(sa);

View File

@@ -934,7 +934,7 @@ public class AbilityFactory_Reveal {
* @return a boolean. * @return a boolean.
*/ */
private static boolean scryCanPlayAI(final AbilityFactory af, SpellAbility sa) { 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 double chance = .4; // 40 percent chance of milling with instant speed stuff
if (AbilityFactory.isSorcerySpeed(sa)) if (AbilityFactory.isSorcerySpeed(sa))

View File

@@ -1,16 +1,28 @@
package forge.card.abilityFactory; 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.HashMap;
import java.util.Random; 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;
/** /**
* <p>AbilityFactory_Token class.</p> * <p>AbilityFactory_Token class.</p>
* *

View File

@@ -1,13 +1,16 @@
package forge.card.abilityFactory; package forge.card.abilityFactory;
import forge.AllZone;
import forge.ComputerUtil;
import forge.Player;
import forge.card.spellability.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; 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;
/** /**
* <p>AbilityFactory_Turns class.</p> * <p>AbilityFactory_Turns class.</p>
* *

View File

@@ -492,6 +492,7 @@ class CardFactory_Auras {
animate.getRestrictions().setZone(Constant.Zone.Hand); animate.getRestrictions().setZone(Constant.Zone.Hand);
final Ability attach = new Ability(card, "0") { final Ability attach = new Ability(card, "0") {
@SuppressWarnings("unused")
private static final long serialVersionUID = 222308932796127795L; private static final long serialVersionUID = 222308932796127795L;
@Override @Override

View File

@@ -221,6 +221,7 @@ public class CardFactory_Creatures {
//*************** START *********** START ************************** //*************** START *********** START **************************
else if (cardName.equals("Oracle of Mul Daya")) { else if (cardName.equals("Oracle of Mul Daya")) {
final SpellAbility ability = new Ability(card, "0") { final SpellAbility ability = new Ability(card, "0") {
@SuppressWarnings("unused")
private static final long serialVersionUID = 2902408812353813L; private static final long serialVersionUID = 2902408812353813L;
@Override @Override
@@ -546,6 +547,7 @@ public class CardFactory_Creatures {
else if (cardName.equals("Jhoira of the Ghitu")) { else if (cardName.equals("Jhoira of the Ghitu")) {
final Stack<Card> chosen = new Stack<Card>(); final Stack<Card> chosen = new Stack<Card>();
final SpellAbility ability = new Ability(card, "2") { final SpellAbility ability = new Ability(card, "2") {
@SuppressWarnings("unused")
private static final long serialVersionUID = 4414609319033894302L; private static final long serialVersionUID = 4414609319033894302L;
@Override @Override
@@ -653,6 +655,7 @@ public class CardFactory_Creatures {
final Ability ability = new Ability(card, "") { final Ability ability = new Ability(card, "") {
@SuppressWarnings("unused")
private static final long serialVersionUID = -3075569295823682336L; private static final long serialVersionUID = -3075569295823682336L;
@Override @Override

View File

@@ -584,6 +584,7 @@ class CardFactory_Lands {
abMana.setUndoable(false); abMana.setUndoable(false);
final Ability addMana = new Ability(card, "0", desc.toString()) { final Ability addMana = new Ability(card, "0", desc.toString()) {
@SuppressWarnings("unused")
private static final long serialVersionUID = -7805885635696245285L; private static final long serialVersionUID = -7805885635696245285L;
//@Override //@Override
@@ -783,6 +784,7 @@ class CardFactory_Lands {
abMana.setUndoable(false); abMana.setUndoable(false);
final Ability addMana = new Ability(card, "1", description.toString()) { final Ability addMana = new Ability(card, "1", description.toString()) {
@SuppressWarnings("unused")
private static final long serialVersionUID = 7177960799748450242L; private static final long serialVersionUID = 7177960799748450242L;
//@Override //@Override

View File

@@ -173,7 +173,7 @@ public class CardFactory_Sorceries {
private static final long serialVersionUID = -5809548350739536763L; private static final long serialVersionUID = -5809548350739536763L;
public void execute() { public void execute() {
int i = 0; //int i = 0;
for (Card target : targets) { for (Card target : targets) {
//if card isn't in play, do nothing //if card isn't in play, do nothing
if (!AllZoneUtil.isCardInPlay(target)) continue; if (!AllZoneUtil.isCardInPlay(target)) continue;
@@ -183,7 +183,7 @@ public class CardFactory_Sorceries {
target.removeExtrinsicKeyword("Haste"); target.removeExtrinsicKeyword("Haste");
i++; //i++;
} }
}//execute() }//execute()
};//Command };//Command
@@ -278,6 +278,7 @@ public class CardFactory_Sorceries {
};//SpellAbility };//SpellAbility
final Ability freeCast = new Ability(card, "0") { final Ability freeCast = new Ability(card, "0") {
@SuppressWarnings("unused")
private static final long serialVersionUID = 4455819149429678456L; private static final long serialVersionUID = 4455819149429678456L;
@Override @Override

View File

@@ -19,6 +19,7 @@ public class Mana_PartTest {
public void testPayManaCost() { public void testPayManaCost() {
{ {
//test constructor //test constructor
@SuppressWarnings("unused")
ManaCost p = new ManaCost("G"); ManaCost p = new ManaCost("G");
p = new ManaCost("U"); p = new ManaCost("U");
p = new ManaCost("W"); p = new ManaCost("W");