From 6ad969f7358c30f9f04f81aea468ff4d291cbe1c Mon Sep 17 00:00:00 2001
From: Nicolas <Nicolas@PC_Nicolas>
Date: Thu, 28 Nov 2013 13:28:49 +0100
Subject: [PATCH] [Client]Move some unused files into "unusedFiles"
 directory.those files should probably be removed

---
 Mage.Client/src/main/java/mage/client/game/GamePanel.java  | 7 -------
 .../mage/client/{dialog => unusedFiles}/CombatDialog.form  | 0
 .../mage/client/{dialog => unusedFiles}/CombatDialog.java  | 6 ++++--
 .../mage/client/{game => unusedFiles}/CombatGroup.form     | 0
 .../mage/client/{game => unusedFiles}/CombatGroup.java     | 5 ++++-
 .../{thread => unusedFiles}/DelayedViewerThread.java       | 4 +++-
 .../mage/client/{game => unusedFiles}/PlayerPanel.form     | 0
 .../mage/client/{game => unusedFiles}/PlayerPanel.java     | 3 ++-
 8 files changed, 13 insertions(+), 12 deletions(-)
 rename Mage.Client/src/main/java/mage/client/{dialog => unusedFiles}/CombatDialog.form (100%)
 rename Mage.Client/src/main/java/mage/client/{dialog => unusedFiles}/CombatDialog.java (97%)
 rename Mage.Client/src/main/java/mage/client/{game => unusedFiles}/CombatGroup.form (100%)
 rename Mage.Client/src/main/java/mage/client/{game => unusedFiles}/CombatGroup.java (98%)
 rename Mage.Client/src/main/java/mage/client/{thread => unusedFiles}/DelayedViewerThread.java (93%)
 rename Mage.Client/src/main/java/mage/client/{game => unusedFiles}/PlayerPanel.form (100%)
 rename Mage.Client/src/main/java/mage/client/{game => unusedFiles}/PlayerPanel.java (99%)

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 82b962eb7d4..aa2d19ae1fd 100644
--- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
@@ -82,7 +82,6 @@ public final class GamePanel extends javax.swing.JPanel {
     private UUID playerId;
     private Session session;
     private ReplayTask replayTask;
-    private CombatDialog combat;
     private PickNumberDialog pickNumber;
     private JLayeredPane jLayeredPane;
     private String chosenHandKey = "You";
@@ -99,10 +98,7 @@ public final class GamePanel extends javax.swing.JPanel {
     public GamePanel() {
         initComponents();
 
-        combat = new CombatDialog();
         pickNumber = new PickNumberDialog();
-        MageFrame.getDesktop().add(combat, JLayeredPane.MODAL_LAYER);
-        combat.hideDialog();
         MageFrame.getDesktop().add(pickNumber, JLayeredPane.MODAL_LAYER);
 
         this.feedbackPanel.setConnectedChatPanel(this.userChatPanel);
@@ -166,7 +162,6 @@ public final class GamePanel extends javax.swing.JPanel {
         this.players.clear();
         logger.debug("players clear.");
         this.pnlBattlefield.removeAll();
-        combat.hideDialog();
         pickNumber.hideDialog();
         for (ExileZoneDialog exile: exiles.values()) {
             exile.hideDialog();
@@ -332,8 +327,6 @@ public final class GamePanel extends javax.swing.JPanel {
     }
 
     public synchronized void init(GameView game) {
-        combat.init(gameId, bigCard);
-        combat.setLocation(500, 300);
         addPlayers(game);
         updateGame(game);
     }
diff --git a/Mage.Client/src/main/java/mage/client/dialog/CombatDialog.form b/Mage.Client/src/main/java/mage/client/unusedFiles/CombatDialog.form
similarity index 100%
rename from Mage.Client/src/main/java/mage/client/dialog/CombatDialog.form
rename to Mage.Client/src/main/java/mage/client/unusedFiles/CombatDialog.form
diff --git a/Mage.Client/src/main/java/mage/client/dialog/CombatDialog.java b/Mage.Client/src/main/java/mage/client/unusedFiles/CombatDialog.java
similarity index 97%
rename from Mage.Client/src/main/java/mage/client/dialog/CombatDialog.java
rename to Mage.Client/src/main/java/mage/client/unusedFiles/CombatDialog.java
index 20872f00327..b5fc4b3ffd3 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/CombatDialog.java
+++ b/Mage.Client/src/main/java/mage/client/unusedFiles/CombatDialog.java
@@ -32,10 +32,11 @@
  * Created on Feb 10, 2010, 3:35:02 PM
  */
 
-package mage.client.dialog;
+//package mage.client.dialog;
+package mage.client.unusedFiles;
 
 import mage.client.cards.BigCard;
-import mage.client.game.CombatGroup;
+import mage.client.unusedFiles.CombatGroup;
 import mage.view.CombatGroupView;
 
 import javax.swing.*;
@@ -45,6 +46,7 @@ import java.util.List;
 import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import mage.client.dialog.MageDialog;
 
 /**
  *
diff --git a/Mage.Client/src/main/java/mage/client/game/CombatGroup.form b/Mage.Client/src/main/java/mage/client/unusedFiles/CombatGroup.form
similarity index 100%
rename from Mage.Client/src/main/java/mage/client/game/CombatGroup.form
rename to Mage.Client/src/main/java/mage/client/unusedFiles/CombatGroup.form
diff --git a/Mage.Client/src/main/java/mage/client/game/CombatGroup.java b/Mage.Client/src/main/java/mage/client/unusedFiles/CombatGroup.java
similarity index 98%
rename from Mage.Client/src/main/java/mage/client/game/CombatGroup.java
rename to Mage.Client/src/main/java/mage/client/unusedFiles/CombatGroup.java
index b72839fb868..301a863aafb 100644
--- a/Mage.Client/src/main/java/mage/client/game/CombatGroup.java
+++ b/Mage.Client/src/main/java/mage/client/unusedFiles/CombatGroup.java
@@ -32,7 +32,10 @@
  * Created on Feb 10, 2010, 3:36:55 PM
  */
 
-package mage.client.game;
+
+package mage.client.unusedFiles;
+
+//package mage.client.game;
 
 import mage.client.cards.BigCard;
 import mage.client.util.Config;
diff --git a/Mage.Client/src/main/java/mage/client/thread/DelayedViewerThread.java b/Mage.Client/src/main/java/mage/client/unusedFiles/DelayedViewerThread.java
similarity index 93%
rename from Mage.Client/src/main/java/mage/client/thread/DelayedViewerThread.java
rename to Mage.Client/src/main/java/mage/client/unusedFiles/DelayedViewerThread.java
index f9d02b7ba6d..30531d5e113 100644
--- a/Mage.Client/src/main/java/mage/client/thread/DelayedViewerThread.java
+++ b/Mage.Client/src/main/java/mage/client/unusedFiles/DelayedViewerThread.java
@@ -1,4 +1,6 @@
-package mage.client.thread;
+
+package mage.client.unusedFiles;
+//package mage.client.thread;
 
 import java.awt.Component;
 import java.util.HashMap;
diff --git a/Mage.Client/src/main/java/mage/client/game/PlayerPanel.form b/Mage.Client/src/main/java/mage/client/unusedFiles/PlayerPanel.form
similarity index 100%
rename from Mage.Client/src/main/java/mage/client/game/PlayerPanel.form
rename to Mage.Client/src/main/java/mage/client/unusedFiles/PlayerPanel.form
diff --git a/Mage.Client/src/main/java/mage/client/game/PlayerPanel.java b/Mage.Client/src/main/java/mage/client/unusedFiles/PlayerPanel.java
similarity index 99%
rename from Mage.Client/src/main/java/mage/client/game/PlayerPanel.java
rename to Mage.Client/src/main/java/mage/client/unusedFiles/PlayerPanel.java
index 90dd5ffa2aa..6e35211152e 100644
--- a/Mage.Client/src/main/java/mage/client/game/PlayerPanel.java
+++ b/Mage.Client/src/main/java/mage/client/unusedFiles/PlayerPanel.java
@@ -32,7 +32,8 @@
  * Created on Nov 18, 2009, 3:01:31 PM
  */
 
-package mage.client.game;
+package mage.client.unusedFiles;
+//package mage.client.game;
 
 import java.awt.Color;
 import java.util.UUID;