From 182d63607829820c8d36a48c8e7614a2b7369530 Mon Sep 17 00:00:00 2001
From: North <robyter@gmail>
Date: Sun, 1 Jan 2012 22:54:18 +0200
Subject: [PATCH] minor refactoring

---
 Mage.Sets/src/mage/sets/magic2012/PersonalSanctuary.java     | 3 +--
 Mage.Sets/src/mage/sets/tempest/Counterspell.java            | 1 -
 Mage.Sets/src/mage/sets/tenth/Manabarbs.java                 | 2 --
 Mage/src/mage/abilities/effects/common/SacrificeEffect.java  | 1 -
 .../effects/common/continious/GainAbilityTargetEffect.java   | 5 ++++-
 Mage/src/mage/cards/Card.java                                | 1 -
 Mage/src/mage/game/stack/Spell.java                          | 1 -
 7 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/magic2012/PersonalSanctuary.java b/Mage.Sets/src/mage/sets/magic2012/PersonalSanctuary.java
index 578f66934cd..640e5f39e38 100644
--- a/Mage.Sets/src/mage/sets/magic2012/PersonalSanctuary.java
+++ b/Mage.Sets/src/mage/sets/magic2012/PersonalSanctuary.java
@@ -34,7 +34,6 @@ import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.effects.Effect;
 import mage.abilities.effects.PreventionEffectImpl;
 import mage.cards.CardImpl;
 import mage.game.Game;
@@ -107,4 +106,4 @@ class PersonalSanctuaryEffect extends PreventionEffectImpl<PersonalSanctuaryEffe
 	public PersonalSanctuaryEffect copy() {
 		return new PersonalSanctuaryEffect(this);
 	}
-}
\ No newline at end of file
+}
diff --git a/Mage.Sets/src/mage/sets/tempest/Counterspell.java b/Mage.Sets/src/mage/sets/tempest/Counterspell.java
index bccb2749a4d..8bf12b9ae8b 100644
--- a/Mage.Sets/src/mage/sets/tempest/Counterspell.java
+++ b/Mage.Sets/src/mage/sets/tempest/Counterspell.java
@@ -30,7 +30,6 @@ package mage.sets.tempest;
 import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
-import mage.abilities.Ability;
 import mage.abilities.effects.common.CounterTargetEffect;
 import mage.cards.CardImpl;
 import mage.target.TargetSpell;
diff --git a/Mage.Sets/src/mage/sets/tenth/Manabarbs.java b/Mage.Sets/src/mage/sets/tenth/Manabarbs.java
index d660b9ad9b0..f39222fc53e 100644
--- a/Mage.Sets/src/mage/sets/tenth/Manabarbs.java
+++ b/Mage.Sets/src/mage/sets/tenth/Manabarbs.java
@@ -31,11 +31,9 @@ import java.util.UUID;
 
 import static mage.Constants.Zone;
 
-import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.TriggeredAbilityImpl;
-import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.DamageTargetEffect;
 import mage.cards.CardImpl;
 import mage.game.Game;
diff --git a/Mage/src/mage/abilities/effects/common/SacrificeEffect.java b/Mage/src/mage/abilities/effects/common/SacrificeEffect.java
index 2b2f2080a24..cee23990162 100644
--- a/Mage/src/mage/abilities/effects/common/SacrificeEffect.java
+++ b/Mage/src/mage/abilities/effects/common/SacrificeEffect.java
@@ -29,7 +29,6 @@ package mage.abilities.effects.common;
 
 import java.util.UUID;
 import mage.Constants.Outcome;
-import mage.Constants.TargetController;
 import mage.abilities.Ability;
 import mage.abilities.dynamicvalue.DynamicValue;
 import mage.abilities.dynamicvalue.common.StaticValue;
diff --git a/Mage/src/mage/abilities/effects/common/continious/GainAbilityTargetEffect.java b/Mage/src/mage/abilities/effects/common/continious/GainAbilityTargetEffect.java
index 09848181373..0769f0b8338 100644
--- a/Mage/src/mage/abilities/effects/common/continious/GainAbilityTargetEffect.java
+++ b/Mage/src/mage/abilities/effects/common/continious/GainAbilityTargetEffect.java
@@ -83,7 +83,10 @@ public class GainAbilityTargetEffect extends ContinuousEffectImpl<GainAbilityTar
 		StringBuilder sb = new StringBuilder();
         Target target = mode.getTargets().get(0);
         if(target.getNumberOfTargets() > 1){
-            sb.append(target.getNumberOfTargets()).append(" target ").append(target.getTargetName()).append(" gain ");
+            if (target.getNumberOfTargets() < target.getMaxNumberOfTargets()) {
+                sb.append("Up to");
+            }
+            sb.append(target.getMaxNumberOfTargets()).append(" target ").append(target.getTargetName()).append(" gain ");
         } else {
             sb.append("Target ").append(target.getTargetName()).append(" gains ");
         }
diff --git a/Mage/src/mage/cards/Card.java b/Mage/src/mage/cards/Card.java
index fe4bdf3aa5b..987d8efa9c3 100644
--- a/Mage/src/mage/cards/Card.java
+++ b/Mage/src/mage/cards/Card.java
@@ -39,7 +39,6 @@ import mage.abilities.SpellAbility;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.watchers.Watcher;
-import mage.watchers.Watchers;
 
 public interface Card extends MageObject {
 
diff --git a/Mage/src/mage/game/stack/Spell.java b/Mage/src/mage/game/stack/Spell.java
index d925e7471fe..cbb2c71f8ba 100644
--- a/Mage/src/mage/game/stack/Spell.java
+++ b/Mage/src/mage/game/stack/Spell.java
@@ -49,7 +49,6 @@ import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.players.Player;
 import mage.target.Target;
-import mage.watchers.Watchers;
 
 import java.util.List;
 import java.util.UUID;