From 7eda172ef729e51beb566b17e37020fed9f95000 Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Sat, 17 Nov 2018 22:15:48 +0300
Subject: [PATCH] - Fix compile for mobile Forge, update imports.

---
 .../src/main/java/forge/game/phase/Untap.java | 14 ++++----
 .../screens/match/views/VCardDisplayArea.java | 34 +++----------------
 .../src/forge/screens/match/views/VField.java |  4 +--
 3 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/phase/Untap.java b/forge-game/src/main/java/forge/game/phase/Untap.java
index d256711e719..0ed7990fc3e 100644
--- a/forge-game/src/main/java/forge/game/phase/Untap.java
+++ b/forge-game/src/main/java/forge/game/phase/Untap.java
@@ -17,20 +17,12 @@
  */
 package forge.game.phase;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
 import forge.card.CardType;
 import forge.game.Game;
-import forge.game.GameEntity;
 import forge.game.ability.ApiType;
 import forge.game.card.Card;
 import forge.game.card.CardCollection;
@@ -42,6 +34,12 @@ import forge.game.player.PlayerController.BinaryChoiceType;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
 /**
  * <p>
  * Untap class.
diff --git a/forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java b/forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java
index 81070fcc75f..7c3a3ca1eaa 100644
--- a/forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java
+++ b/forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java
@@ -279,8 +279,8 @@ public abstract class VCardDisplayArea extends VDisplayArea implements ActivateH
 
             attachedPanels.clear();
 
-            if (card.isEnchanted()) {
-                final Iterable<CardView> enchants = card.getEnchantedBy();
+            if (card.isAttached()) {
+                final Iterable<CardView> enchants = card.getAttachedBy();
                 for (final CardView e : enchants) {
                     final CardAreaPanel cardE = CardAreaPanel.get(e);
                     if (cardE != null) {
@@ -289,34 +289,8 @@ public abstract class VCardDisplayArea extends VDisplayArea implements ActivateH
                 }
             }
        
-            if (card.isEquipped()) {
-                final Iterable<CardView> enchants = card.getEquippedBy();
-                for (final CardView e : enchants) {
-                    final CardAreaPanel cardE = CardAreaPanel.get(e);
-                    if (cardE != null) {
-                        attachedPanels.add(cardE);
-                    }
-                }
-            }
-
-            if (card.isFortified()) {
-                final Iterable<CardView> fortifications = card.getFortifiedBy();
-                for (final CardView e : fortifications) {
-                    final CardAreaPanel cardE = CardAreaPanel.get(e);
-                    if (cardE != null) {
-                        attachedPanels.add(cardE);
-                    }
-                }
-            }
-
-            if (card.getEnchantingCard() != null) {
-                setAttachedToPanel(CardAreaPanel.get(card.getEnchantingCard()));
-            }
-            else if (card.getEquipping() != null) {
-                setAttachedToPanel(CardAreaPanel.get(card.getEquipping()));
-            }
-            else if (card.getFortifying() != null) {
-                setAttachedToPanel(CardAreaPanel.get(card.getFortifying()));
+            if (card.getAttachingCard() != null) {
+                setAttachedToPanel(CardAreaPanel.get(card.getAttachingCard()));
             }
             else {
                 setAttachedToPanel(null);
diff --git a/forge-gui-mobile/src/forge/screens/match/views/VField.java b/forge-gui-mobile/src/forge/screens/match/views/VField.java
index 379fa140876..c49c128f2d9 100644
--- a/forge-gui-mobile/src/forge/screens/match/views/VField.java
+++ b/forge-gui-mobile/src/forge/screens/match/views/VField.java
@@ -99,7 +99,7 @@ public class VField extends FContainer {
     };
 
     private boolean tryStackCard(CardView card, List<CardView> cardsOfType) {
-        if (card.isEnchanted() || card.isEquipped()) {
+        if (card.isAttached()) {
             return false; //can stack with enchanted or equipped card
         }
         if (card.getCurrentState().isCreature() && !card.isToken()) {
@@ -107,7 +107,7 @@ public class VField extends FContainer {
         }
         final String cardName = card.getCurrentState().getName();
         for (CardView c : cardsOfType) {
-            if (!c.isEnchanted() && !c.isEquipped() &&
+            if (!c.isAttached() &&
                     cardName.equals(c.getCurrentState().getName()) &&
                     card.hasSameCounters(c) &&
                     card.isToken() == c.isToken()) { //don't stack tokens on top of non-tokens