From a928f6be67c07dc378b11d079437dfcdec17e4b2 Mon Sep 17 00:00:00 2001
From: Doublestrike <doublestrike@cardforge.org>
Date: Sun, 21 Oct 2012 05:50:01 +0000
Subject: [PATCH] Targeting overlay isn't maturing as I'd hoped.  It's now
 disabled until further notice.  Code will remain in place if someone wants to
 tackle it.

---
 src/main/java/forge/gui/match/TargetingOverlay.java     | 3 +--
 src/main/java/forge/gui/match/views/VDock.java          | 2 +-
 src/main/java/forge/view/FView.java                     | 3 +--
 src/main/java/forge/view/arcane/CardPanelContainer.java | 5 -----
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/main/java/forge/gui/match/TargetingOverlay.java b/src/main/java/forge/gui/match/TargetingOverlay.java
index 3c5aa283a58..f7f9446b353 100644
--- a/src/main/java/forge/gui/match/TargetingOverlay.java
+++ b/src/main/java/forge/gui/match/TargetingOverlay.java
@@ -82,8 +82,7 @@ public enum TargetingOverlay {
                 // Draw only hovered card
                 for (VField f : fields) {
                     if (f.getTabletop().getCardFromMouseOverPanel() != null) {
-                        cardPanels.add(f.getTabletop().getMouseOverPanel());
-                        break;
+                        cardPanels.addAll(f.getTabletop().getCardPanels());
                     }
                 }
                 break;
diff --git a/src/main/java/forge/gui/match/views/VDock.java b/src/main/java/forge/gui/match/views/VDock.java
index 4e39734a644..5b884dbe240 100644
--- a/src/main/java/forge/gui/match/views/VDock.java
+++ b/src/main/java/forge/gui/match/views/VDock.java
@@ -97,7 +97,7 @@ public enum VDock implements IVDoc<CDock> {
         pnl.add(btnOpenLayout);
         pnl.add(btnSaveLayout);
         pnl.add(btnAlphaStrike);
-        pnl.add(btnTargeting);
+        // pnl.add(btnTargeting);
     }
 
     /* (non-Javadoc)
diff --git a/src/main/java/forge/view/FView.java b/src/main/java/forge/view/FView.java
index ca4d0bdb340..2095f390838 100644
--- a/src/main/java/forge/view/FView.java
+++ b/src/main/java/forge/view/FView.java
@@ -23,7 +23,6 @@ import forge.gui.framework.DragCell;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.SLayoutConstants;
 import forge.gui.home.VHomeUI;
-import forge.gui.match.TargetingOverlay;
 import forge.gui.match.VMatchUI;
 import forge.gui.toolbox.FOverlay;
 import forge.gui.toolbox.FPanel;
@@ -83,7 +82,7 @@ public enum FView {
         // Note: when adding new panels here, keep in mind that the layered pane
         // has a null layout, so new components will be W0 x H0 pixels - gotcha!
         // FControl has a method called "sizeComponents" which will fix this.
-        lpnDocument.add(TargetingOverlay.SINGLETON_INSTANCE.getPanel(), TARGETING_LAYER);
+        // lpnDocument.add(TargetingOverlay.SINGLETON_INSTANCE.getPanel(), TARGETING_LAYER);
 
         pnlInsets.add(pnlContent, BorderLayout.CENTER);
         pnlInsets.setBackgroundTexture(FSkin.getIcon(FSkin.Backgrounds.BG_TEXTURE));
diff --git a/src/main/java/forge/view/arcane/CardPanelContainer.java b/src/main/java/forge/view/arcane/CardPanelContainer.java
index 5945f94378b..a5fb28164f7 100644
--- a/src/main/java/forge/view/arcane/CardPanelContainer.java
+++ b/src/main/java/forge/view/arcane/CardPanelContainer.java
@@ -559,11 +559,6 @@ public abstract class CardPanelContainer extends JPanel {
         }
     }
 
-    /** @return {@link forge.view.arcane.CardPanel} */
-    public final CardPanel getMouseOverPanel() {
-        return this.hoveredPanel;
-    }
-
     /**
      * <p>
      * getCardFromMouseOverPanel.