From 4be8ce9c33cac3291a8ac3b5322724578497bb41 Mon Sep 17 00:00:00 2001 From: kallin Date: Wed, 27 Aug 2014 15:26:21 -0400 Subject: [PATCH] optimizing imports --- src/main/java/com/hearthsim/card/Card.java | 7 +++---- src/main/java/com/hearthsim/card/minion/Hero.java | 1 - src/main/java/com/hearthsim/card/minion/Minion.java | 1 - .../card/minion/concrete/PriestessOfElune.java | 1 - .../java/com/hearthsim/gui/HSMainFrameModel.java | 8 +++----- .../player/playercontroller/ArtificialPlayer.java | 12 ++++-------- .../player/playercontroller/GameMaster.java | 2 +- .../com/hearthsim/results/GameDetailedRecord.java | 7 +++---- src/main/java/com/hearthsim/results/GameRecord.java | 3 +-- .../com/hearthsim/results/GameSimpleRecord.java | 3 +-- .../com/hearthsim/util/boardstate/BoardState.java | 13 ++++++------- .../util/boardstate/BoardStateFactoryBase.java | 8 ++++---- .../com/hearthsim/util/tree/HearthTreeNode.java | 12 +++--------- src/test/java/com/hearthsim/test/TestEvents.java | 8 ++------ .../java/com/hearthsim/test/card/TestHolySmite.java | 13 ++++++------- .../java/com/hearthsim/test/testBoardState.java | 8 ++++---- 16 files changed, 41 insertions(+), 66 deletions(-) diff --git a/src/main/java/com/hearthsim/card/Card.java b/src/main/java/com/hearthsim/card/Card.java index 95225f960..69eaf4cb0 100644 --- 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 index c4ad4c3d1..0cdd88b2d 100644 --- 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 index fc821b902..082c31182 100644 --- 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 index a17c762de..8f165aee4 100644 --- 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 index d22b48697..5dea7f59d 100644 --- 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 index 45bada639..886189c96 100644 --- 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 index e2b06f486..27c1c722e 100644 --- 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 index 2c3eb4803..aca8b5b42 100644 --- 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> boards_; diff --git a/src/main/java/com/hearthsim/results/GameRecord.java b/src/main/java/com/hearthsim/results/GameRecord.java index b1dcc7c1a..c98a77da7 100644 --- 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 index 840be395c..a659fe5de 100644 --- 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 index bef34bf61..55fa4398a 100644 --- 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 index af68d0196..002ad1c18 100644 --- 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 index 770a802cc..08f18960b 100644 --- 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 index 57750b36a..8f7ac88e1 100644 --- 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 index 81d708672..d1d1c0370 100644 --- 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 index 1679335da..ce2dab2ed 100644 --- 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 {