坦克大战（一期）-设计模式-调整项目结构

src/main/java/com/msb/TankDemo.java

@@ -1,5 +1,10 @@
 package com.msb;
 
+import com.msb.base.PropertyMgr;
+import com.msb.enums.DirEnum;
+import com.msb.enums.GroupEnum;
+import com.msb.model.Tank;
+
 import java.util.Random;
 
 /**

src/main/java/com/msb/TankFrame.java

@@ -1,5 +1,11 @@
 package com.msb;
 
+import com.msb.enums.DirEnum;
+import com.msb.enums.GroupEnum;
+import com.msb.model.Bullet;
+import com.msb.model.Explode;
+import com.msb.model.Tank;
+
 import java.awt.*;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
@@ -20,9 +26,9 @@ public class TankFrame extends Frame {
     Tank myTank = new Tank(100, 500, DirEnum.RIGHT, GroupEnum.GOOD, this);
 //    Explode explode = new Explode(100, 100, this);
 //    Bullet bullet = new Bullet(200, 200, DirEnum.DOWN);
-    List<Bullet> bullets = new ArrayList<>();
+    public List<Bullet> bullets = new ArrayList<>();
-    List<Tank> tanks = new ArrayList<>();   //敌方坦克
+    public List<Tank> tanks = new ArrayList<>();   //敌方坦克
-    List<Explode> explodes = new ArrayList<>();     //爆炸效果
+    public List<Explode> explodes = new ArrayList<>();     //爆炸效果
     public static final int GAME_WIDTH = 1000;
     public static final int GAME_HEIGHT = 800;
 

src/main/java/com/msb/base/PropertyMgr.java

@@ -1,7 +1,6 @@
-package com.msb;
+package com.msb.base;
 
 import java.io.IOException;
-import java.util.Objects;
 import java.util.Properties;
 
 /**

src/main/java/com/msb/base/ResourcesMgr.java

@@ -1,6 +1,6 @@
-package com.msb;
+package com.msb.base;
 
-import com.msb.util.ImageUtil;
+import com.msb.utils.ImageUtil;
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;

src/main/java/com/msb/base/dp/abstractFactory/AK47.java

@@ -1,4 +1,4 @@
-package com.msb.abstractFactory;/**
+package com.msb.base.dp.abstractFactory;/**
  * @Author bingor
  * @Date 2022/10/8 15:40
  * @Description: com.msb.abstractFactory

src/main/java/com/msb/base/dp/abstractFactory/AbstractFactory.java

@@ -1,4 +1,4 @@
-package com.msb.abstractFactory;/**
+package com.msb.base.dp.abstractFactory;/**
  * @Author bingor
  * @Date 2022/10/8 16:42
  * @Description: com.msb.abstractFactory

src/main/java/com/msb/base/dp/abstractFactory/Bread.java

@@ -1,4 +1,4 @@
-package com.msb.abstractFactory;/**
+package com.msb.base.dp.abstractFactory;/**
  * @Author bingor
  * @Date 2022/10/8 15:41
  * @Description: com.msb.abstractFactory

src/main/java/com/msb/base/dp/abstractFactory/Car.java

@@ -1,4 +1,4 @@
-package com.msb.abstractFactory;/**
+package com.msb.base.dp.abstractFactory;/**
  * @Author bingor
  * @Date 2022/10/8 15:39
  * @Description: com.msb.abstractFactory

src/main/java/com/msb/base/dp/abstractFactory/Food.java

@@ -1,4 +1,4 @@
-package com.msb.abstractFactory;/**
+package com.msb.base.dp.abstractFactory;/**
  * @Author bingor
  * @Date 2022/10/8 16:43
  * @Description: com.msb.abstractFactory

src/main/java/com/msb/base/dp/abstractFactory/Main.java

@@ -1,4 +1,4 @@
-package com.msb.abstractFactory;/**
+package com.msb.base.dp.abstractFactory;/**
  * @Author bingor
  * @Date 2022/10/8 16:23
  * @Description: com.msb.abstractFactory

src/main/java/com/msb/base/dp/abstractFactory/ModernFactory.java

@@ -1,4 +1,4 @@
-package com.msb.abstractFactory;/**
+package com.msb.base.dp.abstractFactory;/**
  * @Author bingor
  * @Date 2022/10/8 16:55
  * @Description: com.msb.abstractFactory

src/main/java/com/msb/base/dp/abstractFactory/Vehicle.java

@@ -1,4 +1,4 @@
-package com.msb.abstractFactory;/**
+package com.msb.base.dp.abstractFactory;/**
  * @Author bingor
  * @Date 2022/10/8 16:44
  * @Description: com.msb.abstractFactory

src/main/java/com/msb/base/dp/abstractFactory/Weapon.java

@@ -1,4 +1,4 @@
-package com.msb.abstractFactory;/**
+package com.msb.base.dp.abstractFactory;/**
  * @Author bingor
  * @Date 2022/10/8 16:43
  * @Description: com.msb.abstractFactory

src/main/java/com/msb/base/dp/factory/Car.java

@@ -1,4 +1,4 @@
-package com.msb.factory;/**
+package com.msb.base.dp.factory;/**
  * @Author bingor
  * @Date 2022/10/8 14:49
  * @Description: com.msb.factory

src/main/java/com/msb/base/dp/factory/CarFactory.java

@@ -1,4 +1,4 @@
-package com.msb.factory;/**
+package com.msb.base.dp.factory;/**
  * @Author bingor
  * @Date 2022/10/8 15:08
  * @Description: com.msb.factory

src/main/java/com/msb/base/dp/factory/Main.java

@@ -1,4 +1,4 @@
-package com.msb.factory;/**
+package com.msb.base.dp.factory;/**
  * @Author bingor
  * @Date 2022/10/8 14:51
  * @Description: com.msb.factory

src/main/java/com/msb/base/dp/factory/Moveable.java

@@ -1,4 +1,4 @@
-package com.msb.factory;
+package com.msb.base.dp.factory;
 
 /**
  * @Author bingor

src/main/java/com/msb/base/dp/factory/Plane.java

@@ -1,4 +1,4 @@
-package com.msb.factory;/**
+package com.msb.base.dp.factory;/**
  * @Author bingor
  * @Date 2022/10/8 14:49
  * @Description: com.msb.factory

src/main/java/com/msb/base/dp/factory/SimpleVehicleFactory.java

@@ -1,4 +1,4 @@
-package com.msb.factory;/**
+package com.msb.base.dp.factory;/**
  * @Author bingor
  * @Date 2022/10/8 15:04
  * @Description: com.msb.factory

src/main/java/com/msb/base/dp/singleton/Singleton01.java

@@ -1,4 +1,4 @@
-package com.msb.singleton;
+package com.msb.base.dp.singleton;
 
 /**
  * @Author bingor

src/main/java/com/msb/base/dp/singleton/Singleton02.java

@@ -1,4 +1,4 @@
-package com.msb.singleton;
+package com.msb.base.dp.singleton;
 
 /**
  * @Author bingor

src/main/java/com/msb/base/dp/singleton/Singleton03.java

@@ -1,4 +1,4 @@
-package com.msb.singleton;
+package com.msb.base.dp.singleton;
 
 import java.util.Objects;
 

src/main/java/com/msb/base/dp/singleton/Singleton04.java

@@ -1,4 +1,4 @@
-package com.msb.singleton;
+package com.msb.base.dp.singleton;
 
 import java.util.Objects;
 

src/main/java/com/msb/base/dp/singleton/Singleton05.java

@@ -1,4 +1,4 @@
-package com.msb.singleton;
+package com.msb.base.dp.singleton;
 
 import java.util.Objects;
 

src/main/java/com/msb/base/dp/singleton/Singleton06.java

@@ -1,4 +1,4 @@
-package com.msb.singleton;
+package com.msb.base.dp.singleton;
 
 import java.util.Objects;
 

src/main/java/com/msb/base/dp/singleton/Singleton07.java

@@ -1,6 +1,4 @@
-package com.msb.singleton;
+package com.msb.base.dp.singleton;
-
-import java.util.Objects;
 
 /**
  * @Author bingor

src/main/java/com/msb/base/dp/singleton/Singleton08.java

@@ -1,4 +1,4 @@
-package com.msb.singleton;
+package com.msb.base.dp.singleton;
 
 /**
  * @Author bingor

src/main/java/com/msb/base/dp/strategy/Cat.java

@@ -1,4 +1,4 @@
-package com.msb.strategy;
+package com.msb.base.dp.strategy;
 
 /**
  * @Author bingor

src/main/java/com/msb/base/dp/strategy/Cat2.java

@@ -1,4 +1,4 @@
-package com.msb.strategy;
+package com.msb.base.dp.strategy;
 
 /**
  * @Author bingor

src/main/java/com/msb/base/dp/strategy/CatHeightComparator.java

@@ -1,4 +1,4 @@
-package com.msb.strategy;
+package com.msb.base.dp.strategy;
 
 /**
  * @Author bingor

src/main/java/com/msb/base/dp/strategy/CatWeightComparator.java

@@ -1,4 +1,4 @@
-package com.msb.strategy;
+package com.msb.base.dp.strategy;
 
 /**
  * @Author bingor

src/main/java/com/msb/base/dp/strategy/Comparable.java

@@ -1,4 +1,4 @@
-package com.msb.strategy;
+package com.msb.base.dp.strategy;
 
 /**
  * @Author bingor

src/main/java/com/msb/base/dp/strategy/Comparator.java

@@ -1,4 +1,4 @@
-package com.msb.strategy;
+package com.msb.base.dp.strategy;
 
 /**
  * @Author bingor

src/main/java/com/msb/base/dp/strategy/Dog.java

@@ -1,4 +1,4 @@
-package com.msb.strategy;
+package com.msb.base.dp.strategy;
 
 /**
  * @Author bingor

src/main/java/com/msb/base/dp/strategy/Sorter.java

@@ -1,4 +1,4 @@
-package com.msb.strategy;
+package com.msb.base.dp.strategy;
 
 import java.util.Arrays;
 

src/main/java/com/msb/base/dp/strategy/Sorter2.java

@@ -1,4 +1,4 @@
-package com.msb.strategy;
+package com.msb.base.dp.strategy;
 
 import java.util.Arrays;
 

src/main/java/com/msb/enums/DirEnum.java

@@ -1,4 +1,4 @@
-package com.msb;
+package com.msb.enums;
 
 /**
  * @Author bingor

src/main/java/com/msb/enums/GroupEnum.java

@@ -1,4 +1,4 @@
-package com.msb;
+package com.msb.enums;
 
 /**
  * @Author bingor

src/main/java/com/msb/inter/FireStrategy.java

@@ -1,4 +1,6 @@
-package com.msb;
+package com.msb.inter;
+
+import com.msb.model.Tank;
 
 /**
  * @Author bingor

src/main/java/com/msb/inter/impl/DefaultFireStrategy.java

@@ -1,10 +1,14 @@
-package com.msb;/**
+package com.msb.inter.impl;/**
  * @Author bingor
  * @Date 2022/10/8 11:21
  * @Description: com.msb
  * @Version: 1.0
  */
 
