summaryrefslogtreecommitdiffstats
path: root/src/jrummikub
diff options
context:
space:
mode:
Diffstat (limited to 'src/jrummikub')
-rw-r--r--src/jrummikub/resource/felt.png (renamed from src/jrummikub/view/resource/felt.png)bin422022 -> 422022 bytes
-rw-r--r--src/jrummikub/resource/wood.png (renamed from src/jrummikub/view/resource/wood.png)bin17920 -> 17920 bytes
-rw-r--r--src/jrummikub/view/impl/Board.java (renamed from src/jrummikub/view/Board.java)5
-rw-r--r--src/jrummikub/view/impl/CustomBorder.java (renamed from src/jrummikub/view/CustomBorder.java)2
-rw-r--r--src/jrummikub/view/impl/PlayerPanel.java (renamed from src/jrummikub/view/PlayerPanel.java)4
-rw-r--r--src/jrummikub/view/impl/StonePainter.java (renamed from src/jrummikub/view/StonePainter.java)2
-rw-r--r--src/jrummikub/view/impl/Table.java (renamed from src/jrummikub/view/Table.java)6
-rw-r--r--src/jrummikub/view/impl/View.java (renamed from src/jrummikub/view/View.java)5
8 files changed, 16 insertions, 8 deletions
diff --git a/src/jrummikub/view/resource/felt.png b/src/jrummikub/resource/felt.png
index e7b18e2..e7b18e2 100644
--- a/src/jrummikub/view/resource/felt.png
+++ b/src/jrummikub/resource/felt.png
Binary files differ
diff --git a/src/jrummikub/view/resource/wood.png b/src/jrummikub/resource/wood.png
index ed9cf14..ed9cf14 100644
--- a/src/jrummikub/view/resource/wood.png
+++ b/src/jrummikub/resource/wood.png
Binary files differ
diff --git a/src/jrummikub/view/Board.java b/src/jrummikub/view/impl/Board.java
index 5fc0390..1d7cc1a 100644
--- a/src/jrummikub/view/Board.java
+++ b/src/jrummikub/view/impl/Board.java
@@ -1,4 +1,4 @@
-package jrummikub.view;
+package jrummikub.view.impl;
import java.awt.Color;
import java.awt.Graphics;
@@ -9,10 +9,11 @@ import javax.swing.JPanel;
import jrummikub.model.Stone;
import jrummikub.model.StoneColor;
+import jrummikub.view.IBoard;
@SuppressWarnings("serial")
public class Board extends JPanel implements IBoard {
- private final static ImageIcon background = new ImageIcon(Board.class.getResource("resource/wood.png"));
+ private final static ImageIcon background = new ImageIcon(Board.class.getResource("/jrummikub/resource/wood.png"));
Board() {
super(true);
diff --git a/src/jrummikub/view/CustomBorder.java b/src/jrummikub/view/impl/CustomBorder.java
index f249cb1..3e79ce7 100644
--- a/src/jrummikub/view/CustomBorder.java
+++ b/src/jrummikub/view/impl/CustomBorder.java
@@ -1,4 +1,4 @@
-package jrummikub.view;
+package jrummikub.view.impl;
import java.awt.Color;
import java.awt.Component;
diff --git a/src/jrummikub/view/PlayerPanel.java b/src/jrummikub/view/impl/PlayerPanel.java
index 385499e..5c29e7e 100644
--- a/src/jrummikub/view/PlayerPanel.java
+++ b/src/jrummikub/view/impl/PlayerPanel.java
@@ -1,4 +1,4 @@
-package jrummikub.view;
+package jrummikub.view.impl;
import java.awt.Color;
import java.awt.Dimension;
@@ -16,6 +16,8 @@ import javax.swing.JProgressBar;
import jrummikub.util.Event;
import jrummikub.util.IEvent;
+import jrummikub.view.IBoard;
+import jrummikub.view.IPlayerPanel;
@SuppressWarnings("serial")
public class PlayerPanel extends JPanel implements IPlayerPanel {
diff --git a/src/jrummikub/view/StonePainter.java b/src/jrummikub/view/impl/StonePainter.java
index 8b104df..db3a477 100644
--- a/src/jrummikub/view/StonePainter.java
+++ b/src/jrummikub/view/impl/StonePainter.java
@@ -1,4 +1,4 @@
-package jrummikub.view;
+package jrummikub.view.impl;
import java.awt.Color;
import java.awt.Font;
diff --git a/src/jrummikub/view/Table.java b/src/jrummikub/view/impl/Table.java
index f1197b7..c3c6a71 100644
--- a/src/jrummikub/view/Table.java
+++ b/src/jrummikub/view/impl/Table.java
@@ -1,4 +1,4 @@
-package jrummikub.view;
+package jrummikub.view.impl;
import java.awt.BorderLayout;
import java.awt.Color;
@@ -8,9 +8,11 @@ import javax.swing.ImageIcon;
import javax.swing.JLabel;
import javax.swing.JPanel;
+import jrummikub.view.ITable;
+
@SuppressWarnings("serial")
public class Table extends JPanel implements ITable {
- private final static ImageIcon background = new ImageIcon(Board.class.getResource("resource/felt.png"));
+ private final static ImageIcon background = new ImageIcon(Board.class.getResource("/jrummikub/resource/felt.png"));
private JLabel leftPlayerLabel, topPlayerLabel, rightPlayerLabel;
private JPanel innerPanel;
diff --git a/src/jrummikub/view/View.java b/src/jrummikub/view/impl/View.java
index 8589e8f..5b0295c 100644
--- a/src/jrummikub/view/View.java
+++ b/src/jrummikub/view/impl/View.java
@@ -1,4 +1,4 @@
-package jrummikub.view;
+package jrummikub.view.impl;
import java.awt.BorderLayout;
import java.awt.Color;
@@ -8,6 +8,9 @@ import javax.swing.JFrame;
import javax.swing.UIManager;
import jrummikub.util.IListener;
+import jrummikub.view.IPlayerPanel;
+import jrummikub.view.ITable;
+import jrummikub.view.IView;
@SuppressWarnings("serial")
public class View extends JFrame implements IView {