summaryrefslogtreecommitdiffstats
path: root/src/jrummikub/view
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2011-05-16 22:09:56 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2011-05-16 22:09:56 +0200
commita4f5beb00598f577598a0e39e4e1099d9ea6e1e6 (patch)
treec83ad081123ae493ad7945a30a10dab92a344f3f /src/jrummikub/view
parent604ef91282ad234130b1d46569efd486ab6c5024 (diff)
downloadJRummikub-a4f5beb00598f577598a0e39e4e1099d9ea6e1e6.tar
JRummikub-a4f5beb00598f577598a0e39e4e1099d9ea6e1e6.zip
Move getHandPanel from IPlayerPanel to IView
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@245 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'src/jrummikub/view')
-rw-r--r--src/jrummikub/view/IPlayerPanel.java5
-rw-r--r--src/jrummikub/view/IView.java5
-rw-r--r--src/jrummikub/view/impl/PlayerPanel.java3
-rw-r--r--src/jrummikub/view/impl/View.java6
4 files changed, 12 insertions, 7 deletions
diff --git a/src/jrummikub/view/IPlayerPanel.java b/src/jrummikub/view/IPlayerPanel.java
index 86c1440..3fb8709 100644
--- a/src/jrummikub/view/IPlayerPanel.java
+++ b/src/jrummikub/view/IPlayerPanel.java
@@ -7,11 +7,6 @@ import jrummikub.util.IEvent;
*/
public interface IPlayerPanel {
/**
- * @return the board where the players hand stones are displayed
- */
- public IHandPanel getHandPanel();
-
- /**
* Sets the time the player has left for his turn
*
* @param time
diff --git a/src/jrummikub/view/IView.java b/src/jrummikub/view/IView.java
index d69d942..5828edd 100644
--- a/src/jrummikub/view/IView.java
+++ b/src/jrummikub/view/IView.java
@@ -17,6 +17,11 @@ public interface IView {
public ITablePanel getTablePanel();
/**
+ * @return the board where the players hand stones are displayed
+ */
+ public IHandPanel getHandPanel();
+
+ /**
* Returns the player panel
*
* @return the playerPanel
diff --git a/src/jrummikub/view/impl/PlayerPanel.java b/src/jrummikub/view/impl/PlayerPanel.java
index 20fb05a..8d0719a 100644
--- a/src/jrummikub/view/impl/PlayerPanel.java
+++ b/src/jrummikub/view/impl/PlayerPanel.java
@@ -49,8 +49,7 @@ class PlayerPanel extends JPanel implements IPlayerPanel {
private Event sortByRunsEvent = new Event();
private Event endTurnEvent = new Event();
- @Override
- public HandPanel getHandPanel() {
+ HandPanel getHandPanel() {
return hand;
}
diff --git a/src/jrummikub/view/impl/View.java b/src/jrummikub/view/impl/View.java
index 869f4cd..9290b60 100644
--- a/src/jrummikub/view/impl/View.java
+++ b/src/jrummikub/view/impl/View.java
@@ -11,6 +11,7 @@ import javax.swing.border.MatteBorder;
import jrummikub.model.Stone;
import jrummikub.util.IEvent;
+import jrummikub.view.IHandPanel;
import jrummikub.view.IPlayerPanel;
import jrummikub.view.ITablePanel;
import jrummikub.view.IView;
@@ -39,6 +40,11 @@ public class View extends JFrame implements IView {
}
@Override
+ public IHandPanel getHandPanel() {
+ return playerPanel.getHandPanel();
+ }
+
+ @Override
public IPlayerPanel getPlayerPanel() {
return playerPanel;
}