From f1280a07664e1a2faec1f77a9d38db7c4955548d Mon Sep 17 00:00:00 2001 From: jendave Date: Sun, 7 Aug 2011 00:43:18 +0000 Subject: [PATCH] fix some Java warnings --- src/forge/Gui_NewGame.java | 2 +- src/forge/Phase.java | 1 - .../card/abilityFactory/AbilityFactory_PreventDamage.java | 4 +--- src/forge/card/cardFactory/CardFactory_Instants.java | 1 - src/forge/card/cardFactory/CardFactory_Sorceries.java | 2 -- 5 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/forge/Gui_NewGame.java b/src/forge/Gui_NewGame.java index 3a57a3af784..ffc5fdbf7a8 100644 --- a/src/forge/Gui_NewGame.java +++ b/src/forge/Gui_NewGame.java @@ -84,7 +84,7 @@ public class Gui_NewGame extends JFrame implements NewConstants, NewConstants.LA private JButton questButton = new JButton(); private Action LOOK_AND_FEEL_ACTION = new LookAndFeelAction(this); - private Action DOWNLOAD_ACTION = new DownloadAction(); + // private Action DOWNLOAD_ACTION = new DownloadAction(); private Action DOWNLOAD_ACTION_LQ = new DownloadActionLQ(); private Action DOWNLOAD_ACTION_SETLQ = new DownloadActionSetLQ(); private Action IMPORT_PICTURE = new ImportPictureAction(); diff --git a/src/forge/Phase.java b/src/forge/Phase.java index 061f80b895b..093e0725935 100644 --- a/src/forge/Phase.java +++ b/src/forge/Phase.java @@ -1,6 +1,5 @@ package forge; -import java.util.ArrayList; import java.util.HashMap; import java.util.Observer; import java.util.Stack; diff --git a/src/forge/card/abilityFactory/AbilityFactory_PreventDamage.java b/src/forge/card/abilityFactory/AbilityFactory_PreventDamage.java index 42997e3cac3..bb718c1cc51 100644 --- a/src/forge/card/abilityFactory/AbilityFactory_PreventDamage.java +++ b/src/forge/card/abilityFactory/AbilityFactory_PreventDamage.java @@ -2,14 +2,12 @@ package forge.card.abilityFactory; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import forge.AllZone; import forge.AllZoneUtil; import forge.Card; import forge.CardList; import forge.CardListUtil; -import forge.Combat; import forge.CombatUtil; import forge.ComputerUtil; import forge.Constant; @@ -169,7 +167,7 @@ public class AbilityFactory_PreventDamage { Target tgt = af.getAbTgt(); if (tgt == null){ // As far as I can tell these Defined Cards will only have one of them - ArrayList objects = AbilityFactory.getDefinedObjects(sa.getSourceCard(), af.getMapParams().get("Defined"), sa); + ArrayList objects = AbilityFactory.getDefinedObjects(sa.getSourceCard(), params.get("Defined"), sa); if (AllZone.Stack.size() > 0){ // check stack for something that will kill this diff --git a/src/forge/card/cardFactory/CardFactory_Instants.java b/src/forge/card/cardFactory/CardFactory_Instants.java index 23364183934..8808664e2f7 100644 --- a/src/forge/card/cardFactory/CardFactory_Instants.java +++ b/src/forge/card/cardFactory/CardFactory_Instants.java @@ -20,7 +20,6 @@ import forge.MyRandom; import forge.PhaseUtil; import forge.Player; import forge.PlayerZone; -import forge.Phase; import forge.card.spellability.Ability_Activated; import forge.card.spellability.Ability_Sub; import forge.card.spellability.Cost; diff --git a/src/forge/card/cardFactory/CardFactory_Sorceries.java b/src/forge/card/cardFactory/CardFactory_Sorceries.java index 76cf8b1eb2d..5ae2f01f8d1 100644 --- a/src/forge/card/cardFactory/CardFactory_Sorceries.java +++ b/src/forge/card/cardFactory/CardFactory_Sorceries.java @@ -22,13 +22,11 @@ import forge.CardUtil; import forge.Command; import forge.ComputerUtil; import forge.Constant; -import forge.Counters; import forge.HandSizeOp; import forge.Player; import forge.PlayerZone; import forge.PlayerZone_ComesIntoPlay; import forge.card.spellability.Ability; -import forge.card.spellability.Ability_Activated; import forge.card.spellability.Cost; import forge.card.spellability.Spell; import forge.card.spellability.SpellAbility;