Chapter 07 section 01-03 codes updated.

Author: liuyubobobo

07-Mine-Sweeper/01-Mine-Sweeper-Basics/src/AlgoFrame.java

@@ -1,16 +1,10 @@
-import java.awt.Graphics2D;
-import java.awt.Graphics;
-import java.awt.Dimension;
-import java.awt.Color;
-import java.awt.RenderingHints;
-
+import java.awt.*;
 import javax.swing.*;
 
 public class AlgoFrame extends JFrame{
 
     private int canvasWidth;
     private int canvasHeight;
-    private JPanel canvas;
 
     public AlgoFrame(String title, int canvasWidth, int canvasHeight){
 
@@ -38,8 +32,8 @@ public AlgoFrame(String title){
     public int getCanvasHeight(){return canvasHeight;}
 
     // data
-    MineSweeperData data;
-    public void setData(MineSweeperData data){
+    private MineSweeperData data;
+    public void render(MineSweeperData data){
         this.data = data;
         repaint();
     }
@@ -58,11 +52,11 @@ public void paintComponent(Graphics g) {
             Graphics2D g2d = (Graphics2D)g;
 
             // 抗锯齿
-//            RenderingHints hints = new RenderingHints(
-//                    RenderingHints.KEY_ANTIALIASING,
-//                    RenderingHints.VALUE_ANTIALIAS_ON);
-//            hints.put(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
-//            g2d.addRenderingHints(hints);
+            RenderingHints hints = new RenderingHints(
+                    RenderingHints.KEY_ANTIALIASING,
+                    RenderingHints.VALUE_ANTIALIAS_ON);
+            hints.put(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
+            g2d.addRenderingHints(hints);
 
             // 具体绘制
             int w = canvasWidth/data.M();

07-Mine-Sweeper/01-Mine-Sweeper-Basics/src/AlgoVisHelper.java

@@ -1,11 +1,9 @@
 import javax.swing.*;
 import java.awt.*;
 import java.awt.geom.Ellipse2D;
-
 import java.awt.geom.Rectangle2D;
 import java.lang.InterruptedException;
 
-
 public class AlgoVisHelper {
 
     private AlgoVisHelper(){}
@@ -33,35 +31,35 @@ private AlgoVisHelper(){}
     public static final Color White = new Color(0xFFFFFF);
 
 
-    static public void strokeCircle(Graphics2D g, int x, int y, int r){
+    public static void strokeCircle(Graphics2D g, int x, int y, int r){
 
         Ellipse2D circle = new Ellipse2D.Double(x-r, y-r, 2*r, 2*r);
         g.draw(circle);
     }
 
-    static public void fillCircle(Graphics2D g, int x, int y, int r){
+    public static void fillCircle(Graphics2D g, int x, int y, int r){
 
         Ellipse2D circle = new Ellipse2D.Double(x-r, y-r, 2*r, 2*r);
         g.fill(circle);
     }
 
-    static public void strokeRectangle(Graphics2D g, int x, int y, int w, int h){
+    public static void strokeRectangle(Graphics2D g, int x, int y, int w, int h){
 
         Rectangle2D rectangle = new Rectangle2D.Double(x, y, w, h);
         g.draw(rectangle);
     }
 
-    static public void fillRectangle(Graphics2D g, int x, int y, int w, int h){
+    public static void fillRectangle(Graphics2D g, int x, int y, int w, int h){
 
         Rectangle2D rectangle = new Rectangle2D.Double(x, y, w, h);
         g.fill(rectangle);
     }
 
-    static public void setColor(Graphics2D g, Color color){
+    public static void setColor(Graphics2D g, Color color){
         g.setColor(color);
     }
 
-    static public void setStrokeWidth(Graphics2D g, int w){
+    public static void setStrokeWidth(Graphics2D g, int w){
         int strokeWidth = w;
         g.setStroke(new BasicStroke(strokeWidth, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
     }

07-Mine-Sweeper/01-Mine-Sweeper-Basics/src/AlgoVisualizer.java

@@ -1,54 +1,46 @@
 import java.awt.*;
-import java.util.LinkedList;
-import java.util.Random;
-import java.util.Arrays;
-import java.util.Queue;
 
 public class AlgoVisualizer {
 
     private static int DELAY = 5;
+    private static int blockSide = 32;
 
     private MineSweeperData data;
     private AlgoFrame frame;
-    private final int d[][] = {{-1,0},{0,1},{1,0},{0,-1}};
+    private static final int d[][] = {{-1,0},{0,1},{1,0},{0,-1}};
 
-    public AlgoVisualizer(AlgoFrame frame, MineSweeperData data){
+    public AlgoVisualizer(int N, int M, int mineNumber){
 
-        this.frame = frame;
-        this.data = data;
+        data = new MineSweeperData(N, M, mineNumber);
+        int sceneWidth = M * blockSide;
+        int sceneHeight = N * blockSide;
 
-        this.setData();
+        EventQueue.invokeLater(() -> {
+            frame = new AlgoFrame("Mine Sweeper", sceneWidth,sceneHeight);
+
+            new Thread(() -> {
+                run();
+            }).start();
+        });
     }
 
-    public void run(){
+    private void run(){
 
-        this.setData();
-        AlgoVisHelper.pause(DELAY);
+        setData();
     }
 
     private void setData(){
-        frame.setData(data);
+        frame.render(data);
+        AlgoVisHelper.pause(DELAY);
     }
 
     public static void main(String[] args) {
 
         int N = 20;
         int M = 20;
-
-        int blockSide = 32;
-        int sceneWidth = M * blockSide;
-        int sceneHeight = N * blockSide;
-
         int mineNumber = 1;
-        MineSweeperData data = new MineSweeperData(N, M, mineNumber);
 
-        EventQueue.invokeLater(() -> {
-            AlgoFrame frame = new AlgoFrame("Mine Sweeper", sceneWidth,sceneHeight);
+        AlgoVisualizer vis = new AlgoVisualizer(N, M, mineNumber);
 
-            AlgoVisualizer vis = new AlgoVisualizer(frame, data);
-            new Thread(() -> {
-                vis.run();
-            }).start();
-        });
     }
 }

07-Mine-Sweeper/01-Mine-Sweeper-Basics/src/MineSweeperData.java

@@ -1,8 +1,8 @@
 public class MineSweeperData {
 
-    public static String blockImageURL = "resources/block.png";
-    public static String flagImageURL = "resources/flag.png";
-    public static String mineImageURL = "resources/mine.png";
+    public static final String blockImageURL = "resources/block.png";
+    public static final String flagImageURL = "resources/flag.png";
+    public static final String mineImageURL = "resources/mine.png";
     public static String numberImageURL(int num){
         if(num < 0 || num >= 8)
             throw new IllegalArgumentException("No such a number image!");
@@ -17,7 +17,7 @@ public MineSweeperData(int N, int M, int mineNumber){
         if(N <= 0 || M <= 0)
             throw new IllegalArgumentException("Mine sweeper size is invalid!");
 
-        if(mineNumber > N*M)
+        if(mineNumber < 0 || mineNumber > N*M)
             throw new IllegalArgumentException("Mine number is larger than the size of mine sweeper board!");
 
         this.N = N;