optimizing imports

oyachai · Aug 27, 2014 · 4be8ce9 · 4be8ce9
1 parent d99c51a
commit 4be8ce9
Show file tree

Hide file tree

Showing 16 changed files with 41 additions and 66 deletions.
diff --git a/src/main/java/com/hearthsim/card/Card.java b/src/main/java/com/hearthsim/card/Card.java
@@ -1,8 +1,5 @@
 package com.hearthsim.card;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-
 import com.hearthsim.card.minion.Minion;
 import com.hearthsim.exception.HSException;
 import com.hearthsim.exception.HSInvalidPlayerIndexException;
@@ -11,8 +8,10 @@
 import com.hearthsim.util.boardstate.BoardState;
 import com.hearthsim.util.boardstate.BoardStateFactoryBase;
 import com.hearthsim.util.tree.HearthTreeNode;
+import org.json.JSONObject;
 
-import org.json.*;
+import java.util.ArrayList;
+import java.util.Iterator;
 
 public class Card implements DeepCopyable {
 

diff --git a/src/main/java/com/hearthsim/card/minion/Hero.java b/src/main/java/com/hearthsim/card/minion/Hero.java
@@ -7,7 +7,6 @@
 import com.hearthsim.util.boardstate.BoardState;
 import com.hearthsim.util.boardstate.BoardStateFactoryBase;
 import com.hearthsim.util.tree.HearthTreeNode;
-
 import org.json.JSONObject;
 
 public class Hero extends Minion {

diff --git a/src/main/java/com/hearthsim/card/minion/Minion.java b/src/main/java/com/hearthsim/card/minion/Minion.java
@@ -9,7 +9,6 @@
 import com.hearthsim.util.boardstate.BoardState;
 import com.hearthsim.util.boardstate.BoardStateFactoryBase;
 import com.hearthsim.util.tree.HearthTreeNode;
-
 import org.json.JSONObject;
 
 import java.util.Iterator;

diff --git a/src/main/java/com/hearthsim/card/minion/concrete/PriestessOfElune.java b/src/main/java/com/hearthsim/card/minion/concrete/PriestessOfElune.java
@@ -5,7 +5,6 @@
 import com.hearthsim.event.attack.AttackAction;
 import com.hearthsim.event.deathrattle.DeathrattleAction;
 import com.hearthsim.exception.HSException;
-import com.hearthsim.util.boardstate.BoardState;
 import com.hearthsim.util.tree.HearthTreeNode;
 
 public class PriestessOfElune extends Minion {

diff --git a/src/main/java/com/hearthsim/gui/HSMainFrameModel.java b/src/main/java/com/hearthsim/gui/HSMainFrameModel.java
@@ -1,13 +1,11 @@
 package com.hearthsim.gui;
 
-import java.util.ArrayList;
-
-import org.apache.commons.math3.distribution.*;
-
 import com.hearthsim.event.HSGameEndEventListener;
 import com.hearthsim.player.playercontroller.ArtificialPlayer;
 import com.hearthsim.results.GameResult;
-import com.hearthsim.util.boardstate.BoardState;
+import org.apache.commons.math3.distribution.BetaDistribution;
+
+import java.util.ArrayList;
 
 public class HSMainFrameModel implements HSGameEndEventListener {
 

diff --git a/src/main/java/com/hearthsim/player/playercontroller/ArtificialPlayer.java b/src/main/java/com/hearthsim/player/playercontroller/ArtificialPlayer.java
@@ -1,13 +1,5 @@
 package com.hearthsim.player.playercontroller;
 
-import java.io.BufferedWriter;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.nio.file.Path;
-
-import com.hearthsim.util.IdentityLinkedList;
 import com.hearthsim.card.Card;
 import com.hearthsim.card.minion.Minion;
 import com.hearthsim.card.spellcard.SpellDamage;
@@ -16,12 +8,16 @@
 import com.hearthsim.exception.HSParamNotFoundException;
 import com.hearthsim.io.ParamFile;
 import com.hearthsim.player.Player;
+import com.hearthsim.util.IdentityLinkedList;
 import com.hearthsim.util.boardstate.BoardState;
 import com.hearthsim.util.boardstate.BoardStateFactoryBase;
 import com.hearthsim.util.boardstate.SparseBoardStateFactory;
 import com.hearthsim.util.tree.HearthTreeNode;
 import com.hearthsim.util.tree.StopNode;
 
+import java.io.*;
+import java.nio.file.Path;
+
 public class ArtificialPlayer {
 
 	int nLookahead_;

diff --git a/src/main/java/com/hearthsim/player/playercontroller/GameMaster.java b/src/main/java/com/hearthsim/player/playercontroller/GameMaster.java
@@ -1,9 +1,9 @@
 package com.hearthsim.player.playercontroller;
 
-import com.hearthsim.util.boardstate.BoardState;
 import com.hearthsim.card.Card;
 import com.hearthsim.exception.HSException;
 import com.hearthsim.player.Player;
+import com.hearthsim.util.boardstate.BoardState;
 
 public class GameMaster {
 

diff --git a/src/main/java/com/hearthsim/results/GameDetailedRecord.java b/src/main/java/com/hearthsim/results/GameDetailedRecord.java
@@ -1,13 +1,12 @@
 package com.hearthsim.results;
 
-import java.util.ArrayList;
-import java.util.TreeMap;
-
 import com.hearthsim.exception.HSInvalidPlayerIndexException;
 import com.hearthsim.util.boardstate.BoardState;
-
 import org.json.JSONObject;
 
+import java.util.ArrayList;
+import java.util.TreeMap;
+
 public class GameDetailedRecord implements GameRecord {
 
 	ArrayList<TreeMap<Integer, BoardState>> boards_;

diff --git a/src/main/java/com/hearthsim/results/GameRecord.java b/src/main/java/com/hearthsim/results/GameRecord.java
@@ -1,8 +1,7 @@
 package com.hearthsim.results;
 
-import org.json.JSONObject;
-
 import com.hearthsim.util.boardstate.BoardState;
+import org.json.JSONObject;
 
 public interface GameRecord {
 

diff --git a/src/main/java/com/hearthsim/results/GameSimpleRecord.java b/src/main/java/com/hearthsim/results/GameSimpleRecord.java
@@ -1,9 +1,8 @@
 package com.hearthsim.results;
 
-import org.json.JSONObject;
-
 import com.hearthsim.exception.HSException;
 import com.hearthsim.util.boardstate.BoardState;
+import org.json.JSONObject;
 
 public class GameSimpleRecord implements GameRecord {
 

diff --git a/src/main/java/com/hearthsim/util/boardstate/BoardState.java b/src/main/java/com/hearthsim/util/boardstate/BoardState.java
@@ -1,21 +1,20 @@
 package com.hearthsim.util.boardstate;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import com.hearthsim.util.DeepCopyable;
-import com.hearthsim.util.IdentityLinkedList;
-import com.hearthsim.util.MinionList;
 import com.hearthsim.card.Card;
 import com.hearthsim.card.Deck;
 import com.hearthsim.card.minion.Hero;
 import com.hearthsim.card.minion.Minion;
 import com.hearthsim.exception.HSException;
 import com.hearthsim.exception.HSInvalidPlayerIndexException;
-
+import com.hearthsim.util.DeepCopyable;
+import com.hearthsim.util.IdentityLinkedList;
+import com.hearthsim.util.MinionList;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+
 
 /**
  * A class that represents the current state of the board (game)

diff --git a/src/main/java/com/hearthsim/util/boardstate/BoardStateFactoryBase.java b/src/main/java/com/hearthsim/util/boardstate/BoardStateFactoryBase.java
@@ -1,20 +1,20 @@
 package com.hearthsim.util.boardstate;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import com.hearthsim.util.IdentityLinkedList;
 import com.hearthsim.card.Card;
 import com.hearthsim.card.Deck;
 import com.hearthsim.card.minion.Minion;
 import com.hearthsim.exception.HSException;
 import com.hearthsim.player.playercontroller.ArtificialPlayer;
+import com.hearthsim.util.IdentityLinkedList;
 import com.hearthsim.util.boardstate.BoardState.MinionPlayerIDPair;
 import com.hearthsim.util.tree.CardDrawNode;
 import com.hearthsim.util.tree.HearthTreeNode;
 import com.hearthsim.util.tree.RandomEffectNode;
 import com.hearthsim.util.tree.StopNode;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+
 public class BoardStateFactoryBase {
 
 	protected final Deck deckPlayer0_;

diff --git a/src/main/java/com/hearthsim/util/tree/HearthTreeNode.java b/src/main/java/com/hearthsim/util/tree/HearthTreeNode.java
@@ -1,16 +1,10 @@
 package com.hearthsim.util.tree;
 
-import java.util.ArrayList;
-import java.util.IdentityHashMap;
-import java.util.List;
-
-import com.hearthsim.util.IdentityLinkedList;
-import com.hearthsim.card.Deck;
-import com.hearthsim.card.minion.Minion;
-import com.hearthsim.exception.HSException;
 import com.hearthsim.player.playercontroller.ArtificialPlayer;
 import com.hearthsim.util.boardstate.BoardState;
-import com.hearthsim.util.boardstate.BoardState.MinionPlayerIDPair;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * A tree that keeps track of possible game states

diff --git a/src/test/java/com/hearthsim/test/TestEvents.java b/src/test/java/com/hearthsim/test/TestEvents.java
@@ -1,15 +1,11 @@
 package com.hearthsim.test;
 
-import static org.junit.Assert.*;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import com.hearthsim.card.minion.Minion;
 import com.hearthsim.exception.HSException;
-import com.hearthsim.exception.HSInvalidPlayerIndexException;
 import com.hearthsim.util.boardstate.BoardState;
 import com.hearthsim.util.tree.HearthTreeNode;
+import org.junit.Before;
+import org.junit.Test;
 
 public class TestEvents {
 

diff --git a/src/test/java/com/hearthsim/test/card/TestHolySmite.java b/src/test/java/com/hearthsim/test/card/TestHolySmite.java
@@ -1,16 +1,15 @@
 package com.hearthsim.test.card;
 
-import static org.junit.Assert.*;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.hearthsim.util.boardstate.BoardState;
-import com.hearthsim.util.tree.HearthTreeNode;
 import com.hearthsim.card.Card;
 import com.hearthsim.card.minion.Minion;
 import com.hearthsim.card.spellcard.concrete.HolySmite;
 import com.hearthsim.exception.HSException;
+import com.hearthsim.util.boardstate.BoardState;
+import com.hearthsim.util.tree.HearthTreeNode;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
 
 public class TestHolySmite {
 

diff --git a/src/test/java/com/hearthsim/test/testBoardState.java b/src/test/java/com/hearthsim/test/testBoardState.java
@@ -1,13 +1,13 @@
 package com.hearthsim.test;
 
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
 import com.hearthsim.card.Card;
 import com.hearthsim.card.minion.Minion;
 import com.hearthsim.exception.HSException;
 import com.hearthsim.util.boardstate.BoardState;
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 public class testBoardState {