+import com.msb.model.Bullet;
+import com.msb.model.Tank;
+import com.msb.inter.FireStrategy;
+
 /**
  *@ClassName DefaultFireStrategy
  *@Description TODO

src/main/java/com/msb/inter/impl/FourFireStrategy.java

@@ -1,10 +1,15 @@
-package com.msb;/**
+package com.msb.inter.impl;/**
  * @Author bingor
  * @Date 2022/10/8 11:21
  * @Description: com.msb
  * @Version: 1.0
  */
 
+import com.msb.model.Bullet;
+import com.msb.model.Tank;
+import com.msb.enums.DirEnum;
+import com.msb.inter.FireStrategy;
+
 /**
  *@ClassName DefaultFireStrategy
  *@Description TODO

src/main/java/com/msb/model/Bullet.java

@@ -1,4 +1,9 @@
-package com.msb;
+package com.msb.model;
+
+import com.msb.TankFrame;
+import com.msb.base.ResourcesMgr;
+import com.msb.enums.DirEnum;
+import com.msb.enums.GroupEnum;
 
 import java.awt.*;
 

src/main/java/com/msb/model/Explode.java

@@ -1,4 +1,7 @@
-package com.msb;
+package com.msb.model;
+
+import com.msb.TankFrame;
+import com.msb.base.ResourcesMgr;
 
 import java.awt.*;
 

src/main/java/com/msb/model/Tank.java

@@ -1,4 +1,11 @@
-package com.msb;
+package com.msb.model;
+
+import com.msb.TankFrame;
+import com.msb.base.PropertyMgr;
+import com.msb.base.ResourcesMgr;
+import com.msb.enums.DirEnum;
+import com.msb.enums.GroupEnum;
+import com.msb.inter.FireStrategy;
 
 import java.awt.*;
 import java.util.Random;

src/main/java/com/msb/utils/ImageUtil.java

@@ -1,4 +1,4 @@
-package com.msb.util;
+package com.msb.utils;
 
 import java.awt.Graphics2D;
 import java.awt.RenderingHints;

src/main/resources/config.properties

@@ -6,5 +6,5 @@ gameWidth=1080
 gameHeight=720
 
 #fireStrategy
-goodFS=com.msb.FourFireStrategy
+goodFS=com.msb.inter.impl.FourFireStrategy
-badFS=com.msb.DefaultFireStrategy
+badFS=com.msb.inter.impl.DefaultFireStrategy

src/test/java/CommonTest.java

@@ -1,4 +1,4 @@
-import com.msb.DirEnum;
+import com.msb.enums.DirEnum;
 import org.junit.Assert;
 import org.junit.Test;