View Methoden-Sichtbarkeit korrigiert

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@574 72836036-5685-4462-b002-a69064685172

6 files changed, 71 insertions, 62 deletions

diff --git a/src/jrummikub/view/impl/ConnectPanel.java b/src/jrummikub/view/impl/ConnectPanel.java
index 6613fd3..5c74a66 100644
--- a/src/jrummikub/view/impl/ConnectPanel.java
+++ b/src/jrummikub/view/impl/ConnectPanel.java
@@ -35,7 +35,7 @@ public class ConnectPanel extends JPanel implements IConnectPanel {
 	/**

 	 * Creates new connection panel

 	 */

-	public ConnectPanel() {

+	ConnectPanel() {

 		setLayout(new GridBagLayout());

 

 		GridBagConstraints c = new GridBagConstraints();

diff --git a/src/jrummikub/view/impl/QuitWarningPanel.java b/src/jrummikub/view/impl/QuitWarningPanel.java
index ce4f560..d038dc6 100644
--- a/src/jrummikub/view/impl/QuitWarningPanel.java
+++ b/src/jrummikub/view/impl/QuitWarningPanel.java
@@ -21,7 +21,7 @@ import jrummikub.view.IQuitWarningPanel;
 /**
  * Warning panel to inform users if their actions would end the current game
  */
-public class QuitWarningPanel extends JPanel implements IQuitWarningPanel {
+class QuitWarningPanel extends JPanel implements IQuitWarningPanel {
 	private static final long serialVersionUID = 1L;
 	private JButton cancelButton;
 	private JButton quitButton;
@@ -33,7 +33,7 @@ public class QuitWarningPanel extends JPanel implements IQuitWarningPanel {
 	/**
 	 * Creates new quit warning panel
 	 */
-	public QuitWarningPanel() {
+	QuitWarningPanel() {
 		setLayout(new GridBagLayout());
 
 		GridBagConstraints c = new GridBagConstraints();
diff --git a/src/jrummikub/view/impl/ScorePanel.java b/src/jrummikub/view/impl/ScorePanel.java
index 39ae285..1e00e5d 100644
--- a/src/jrummikub/view/impl/ScorePanel.java
+++ b/src/jrummikub/view/impl/ScorePanel.java
@@ -35,7 +35,7 @@ class ScorePanel extends JPanel implements IScorePanel {
 	private JScrollPane scrollPane;
 	private JPanel innerPanel;
 
-	public ScorePanel() {
+	ScorePanel() {
 		setBorder(new LineBorder(Color.BLACK));
 		setLayout(new BorderLayout(0, 5));
 
diff --git a/src/jrummikub/view/impl/SidePanel.java b/src/jrummikub/view/impl/SidePanel.java
index 843ebfd..9e2348f 100644
--- a/src/jrummikub/view/impl/SidePanel.java
+++ b/src/jrummikub/view/impl/SidePanel.java
@@ -52,7 +52,7 @@ class SidePanel extends JPanel implements ISidePanel {
 	private JProgressBar heapBar;
 	private GameSettings gameSettings;
 
-	public SidePanel() {
+	SidePanel() {
 		setLayout(new GridBagLayout());
 
 		GridBagConstraints c = new GridBagConstraints();
@@ -214,7 +214,7 @@ class SidePanel extends JPanel implements ISidePanel {
 			scrollToBottom();
 		}
 
-		public void scrollToBottom() {
+		void scrollToBottom() {
 			scrollToBottom = true;
 		}
 
@@ -245,7 +245,7 @@ class SidePanel extends JPanel implements ISidePanel {
 		JCheckBox showRules;
 		JProgressBar heapBar;
 
-		public InfoPanel(JPanel gameInfo, JPanel ruleInfo) {
+		InfoPanel(JPanel gameInfo, JPanel ruleInfo) {
 			ruleInfoPanel = ruleInfo;
 			gameInfoPanel = gameInfo;
 			setLayout(new GridBagLayout());
@@ -321,7 +321,7 @@ class SidePanel extends JPanel implements ISidePanel {
 	}
 
 	class PlayerListItem extends JPanel {
-		public PlayerListItem(IPlayer player) {
+		PlayerListItem(IPlayer player) {
 			setLayout(new GridBagLayout());
 			setBorder(new EmptyBorder(0, 4, 0, 4));
 			PlayerSettings settings = player.getPlayerSettings();
@@ -402,7 +402,7 @@ class SidePanel extends JPanel implements ISidePanel {
 		JPanel startSpacer;
 		List<PlayerListItem> listItems = new ArrayList<PlayerListItem>();
 
-		public PlayerListPanel() {
+		PlayerListPanel() {
 			setBackground(Color.GRAY);
 			setLayout(new GridBagLayout());
 
@@ -419,7 +419,7 @@ class SidePanel extends JPanel implements ISidePanel {
 
 		}
 
-		public void setPlayers(List<IPlayer> players) {
+		void setPlayers(List<IPlayer> players) {
 			for (PlayerListItem item : listItems) {
 				remove(item);
 			}
diff --git a/src/jrummikub/view/impl/StonePainter.java b/src/jrummikub/view/impl/StonePainter.java
index 143ef86..56a41bf 100644
--- a/src/jrummikub/view/impl/StonePainter.java
+++ b/src/jrummikub/view/impl/StonePainter.java
@@ -46,11 +46,11 @@ class StonePainter {
 	/**
 	 * The width of one pixel in the scale of 1.0
 	 */
-	public static final double WIDTH_SCALE = 1 / DEFAULT_WIDTH;
+	static final double WIDTH_SCALE = 1 / DEFAULT_WIDTH;
 	/**
 	 * The height of one pixel in the scale of 1.0
 	 */
-	public static final double HEIGHT_SCALE = ASPECT_RATIO / DEFAULT_WIDTH;
+	static final double HEIGHT_SCALE = ASPECT_RATIO / DEFAULT_WIDTH;
 
 	private double scale;
 
@@ -63,7 +63,8 @@ class StonePainter {
 		int g = (int) (color.getGreen() * BRIGHTER_SCALE);
 		int b = (int) (color.getBlue() * BRIGHTER_SCALE);
 
-		return new Color(r > 255 ? 255 : r, g > 255 ? 255 : g, b > 255 ? 255 : b);
+		return new Color(r > 255 ? 255 : r, g > 255 ? 255 : g, b > 255 ? 255
+				: b);
 	}
 
 	private static Color hover(Color color) {
@@ -71,7 +72,8 @@ class StonePainter {
 		int g = (int) (color.getGreen() * HOVER_RATIO + 255 * (1 - HOVER_RATIO));
 		int b = (int) (color.getBlue() * HOVER_RATIO + 255 * (1 - HOVER_RATIO));
 
-		return new Color(r > 255 ? 255 : r, g > 255 ? 255 : g, b > 255 ? 255 : b);
+		return new Color(r > 255 ? 255 : r, g > 255 ? 255 : g, b > 255 ? 255
+				: b);
 	}
 
 	private static Color redden(Color color) {
@@ -79,27 +81,28 @@ class StonePainter {
 		int g = (int) (color.getGreen() * REDDEN_RATIO + 128 * (1 - REDDEN_RATIO));
 		int b = (int) (color.getBlue() * REDDEN_RATIO + 128 * (1 - REDDEN_RATIO));
 
-		return new Color(r > 255 ? 255 : r, g > 255 ? 255 : g, b > 255 ? 255 : b);
+		return new Color(r > 255 ? 255 : r, g > 255 ? 255 : g, b > 255 ? 255
+				: b);
 	}
 
-	public static Color getColor(StoneColor color) {
+	static Color getColor(StoneColor color) {
 		switch (color) {
-			case BLACK:
-				return new Color(0.0f, 0.0f, 0.0f);
-			case BLUE:
-				return new Color(0.0f, 0.0f, 1.0f);
-			case ORANGE:
-				return new Color(1.0f, 0.4f, 0.0f);
-			case RED:
-				return new Color(0.9f, 0.0f, 0.25f);
-			case AQUA:
-				return new Color(0.0f, 0.85f, 0.75f);
-			case GREEN:
-				return new Color(0.0f, 0.65f, 0.0f);
-			case VIOLET:
-				return new Color(0.75f, 0.325f, 0.75f);
-			case GRAY:
-				return new Color(0.5f, 0.5f, 0.5f);
+		case BLACK:
+			return new Color(0.0f, 0.0f, 0.0f);
+		case BLUE:
+			return new Color(0.0f, 0.0f, 1.0f);
+		case ORANGE:
+			return new Color(1.0f, 0.4f, 0.0f);
+		case RED:
+			return new Color(0.9f, 0.0f, 0.25f);
+		case AQUA:
+			return new Color(0.0f, 0.85f, 0.75f);
+		case GREEN:
+			return new Color(0.0f, 0.65f, 0.0f);
+		case VIOLET:
+			return new Color(0.75f, 0.325f, 0.75f);
+		case GRAY:
+			return new Color(0.5f, 0.5f, 0.5f);
 		}
 
 		return null;
@@ -109,9 +112,9 @@ class StonePainter {
 	 * Sets the new grid scale
 	 * 
 	 * @param scale
-	 *          the new scale
+	 *            the new scale
 	 */
-	public void setScale(double scale) {
+	void setScale(double scale) {
 		this.scale = scale;
 
 		if (this.scale == 0) {
@@ -123,12 +126,12 @@ class StonePainter {
 
 	/**
 	 * @param x
-	 *          x position in screen coordinates
+	 *            x position in screen coordinates
 	 * @param y
-	 *          y position in screen coordinates
+	 *            y position in screen coordinates
 	 * @return position in grid coordinates
 	 */
-	public Position calculatePosition(int x, int y) {
+	Position calculatePosition(int x, int y) {
 		double width = getStoneWidth();
 		double height = getStoneHeight();
 
@@ -138,14 +141,14 @@ class StonePainter {
 	/**
 	 * @return the width of a stone in the current scale in pixels
 	 */
-	public int getStoneWidth() {
+	int getStoneWidth() {
 		return Math.max(even(DEFAULT_WIDTH * scale), 1);
 	}
 
 	/**
 	 * @return the height of a stone in the current scale in pixels
 	 */
-	public int getStoneHeight() {
+	int getStoneHeight() {
 		return Math.max((int) (DEFAULT_WIDTH * scale / ASPECT_RATIO), 1);
 	}
 
@@ -219,21 +222,24 @@ class StonePainter {
 			hoveredStones.put(state, hoveredStateStones);
 
 			for (StoneColor color : StoneColor.values()) {
-				defaultStateStones.put(color, new HashMap<Integer, BufferedImage>());
-				hoveredStateStones.put(color, new HashMap<Integer, BufferedImage>());
+				defaultStateStones.put(color,
+						new HashMap<Integer, BufferedImage>());
+				hoveredStateStones.put(color,
+						new HashMap<Integer, BufferedImage>());
 			}
 		}
 	}
 
 	/**
 	 * @param scale
-	 *          the scaling factor for the grid coordinates
+	 *            the scaling factor for the grid coordinates
 	 */
 	StonePainter(double scale) {
 		setScale(scale);
 	}
 
-	private void paintStoneBackground(Graphics2D g, Rectangle r, Color background) {
+	private void paintStoneBackground(Graphics2D g, Rectangle r,
+			Color background) {
 		// Paint background
 		g.setColor(background);
 		g.fillRect(r.x, r.y, r.width, r.height);
@@ -334,8 +340,9 @@ class StonePainter {
 					pos + (fm.getAscent() - fm.getDescent()) / 2 + 1);
 		}
 		g.setColor(color);
-		g.drawString(value, (int) (r.x + r.width / 2 - stringRect.getWidth() / 2),
-				pos + (fm.getAscent() - fm.getDescent()) / 2);
+		g.drawString(value,
+				(int) (r.x + r.width / 2 - stringRect.getWidth() / 2), pos
+						+ (fm.getAscent() - fm.getDescent()) / 2);
 	}
 
 	private void paintCircle(Graphics2D g, Rectangle r, Color background) {
@@ -344,42 +351,43 @@ class StonePainter {
 
 		// Paint circle
 		g.setColor(background.darker());
-		g.drawArc(r.x + r.width / 2 - size / 2, pos - size / 2, size, size, 50, 170);
+		g.drawArc(r.x + r.width / 2 - size / 2, pos - size / 2, size, size, 50,
+				170);
 
 		g.setColor(brighter(background));
-		g.drawArc((int) (r.x + r.width / 2 - size / 2), pos - size / 2, size, size,
-				-130, 170);
+		g.drawArc((int) (r.x + r.width / 2 - size / 2), pos - size / 2, size,
+				size, -130, 170);
 	}
 
 	/**
 	 * Paints a stone
 	 * 
 	 * @param g
-	 *          the graphics context to paint the stone on
+	 *            the graphics context to paint the stone on
 	 * @param stone
-	 *          the stone to paint
+	 *            the stone to paint
 	 * @param p
-	 *          the position of the stone
+	 *            the position of the stone
 	 * @param state
-	 *          if the stone is selected the stone will be painted darker, if it
-	 *          is invalid it will be painted in red
+	 *            if the stone is selected the stone will be painted darker, if
+	 *            it is invalid it will be painted in red
 	 * @param hovered
-	 *          if hovered is true the stone will be painted brighter
+	 *            if hovered is true the stone will be painted brighter
 	 */
-	public void paintStone(Graphics2D g, Stone stone, Position p,
-			StoneState state, boolean hovered) {
+	void paintStone(Graphics2D g, Stone stone, Position p, StoneState state,
+			boolean hovered) {
 		int width = getStoneWidth();
 		int height = getStoneHeight();
-		int x = (int) Math.round(p.getX() * width), y = (int) Math.round(p.getY()
-				* height);
+		int x = (int) Math.round(p.getX() * width), y = (int) Math.round(p
+				.getY() * height);
 
 		if (stone.isJoker()) {
-			g.drawImage(getStoneImage(stone.getColor(), 0, state, hovered), x, y,
-					null);
+			g.drawImage(getStoneImage(stone.getColor(), 0, state, hovered), x,
+					y, null);
 		} else {
 			g.drawImage(
-					getStoneImage(stone.getColor(), stone.getValue(), state, hovered), x,
-					y, null);
+					getStoneImage(stone.getColor(), stone.getValue(), state,
+							hovered), x, y, null);
 		}
 	}
 }
diff --git a/src/jrummikub/view/impl/View.java b/src/jrummikub/view/impl/View.java
index bc35be4..0900f92 100644
--- a/src/jrummikub/view/impl/View.java
+++ b/src/jrummikub/view/impl/View.java
@@ -538,6 +538,7 @@ public class View extends JFrame implements IView {
 		rescale();
 	}
 
+	@Override
 	public void showQuitWarningPanel(boolean show) {
 		quitWarningFrame.setLocationRelativeTo(this);
 		quitWarningFrame.setVisible(show);