From 502b21fddbabab2e3aec7e1fa0a4bf180ae6dc73 Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Fri, 19 Nov 2010 09:01:47 +0000
Subject: [PATCH] Now if there is big image (card.plugin), rules box is not
 displayed.

---
 .../src/main/java/mage/client/cards/BigCard.java | 16 ++++++++++++----
 .../src/main/java/mage/client/cards/Card.java    |  1 +
 .../java/mage/client/game/BattlefieldPanel.java  |  3 ---
 .../plugins/adapters/MageMouseMotionAdapter.java |  1 +
 .../mage/plugins/card/constants/Constants.java   |  2 +-
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Mage.Client/src/main/java/mage/client/cards/BigCard.java b/Mage.Client/src/main/java/mage/client/cards/BigCard.java
index ad4cf1b399b..bd74a319dd7 100644
--- a/Mage.Client/src/main/java/mage/client/cards/BigCard.java
+++ b/Mage.Client/src/main/java/mage/client/cards/BigCard.java
@@ -56,10 +56,6 @@ public class BigCard extends javax.swing.JPanel {
 	public BigCard() {
         initComponents();
     }
-
-    public void removeTextComponent() {
-    	remove(this.scrollPane);
-    }
     
 	public void setCard(UUID cardId, Image image, List<String> strings) {
 		if (this.cardId == null || !this.cardId.equals(cardId)) {
@@ -92,6 +88,18 @@ public class BigCard extends javax.swing.JPanel {
 			graphics.drawImage(bigImage, 0, 0, this);
 		super.paintComponent(graphics);
  	}
+	
+    public void removeTextComponent() {
+    	remove(this.scrollPane);
+    }
+    
+    public void hideTextComponent() {
+    	this.scrollPane.setVisible(false);
+    }
+
+    public void showTextComponent() {
+    	this.scrollPane.setVisible(true);
+    }
 
 
     /** This method is called from within the constructor to
diff --git a/Mage.Client/src/main/java/mage/client/cards/Card.java b/Mage.Client/src/main/java/mage/client/cards/Card.java
index 6152f40843b..4f662402184 100644
--- a/Mage.Client/src/main/java/mage/client/cards/Card.java
+++ b/Mage.Client/src/main/java/mage/client/cards/Card.java
@@ -345,6 +345,7 @@ public class Card extends MagePermanent implements MouseMotionListener, MouseLis
 
 	@Override
 	public void mouseMoved(MouseEvent arg0) {
+		this.bigCard.showTextComponent();
 		this.bigCard.setCard(card.getId(), image, getRules());
 	}
 
diff --git a/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java b/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java
index 108b0e012b4..d3a00e16c90 100644
--- a/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java
@@ -89,9 +89,6 @@ public class BattlefieldPanel extends javax.swing.JLayeredPane implements Compon
 	public void init(UUID gameId, BigCard bigCard) {
 		this.gameId = gameId;
 		this.bigCard = bigCard;
-        /*if (Plugins.getInstance().isCardPluginLoaded()) {
-        	bigCard.removeTextComponent();
-        }*/
         addMouseListener(new MageMouseAdapter(this, gameId));			
         addMouseMotionListener(new MageMouseMotionAdapter(this, bigCard));
 	}
diff --git a/Mage.Client/src/main/java/mage/client/plugins/adapters/MageMouseMotionAdapter.java b/Mage.Client/src/main/java/mage/client/plugins/adapters/MageMouseMotionAdapter.java
index 8f2b5bb1ab3..5fa66ace333 100644
--- a/Mage.Client/src/main/java/mage/client/plugins/adapters/MageMouseMotionAdapter.java
+++ b/Mage.Client/src/main/java/mage/client/plugins/adapters/MageMouseMotionAdapter.java
@@ -33,6 +33,7 @@ public class MageMouseMotionAdapter extends MouseMotionAdapter {
 				if (image != null && image instanceof BufferedImage) {
 					image = ImageHelper.getResizedImage((BufferedImage) image, bigCard.getWidth(), bigCard.getHeight());
 					bigCard.setCard(card.getOriginal().getId(), image, card.getOriginal().getRules());
+					bigCard.hideTextComponent();
 				} else {
 					//TODO: add description panel
 				}
diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/constants/Constants.java b/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/constants/Constants.java
index ae3e09d56ff..0713b66a342 100644
--- a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/constants/Constants.java
+++ b/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/constants/Constants.java
@@ -4,7 +4,7 @@ import java.awt.Rectangle;
 import java.io.File;
 
 public class Constants {
-	public static final String RESOURCE_PATH = "/plugin.images";
+	public static final String RESOURCE_PATH = "/images";
 	public static final String RESOURCE_PATH_MANA = resourcePath("mana");
 	public static final Rectangle CARD_SIZE_FULL = new Rectangle(101, 149);