From 7404566d460683048dbce5020c7eb0fc32a06c77 Mon Sep 17 00:00:00 2001 From: Ida Massow Date: Mon, 30 May 2011 10:13:26 +0200 Subject: Fixed a few warnings git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@320 72836036-5685-4462-b002-a69064685172 --- src/jrummikub/control/turn/BaseAIControl.java | 6 ----- src/jrummikub/control/turn/HumanTurnControl.java | 3 --- src/jrummikub/control/turn/ITurnControl.java | 1 - src/jrummikub/control/turn/TurnControlFactory.java | 17 ++++++------ src/jrummikub/view/ISettingsPanel.java | 1 - src/jrummikub/view/IView.java | 31 ++++++++++++++-------- 6 files changed, 29 insertions(+), 30 deletions(-) (limited to 'src/jrummikub') diff --git a/src/jrummikub/control/turn/BaseAIControl.java b/src/jrummikub/control/turn/BaseAIControl.java index d143dc1..4e627c3 100644 --- a/src/jrummikub/control/turn/BaseAIControl.java +++ b/src/jrummikub/control/turn/BaseAIControl.java @@ -1,13 +1,7 @@ package jrummikub.control.turn; -import java.util.Date; - import javax.swing.SwingUtilities; -import jrummikub.model.IHand; -import jrummikub.model.ITable; -import jrummikub.view.IView; - public class BaseAIControl extends AbstractTurnControl { long startTime; diff --git a/src/jrummikub/control/turn/HumanTurnControl.java b/src/jrummikub/control/turn/HumanTurnControl.java index 6dc055a..9215bae 100644 --- a/src/jrummikub/control/turn/HumanTurnControl.java +++ b/src/jrummikub/control/turn/HumanTurnControl.java @@ -9,8 +9,6 @@ import java.util.List; import jrummikub.control.ITurnTimer; import jrummikub.control.TurnTimer; import jrummikub.model.Hand; -import jrummikub.model.IHand; -import jrummikub.model.ITable; import jrummikub.model.Position; import jrummikub.model.Stone; import jrummikub.model.StoneColor; @@ -20,7 +18,6 @@ import jrummikub.util.IListener; import jrummikub.util.IListener1; import jrummikub.util.IListener2; import jrummikub.util.Pair; -import jrummikub.view.IView; /** * Controller for a single turn made by a human player diff --git a/src/jrummikub/control/turn/ITurnControl.java b/src/jrummikub/control/turn/ITurnControl.java index 061cddd..5d0cd49 100644 --- a/src/jrummikub/control/turn/ITurnControl.java +++ b/src/jrummikub/control/turn/ITurnControl.java @@ -1,6 +1,5 @@ package jrummikub.control.turn; -import jrummikub.model.IHand; import jrummikub.model.IPlayer; import jrummikub.model.ITable; import jrummikub.util.Event; diff --git a/src/jrummikub/control/turn/TurnControlFactory.java b/src/jrummikub/control/turn/TurnControlFactory.java index ecfc5ff..9e3b9f9 100644 --- a/src/jrummikub/control/turn/TurnControlFactory.java +++ b/src/jrummikub/control/turn/TurnControlFactory.java @@ -1,11 +1,12 @@ package jrummikub.control.turn; -import jrummikub.model.IHand; -import jrummikub.model.ITable; -import jrummikub.view.IView; - +/** + * Creates a turn control for the active player, regarding if layer is human or + * computer + * + */ public abstract class TurnControlFactory { - /** + /** * Type of turn control. */ public enum Type { @@ -14,11 +15,11 @@ public abstract class TurnControlFactory { /** */ COMPUTER }; - + public abstract ITurnControl create(); - + static public TurnControlFactory getFactory(Type type) { - switch(type) { + switch (type) { case HUMAN: return HumanTurnControl.getFactory(); case COMPUTER: diff --git a/src/jrummikub/view/ISettingsPanel.java b/src/jrummikub/view/ISettingsPanel.java index cc1431d..d28a9b4 100644 --- a/src/jrummikub/view/ISettingsPanel.java +++ b/src/jrummikub/view/ISettingsPanel.java @@ -3,7 +3,6 @@ package jrummikub.view; import java.awt.Color; import jrummikub.control.turn.TurnControlFactory; -import jrummikub.control.turn.TurnControlFactory.Type; import jrummikub.model.GameSettings; import jrummikub.util.IEvent; import jrummikub.util.IEvent1; diff --git a/src/jrummikub/view/IView.java b/src/jrummikub/view/IView.java index ade6769..acfd4ac 100644 --- a/src/jrummikub/view/IView.java +++ b/src/jrummikub/view/IView.java @@ -47,7 +47,7 @@ public interface IView { * Sets the current player's name * * @param playerName - * the player name + * the player name */ public void setCurrentPlayerName(String playerName); @@ -55,7 +55,7 @@ public interface IView { * Sets the stones that are to be painted selected * * @param stones - * the stones to be painted selected + * the stones to be painted selected */ public void setSelectedStones(Collection stones); @@ -63,7 +63,7 @@ public interface IView { * Enables or disables the player's StartTurnPanel * * @param enable - * enable/disable + * enable/disable */ public void enableStartTurnPanel(boolean enable); @@ -78,7 +78,7 @@ public interface IView { * Enables or disables the panel shown when a player has won * * @param enable - * enable/disable + * enable/disable */ public void enableWinPanel(boolean enable); @@ -100,7 +100,7 @@ public interface IView { * Shows or hides the game settings panel * * @param show - * specifies if the panel shall be shown or hidden + * specifies if the panel shall be shown or hidden */ public void showSettingsPanel(boolean show); @@ -108,7 +108,7 @@ public interface IView { * Shows or hides the score panel * * @param show - * specifies if the panel shall be shown or hidden + * specifies if the panel shall be shown or hidden */ public void showScorePanel(boolean show); @@ -116,15 +116,17 @@ public interface IView { * Is used for the PlayerPanel and ScorePanel to display a player's color * along with the name * - * @param color the current player's color + * @param color + * the current player's color */ public void setCurrentPlayerColor(Color color); /** - * Is used for the PlayerPanel to display if a player has laid out along with - * the name + * Is used for the PlayerPanel to display if a player has laid out along + * with the name * - * @param hasLaidOut specifies if the current player has laid out or not + * @param hasLaidOut + * specifies if the current player has laid out or not */ public void setHasLaidOut(boolean hasLaidOut); @@ -139,9 +141,16 @@ public interface IView { * Enables or disables most parts of the interface * * @param enable - * specifies if the interface is to be enabled or disabled + * specifies if the interface is to be enabled or disabled */ void showInterface(boolean enable); + /** + * Enables or disables the panel shown while the computer player is making a + * move + * + * @param b + * specifies if the interface is enabled or disabled + */ public void enableThinkPanel(boolean b); } -- cgit v1.2.3