From aea2fc2fcf84cb0a51b1198f6570b43d8e6d48ef Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Mon, 29 Nov 2010 20:56:03 +0000
Subject: [PATCH] Not displaying tapped for combat dialog.

---
 .../src/main/java/mage/client/cards/Cards.java     | 14 ++++++++++++--
 .../main/java/mage/client/game/CombatGroup.java    |  3 ++-
 .../src/main/java/mage/client/game/GamePanel.java  |  4 ++--
 Mage.Common/src/mage/view/PermanentView.java       |  4 ++++
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/Mage.Client/src/main/java/mage/client/cards/Cards.java b/Mage.Client/src/main/java/mage/client/cards/Cards.java
index aea8b213de2..dc3fa9a2efb 100644
--- a/Mage.Client/src/main/java/mage/client/cards/Cards.java
+++ b/Mage.Client/src/main/java/mage/client/cards/Cards.java
@@ -48,6 +48,7 @@ import mage.client.plugins.impl.Plugins;
 import mage.client.util.Config;
 import mage.view.CardView;
 import mage.view.CardsView;
+import mage.view.PermanentView;
 import mage.view.StackAbilityView;
 
 /**
@@ -57,8 +58,9 @@ import mage.view.StackAbilityView;
 public class Cards extends javax.swing.JPanel {
 
 	private Map<UUID, MageCard> cards = new LinkedHashMap<UUID, MageCard>();
-	
-    /** Creates new form Cards */
+	private boolean dontDisplayTapped = false;
+
+	/** Creates new form Cards */
     public Cards() {
         initComponents();
         setOpaque(false);
@@ -83,6 +85,11 @@ public class Cards extends javax.swing.JPanel {
 		}
 		
 		for (CardView card: cardsView.values()) {
+			if (dontDisplayTapped) {
+				if (card instanceof PermanentView) {
+					((PermanentView)card).overrideTapped(false);
+				}
+			}
 			if (card instanceof StackAbilityView) {
 				CardView tmp = ((StackAbilityView)card).getSourceCard();
 				tmp.overrideRules(card.getRules());
@@ -168,4 +175,7 @@ public class Cards extends javax.swing.JPanel {
     private javax.swing.JScrollPane jScrollPane1;
     // End of variables declaration//GEN-END:variables
 
+    public void setDontDisplayTapped(boolean dontDisplayTapped) {
+		this.dontDisplayTapped = dontDisplayTapped;
+	}
 }
diff --git a/Mage.Client/src/main/java/mage/client/game/CombatGroup.java b/Mage.Client/src/main/java/mage/client/game/CombatGroup.java
index 1f6ec40da66..103ce480a8a 100644
--- a/Mage.Client/src/main/java/mage/client/game/CombatGroup.java
+++ b/Mage.Client/src/main/java/mage/client/game/CombatGroup.java
@@ -34,8 +34,8 @@
 
 package mage.client.game;
 
-import java.awt.Dimension;
 import java.util.UUID;
+
 import mage.client.cards.BigCard;
 import mage.client.util.Config;
 import mage.view.CombatGroupView;
@@ -52,6 +52,7 @@ public class CombatGroup extends javax.swing.JPanel {
     /** Creates new form CombatGroup */
     public CombatGroup() {
         initComponents();
+        attackers.setDontDisplayTapped(true);
     }
 
 	public void init(UUID gameId, BigCard bigCard) {
diff --git a/Mage.Client/src/main/java/mage/client/game/GamePanel.java b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
index 79e189f3679..5a3b051a9ae 100644
--- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
@@ -193,11 +193,11 @@ public class GamePanel extends javax.swing.JPanel {
 	}
 
 	public synchronized void init(GameView game) {
-		logger.log(Level.FINE, "init.");
+		logger.warning("init.");
 		MageFrame.getCombatDialog().init(gameId, bigCard);
 		MageFrame.getCombatDialog().setLocation(500, 300);
 		addPlayers(game);
-		logger.log(Level.FINE, "added players.");
+		logger.warning("added players.");
 		updateGame(game);
 	}
 
diff --git a/Mage.Common/src/mage/view/PermanentView.java b/Mage.Common/src/mage/view/PermanentView.java
index 9c29ca1b11e..9dc1e350545 100644
--- a/Mage.Common/src/mage/view/PermanentView.java
+++ b/Mage.Common/src/mage/view/PermanentView.java
@@ -113,4 +113,8 @@ public class PermanentView extends CardView {
 	public CardView getOriginal() {
 		return original;
 	}
+	
+	public void overrideTapped(boolean tapped) {
+		this.tapped = tapped;
+	}
 }