Merge commit '896413211c40fcb697d435dca1435d5e0709e27f' into HEAD

src/main/java/Minesweeper/Cell.java

@@ -18,7 +18,7 @@ public class Cell extends JButton {
 
 	private static final Color FLAGCOLOR = Color.RED;
 	private static final Color FLOODEDCOLOR = Color.LIGHT_GRAY;
-	private static final Color HIDDENCOLOR = Color.GRAY;
+	private static final Color HIDDENCOLOR = Color.WHITE;
 	private static final Color MINECOLOR = Color.BLACK;
 	private static final long serialVersionUID = 1L;
 	private Playfield playfield;
@@ -33,7 +33,7 @@ public class Cell extends JButton {
 		cord = _cord;
 		playfield = _playfield;
 		
-		setBackground(Color.white);
+		setBackground(HIDDENCOLOR);
 		addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
@@ -72,11 +72,9 @@ public class Cell extends JButton {
 			if (flagged) {
 				flagged = false;
 				
+				setBackground(HIDDENCOLOR);
 				if (type == CellType.Number) {
-					setBackground(HIDDENCOLOR);
 					playfield.cellDried();
-				} else {
-					setBackground(MINECOLOR);
 				}
 				
 			} else {
@@ -91,7 +89,9 @@ public class Cell extends JButton {
 
 	public void reveal() {
 		if (type == CellType.Number) {
-			setText(String.valueOf(value));
+			if(value > 0) {				
+				setText(String.valueOf(value));
+			}
 		} else {
 			setBackground(MINECOLOR);
 		}
@@ -104,6 +104,7 @@ public class Cell extends JButton {
 		
 		setBackground(FLOODEDCOLOR);
 		setEnabled(false);
+		reveal();
 		playfield.cellFlooded();
 		
 		if (value == 0) {